From 4c599b9d2d2f36d2ae45103fdd0afde44986a784 Mon Sep 17 00:00:00 2001
From: Dan Fandrich <dan@coneharvesters.com>
Date: Sat, 15 Mar 2014 11:13:13 +0100
Subject: [PATCH] tests: made the SASL modes separate keywords

---
 tests/data/test825 | 3 ++-
 tests/data/test826 | 3 ++-
 tests/data/test827 | 3 ++-
 tests/data/test828 | 3 ++-
 tests/data/test830 | 3 ++-
 tests/data/test831 | 3 ++-
 tests/data/test832 | 3 ++-
 tests/data/test833 | 4 +++-
 tests/data/test834 | 4 +++-
 tests/data/test835 | 4 +++-
 tests/data/test871 | 3 ++-
 tests/data/test872 | 3 ++-
 tests/data/test873 | 3 ++-
 tests/data/test874 | 3 ++-
 tests/data/test876 | 3 ++-
 tests/data/test877 | 3 ++-
 tests/data/test878 | 3 ++-
 tests/data/test879 | 4 +++-
 tests/data/test880 | 4 +++-
 tests/data/test881 | 4 +++-
 tests/data/test919 | 3 ++-
 tests/data/test920 | 3 ++-
 tests/data/test921 | 3 ++-
 tests/data/test922 | 3 ++-
 tests/data/test932 | 3 ++-
 tests/data/test933 | 3 ++-
 tests/data/test934 | 3 ++-
 tests/data/test935 | 4 +++-
 tests/data/test936 | 4 +++-
 tests/data/test937 | 4 +++-
 30 files changed, 69 insertions(+), 30 deletions(-)

diff --git a/tests/data/test825 b/tests/data/test825
index 82b86d9e07..e9437ce5ed 100644
--- a/tests/data/test825
+++ b/tests/data/test825
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH PLAIN SASL-IR
+IMAP AUTH PLAIN
+SASL-IR
 RFC4616
 </keywords>
 </info>
diff --git a/tests/data/test826 b/tests/data/test826
index fb829e5298..44893a33ad 100644
--- a/tests/data/test826
+++ b/tests/data/test826
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH LOGIN SASL-IR
+IMAP AUTH LOGIN
+SASL-IR
 </keywords>
 </info>
 
diff --git a/tests/data/test827 b/tests/data/test827
index 00fba3c647..5efe0d02fa 100644
--- a/tests/data/test827
+++ b/tests/data/test827
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH NTLM SASL-IR
+IMAP AUTH NTLM
+SASL-IR
 </keywords>
 </info>
 
diff --git a/tests/data/test828 b/tests/data/test828
index 03f3bd5fb9..380078a732 100644
--- a/tests/data/test828
+++ b/tests/data/test828
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH OAUTH2 SASL-IR
+IMAP AUTH OAUTH2
+SASL-IR
 RFC6749
 </keywords>
 </info>
diff --git a/tests/data/test830 b/tests/data/test830
index 42bfffff5d..c7938b5178 100644
--- a/tests/data/test830
+++ b/tests/data/test830
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH CRAM-MD5 SASL CANCELLATION
+IMAP AUTH CRAM-MD5
+SASL CANCELLATION
 RFC2195
 </keywords>
 </info>
diff --git a/tests/data/test831 b/tests/data/test831
index 72aee1274a..8f0762023a 100644
--- a/tests/data/test831
+++ b/tests/data/test831
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH NTLM SASL CANCELLATION
+IMAP AUTH NTLM
+SASL CANCELLATION
 </keywords>
 </info>
 
diff --git a/tests/data/test832 b/tests/data/test832
index 1453001a4c..13cf56fa3c 100644
--- a/tests/data/test832
+++ b/tests/data/test832
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH DIGEST-MD5 SASL CANCELLATION
+IMAP AUTH DIGEST-MD5
+SASL CANCELLATION
 RFC2831
 </keywords>
 </info>
diff --git a/tests/data/test833 b/tests/data/test833
index b5210c330b..e2fe15ea19 100644
--- a/tests/data/test833
+++ b/tests/data/test833
@@ -2,7 +2,9 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH CRAM-MD5 SASL DOWNGRADE
+IMAP AUTH CRAM-MD5
+IMAP AUTH PLAIN
+SASL DOWNGRADE
 RFC2195
 </keywords>
 </info>
