tests: Moved CR LF in URL tests to their respective protocol groups

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 3342d2c3b30b70013f21f1a610d1997ebb406c6a..dba374720c443181ef0f8e90ec7de879806249b5 100644 (file)
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -66,16 +66,16 @@ test709 test710 test711 test712 \
 test800 test801 test802 test803 test804 test805 test806 test807 test808 \
 test809 test810 test811 test812 test813 test814 test815 test816 test817 \
 test818 test819 test820 test821 test822 test823 test824 test825 test826 \
-test827 test828 \
+test827 test828 test829 \
 \
 test850 test851 test852 test853 test854 test855 test856 test857 test858 \
 test859 test860 test861 test862 test863 test864 test865 test866 test867 \
-test868 test869 test870 test871 test872 test873 test874 \
+test868 test869 test870 test871 test872 test873 test874 test875 \
 \
 test900 test901 test902 test903 test904 test905 test906 test907 test908 \
 test909 test910 test911 test912 test913 test914 test915 test916 test917 \
 test918 test919 test920 test921 test922 test923 test924 test925 test926 \
-test927 test928 test929 test930 \
+test927 test928 test929 test930 test931 \
 \
 test1000 test1001 test1002 test1003 test1004 test1005 test1006 test1007 \
 test1008 test1009 test1010 test1011 test1012 test1013 test1014 test1015 \
@@ -104,8 +104,8 @@ test1236 test1237 test1238 test1239 test1240 \
 \
 test1300 test1301 test1302 test1303 test1304 test1305 test1306 test1307 \
 test1308 test1309 test1310 test1311 test1312 test1313 test1314 test1315 \
-test1316 test1317 test1318 test1319 test1320 test1321 test1322 test1323 \
-test1324 test1325 test1326 test1327 test1328 test1329 test1330 test1331 \
+test1316 test1317 test1318 test1319 test1320 test1321                   \
+         test1325 test1326 test1327 test1328 test1329 test1330 test1331 \
 test1332 test1333 test1334 test1335 test1336 test1337 test1338 test1339 \
 test1340 test1341 test1342 test1343 test1344 test1345 test1346 test1347 \
 test1348 test1349 test1350 test1351 test1352 test1353 test1354 test1355 \

diff --git a/tests/data/test1324 b/tests/data/test829
similarity index 88%
rename from tests/data/test1324
rename to tests/data/test829
index c9835efea25c1bd768e9138f7f6e3cea82b3b450..cefba0d79090d45973be06a2070bcb5dc1cebbf9 100644 (file)
--- a/tests/data/test1324
+++ b/tests/data/test829
@@ -15,7 +15,7 @@ imap
 IMAP with URL-encoded CR LF in the URL
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT/%0d%0a/1322
+imap://%HOSTIP:%IMAPPORT/%0d%0a/829
 </command>
 </client>
 

diff --git a/tests/data/test1322 b/tests/data/test875
similarity index 88%
rename from tests/data/test1322
rename to tests/data/test875
index 996727e94d5a8769ae157ddfef8961d25b54076c..53e994087f740cb0824a372729521cb1d612b5bd 100644 (file)
--- a/tests/data/test1322
+++ b/tests/data/test875
@@ -15,7 +15,7 @@ pop3
 POP3 with URL-encoded CR LF in the URL
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/%0d%0a/1322
+pop3://%HOSTIP:%POP3PORT/%0d%0a/875
 </command>
 </client>
 

diff --git a/tests/data/test1323 b/tests/data/test931
similarity index 88%
rename from tests/data/test1323
rename to tests/data/test931
index 90eb88b7d8759200ea57c7472889fd381edcfe39..722aa0222e8f94fae7182bea50380984e958055f 100644 (file)
--- a/tests/data/test1323
+++ b/tests/data/test931
@@ -15,7 +15,7 @@ smtp
 SMTP with URL-encoded CR LF in the URL
  </name>
  <command>
-smtp://%HOSTIP:%SMTPPORT/%0d%0a/1323
+smtp://%HOSTIP:%SMTPPORT/%0d%0a/931
 </command>
 </client>