diff --git a/tests/data/test834 b/tests/data/test834
index 71dcc0b929..6e8d5ef693 100644
--- a/tests/data/test834
+++ b/tests/data/test834
@@ -2,7 +2,9 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH NTLM SASL DOWNGRADE
+IMAP AUTH NTLM
+IMAP AUTH PLAIN
+SASL DOWNGRADE
 </keywords>
 </info>
 
diff --git a/tests/data/test835 b/tests/data/test835
index c0a1283f63..89158021e7 100644
--- a/tests/data/test835
+++ b/tests/data/test835
@@ -2,7 +2,9 @@
 <info>
 <keywords>
 IMAP
-IMAP AUTH DIGEST-MD5 SASL DOWNGRADE
+IMAP AUTH DIGEST-MD5
+IMAP AUTH PLAIN
+SASL DOWNGRADE
 RFC2831
 </keywords>
 </info>
diff --git a/tests/data/test871 b/tests/data/test871
index c24279f87b..cd4fcf9546 100644
--- a/tests/data/test871
+++ b/tests/data/test871
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH PLAIN SASL-IR
+POP3 AUTH PLAIN
+SASL-IR
 RFC1734
 RFC4616
 RFC5034
diff --git a/tests/data/test872 b/tests/data/test872
index 12a0d791af..9ef3a934c4 100644
--- a/tests/data/test872
+++ b/tests/data/test872
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH LOGIN SASL-IR 
+POP3 AUTH LOGIN
+SASL-IR
 RFC1734
 RFC5034
 </keywords>
diff --git a/tests/data/test873 b/tests/data/test873
index d85fc29cec..2e51e36662 100644
--- a/tests/data/test873
+++ b/tests/data/test873
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH NTLM SASL-IR
+POP3 AUTH NTLM
+SASL-IR
 RFC1734
 RFC5034
 </keywords>
diff --git a/tests/data/test874 b/tests/data/test874
index 107b898eb0..93a0df6b4e 100644
--- a/tests/data/test874
+++ b/tests/data/test874
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH OAUTH2 SASL-IR
+POP3 AUTH OAUTH2
+SASL-IR
 RFC1734
 RFC5034
 RFC6749
diff --git a/tests/data/test876 b/tests/data/test876
index df577810f6..a2623c3f47 100644
--- a/tests/data/test876
+++ b/tests/data/test876
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH CRAM-MD5 SASL CANCELLATION
+POP3 AUTH CRAM-MD5
+SASL CANCELLATION
 RFC1734
 RFC2195
 RFC5034
diff --git a/tests/data/test877 b/tests/data/test877
index cd20b6fd70..4f3d811693 100644
--- a/tests/data/test877
+++ b/tests/data/test877
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH NTLM SASL CANCELLATION
+POP3 AUTH NTLM
+SASL CANCELLATION
 RFC1734
 RFC5034
 </keywords>
diff --git a/tests/data/test878 b/tests/data/test878
index 38e0847762..1b25b4787e 100644
--- a/tests/data/test878
+++ b/tests/data/test878
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH DIGEST-MD5 SASL CANCELLATION
+POP3 AUTH DIGEST-MD5
+SASL CANCELLATION
 RFC1734
 RFC2831
 RFC5034
diff --git a/tests/data/test879 b/tests/data/test879
index 7d88fbce0a..4b267de2cf 100644
--- a/tests/data/test879
+++ b/tests/data/test879
@@ -2,7 +2,9 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH CRAM-MD5 SASL DOWNGRADE
+POP3 AUTH CRAM-MD5
+POP3 AUTH PLAIN
+SASL DOWNGRADE
 RFC1734
 RFC2195
 RFC5034
diff --git a/tests/data/test880 b/tests/data/test880
index 27036465fb..fce0d35b00 100644
--- a/tests/data/test880
+++ b/tests/data/test880
@@ -2,7 +2,9 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH NTLM SASL DOWNGRADE
+POP3 AUTH NTLM
+POP3 AUTH PLAIN
+SASL DOWNGRADE
 RFC1734
 RFC5034
 </keywords>
diff --git a/tests/data/test881 b/tests/data/test881
index 0f74bb4862..c2200f7c96 100644
--- a/tests/data/test881
+++ b/tests/data/test881
@@ -2,7 +2,9 @@
 <info>
 <keywords>
 POP3
-POP3 AUTH DIGEST-MD5 SASL DOWNGRADE
+POP3 AUTH DIGEST-MD5
+POP3 AUTH PLAIN
+SASL DOWNGRADE
 RFC1734
 RFC2831
 RFC5034
diff --git a/tests/data/test919 b/tests/data/test919
index 22508ab28d..6cfd62e45d 100644
--- a/tests/data/test919
+++ b/tests/data/test919
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH PLAIN SASL-IR
+SMTP AUTH PLAIN
+SASL-IR
 RFC4616
 RFC4954
 </keywords>
diff --git a/tests/data/test920 b/tests/data/test920
index 74f05a9cc2..0fc10ede6f 100644
--- a/tests/data/test920
+++ b/tests/data/test920
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH LOGIN SASL-IR
+SMTP AUTH LOGIN
+SASL-IR
 RFC4954
 </keywords>
 </info>
diff --git a/tests/data/test921 b/tests/data/test921
index 73f64a1506..6e9ca8ab84 100644
--- a/tests/data/test921
+++ b/tests/data/test921
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH NTLM SASL-IR
+SMTP AUTH NTLM
+SASL-IR
 RFC4954
 </keywords>
 </info>
diff --git a/tests/data/test922 b/tests/data/test922
index 0487cff4a7..1f37496a2b 100644
--- a/tests/data/test922
+++ b/tests/data/test922
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH OAUTH2 SASL-IR
+SMTP AUTH OAUTH2
+SASL-IR
 RFC4954
 RFC6749
 </keywords>
diff --git a/tests/data/test932 b/tests/data/test932
index 398e4af070..a103b181af 100644
--- a/tests/data/test932
+++ b/tests/data/test932
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH CRAM-MD5 SASL CANCELLATION
+SMTP AUTH CRAM-MD5
+SASL CANCELLATION
 RFC2195
 RFC4954
 </keywords>
diff --git a/tests/data/test933 b/tests/data/test933
index e52c8f90fb..0f6d4c042f 100644
--- a/tests/data/test933
+++ b/tests/data/test933
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH NTLM SASL CANCELLATION
+SMTP AUTH NTLM
+SASL CANCELLATION
 RFC4954
 </keywords>
 </info>
diff --git a/tests/data/test934 b/tests/data/test934
index a1e16cfeb6..8ddbd218e9 100644
--- a/tests/data/test934
+++ b/tests/data/test934
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH DIGEST-MD5 SASL CANCELLATION
+SMTP AUTH DIGEST-MD5
+SASL CANCELLATION
 RFC2831
 RFC4954
 </keywords>
diff --git a/tests/data/test935 b/tests/data/test935
index 2f5a688a54..ec0047c255 100644
--- a/tests/data/test935
+++ b/tests/data/test935
@@ -2,7 +2,9 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH CRAM-MD5 SASL DOWNGRADE
+SMTP AUTH CRAM-MD5
+SMTP AUTH PLAIN
+SASL DOWNGRADE
 RFC2195
 RFC4954
 </keywords>
diff --git a/tests/data/test936 b/tests/data/test936
index cbc6fb96d2..42b30b137e 100644
--- a/tests/data/test936
+++ b/tests/data/test936
@@ -2,7 +2,9 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH NTLM SASL DOWNGRADE
+SMTP AUTH NTLM
+SMTP AUTH PLAIN
+SASL DOWNGRADE
 RFC4954
 </keywords>
 </info>
diff --git a/tests/data/test937 b/tests/data/test937
index 2472ae3998..46dbc25639 100644
--- a/tests/data/test937
+++ b/tests/data/test937
@@ -2,7 +2,9 @@
 <info>
 <keywords>
 SMTP
-SMTP AUTH DIGEST-MD5 SASL DOWNGRADE
+SMTP AUTH DIGEST-MD5
+SMTP AUTH PLAIN
+SASL DOWNGRADE
 RFC2831
 RFC4954
 </keywords>
-- 
GitLab