nwfilterxml2xmltest: Rename cases with XMLs not conforming to schema

There's quite a few negative tests. In anticipation of schema testing of
the 'nwfilterxml2xmlin' directory rename all negative/non-conformant
XMLs with the -invalid suffix.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tests/nwfilterxml2xmlin/ah-ipv6-test.xml b/tests/nwfilterxml2xmlin/ah-ipv6-test-invalid.xml
similarity index 100%
rename from tests/nwfilterxml2xmlin/ah-ipv6-test.xml
rename to tests/nwfilterxml2xmlin/ah-ipv6-test-invalid.xml

diff --git a/tests/nwfilterxml2xmlin/all-ipv6-test.xml b/tests/nwfilterxml2xmlin/all-ipv6-test-invalid.xml
similarity index 100%
rename from tests/nwfilterxml2xmlin/all-ipv6-test.xml
rename to tests/nwfilterxml2xmlin/all-ipv6-test-invalid.xml

diff --git a/tests/nwfilterxml2xmlin/arp-test.xml b/tests/nwfilterxml2xmlin/arp-test-invalid.xml
similarity index 100%
rename from tests/nwfilterxml2xmlin/arp-test.xml
rename to tests/nwfilterxml2xmlin/arp-test-invalid.xml

diff --git a/tests/nwfilterxml2xmlin/chain_prefixtest1.xml b/tests/nwfilterxml2xmlin/chain_prefixtest1-invalid.xml
similarity index 100%
rename from tests/nwfilterxml2xmlin/chain_prefixtest1.xml
rename to tests/nwfilterxml2xmlin/chain_prefixtest1-invalid.xml

diff --git a/tests/nwfilterxml2xmlin/comment-test.xml b/tests/nwfilterxml2xmlin/comment-test-invalid.xml
similarity index 100%
rename from tests/nwfilterxml2xmlin/comment-test.xml
rename to tests/nwfilterxml2xmlin/comment-test-invalid.xml

diff --git a/tests/nwfilterxml2xmlin/esp-ipv6-test.xml b/tests/nwfilterxml2xmlin/esp-ipv6-test-invalid.xml
similarity index 100%
rename from tests/nwfilterxml2xmlin/esp-ipv6-test.xml
rename to tests/nwfilterxml2xmlin/esp-ipv6-test-invalid.xml

diff --git a/tests/nwfilterxml2xmlin/hex-data-test.xml b/tests/nwfilterxml2xmlin/hex-data-test-invalid.xml
similarity index 100%
rename from tests/nwfilterxml2xmlin/hex-data-test.xml
rename to tests/nwfilterxml2xmlin/hex-data-test-invalid.xml

diff --git a/tests/nwfilterxml2xmlin/icmp-test.xml b/tests/nwfilterxml2xmlin/icmp-test-invalid.xml
similarity index 100%
rename from tests/nwfilterxml2xmlin/icmp-test.xml
rename to tests/nwfilterxml2xmlin/icmp-test-invalid.xml

diff --git a/tests/nwfilterxml2xmlin/icmpv6-test.xml b/tests/nwfilterxml2xmlin/icmpv6-test-invalid.xml
similarity index 100%
rename from tests/nwfilterxml2xmlin/icmpv6-test.xml
rename to tests/nwfilterxml2xmlin/icmpv6-test-invalid.xml

diff --git a/tests/nwfilterxml2xmlin/ip-test.xml b/tests/nwfilterxml2xmlin/ip-test-invalid.xml
similarity index 100%
rename from tests/nwfilterxml2xmlin/ip-test.xml
rename to tests/nwfilterxml2xmlin/ip-test-invalid.xml

diff --git a/tests/nwfilterxml2xmlin/ipv6-test.xml b/tests/nwfilterxml2xmlin/ipv6-test-invalid.xml
similarity index 100%
rename from tests/nwfilterxml2xmlin/ipv6-test.xml
rename to tests/nwfilterxml2xmlin/ipv6-test-invalid.xml

diff --git a/tests/nwfilterxml2xmlin/mac-test.xml b/tests/nwfilterxml2xmlin/mac-test-invalid.xml
similarity index 100%
rename from tests/nwfilterxml2xmlin/mac-test.xml
rename to tests/nwfilterxml2xmlin/mac-test-invalid.xml

diff --git a/tests/nwfilterxml2xmlin/rarp-test.xml b/tests/nwfilterxml2xmlin/rarp-test-invalid.xml
similarity index 100%
rename from tests/nwfilterxml2xmlin/rarp-test.xml
rename to tests/nwfilterxml2xmlin/rarp-test-invalid.xml

diff --git a/tests/nwfilterxml2xmlin/sctp-ipv6-test.xml b/tests/nwfilterxml2xmlin/sctp-ipv6-test-invalid.xml
similarity index 100%
rename from tests/nwfilterxml2xmlin/sctp-ipv6-test.xml
rename to tests/nwfilterxml2xmlin/sctp-ipv6-test-invalid.xml

diff --git a/tests/nwfilterxml2xmlin/sctp-test.xml b/tests/nwfilterxml2xmlin/sctp-test-invalid.xml
similarity index 100%
rename from tests/nwfilterxml2xmlin/sctp-test.xml
rename to tests/nwfilterxml2xmlin/sctp-test-invalid.xml

diff --git a/tests/nwfilterxml2xmlin/tcp-ipv6-test.xml b/tests/nwfilterxml2xmlin/tcp-ipv6-test-invalid.xml
similarity index 100%
rename from tests/nwfilterxml2xmlin/tcp-ipv6-test.xml
rename to tests/nwfilterxml2xmlin/tcp-ipv6-test-invalid.xml

diff --git a/tests/nwfilterxml2xmlin/tcp-test.xml b/tests/nwfilterxml2xmlin/tcp-test-invalid.xml
similarity index 100%
rename from tests/nwfilterxml2xmlin/tcp-test.xml
rename to tests/nwfilterxml2xmlin/tcp-test-invalid.xml

diff --git a/tests/nwfilterxml2xmlin/udp-ipv6-test.xml b/tests/nwfilterxml2xmlin/udp-ipv6-test-invalid.xml
similarity index 100%
rename from tests/nwfilterxml2xmlin/udp-ipv6-test.xml
rename to tests/nwfilterxml2xmlin/udp-ipv6-test-invalid.xml

diff --git a/tests/nwfilterxml2xmlin/udp-test.xml b/tests/nwfilterxml2xmlin/udp-test-invalid.xml
similarity index 100%
rename from tests/nwfilterxml2xmlin/udp-test.xml
rename to tests/nwfilterxml2xmlin/udp-test-invalid.xml

diff --git a/tests/nwfilterxml2xmlin/udplite-ipv6-test.xml b/tests/nwfilterxml2xmlin/udplite-ipv6-test-invalid.xml
similarity index 100%
rename from tests/nwfilterxml2xmlin/udplite-ipv6-test.xml
rename to tests/nwfilterxml2xmlin/udplite-ipv6-test-invalid.xml

diff --git a/tests/nwfilterxml2xmlin/vlan-test.xml b/tests/nwfilterxml2xmlin/vlan-test-invalid.xml
similarity index 100%
rename from tests/nwfilterxml2xmlin/vlan-test.xml
rename to tests/nwfilterxml2xmlin/vlan-test-invalid.xml

diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c
index 52a4af12cc906f0c87ff22f26ac89d0d211ef442..9def1e2634b6aaa684fa1d47b106f147e0867fb6 100644 (file)
--- a/tests/nwfilterxml2xmltest.c
+++ b/tests/nwfilterxml2xmltest.c
@@ -89,32 +89,32 @@ mymain(void)
             ret = -1; \
     } while (0)
 
-    DO_TEST("mac-test", true);
-    DO_TEST("vlan-test", true);
+    DO_TEST("mac-test-invalid", true);
+    DO_TEST("vlan-test-invalid", true);
     DO_TEST("stp-test", false);
-    DO_TEST("arp-test", true);
-    DO_TEST("rarp-test", true);
-    DO_TEST("ip-test", true);
-    DO_TEST("ipv6-test", true);
-
-    DO_TEST("tcp-test", true);
-    DO_TEST("udp-test", true);
-    DO_TEST("icmp-test", true);
+    DO_TEST("arp-test-invalid", true);
+    DO_TEST("rarp-test-invalid", true);
+    DO_TEST("ip-test-invalid", true);
+    DO_TEST("ipv6-test-invalid", true);
+
+    DO_TEST("tcp-test-invalid", true);
+    DO_TEST("udp-test-invalid", true);
+    DO_TEST("icmp-test-invalid", true);
     DO_TEST("igmp-test", false);
-    DO_TEST("sctp-test", true);
+    DO_TEST("sctp-test-invalid", true);
     DO_TEST("udplite-test", false);
     DO_TEST("esp-test", false);
     DO_TEST("ah-test", false);
     DO_TEST("all-test", false);
 
-    DO_TEST("tcp-ipv6-test", true);
-    DO_TEST("udp-ipv6-test", true);
-    DO_TEST("icmpv6-test", true);
-    DO_TEST("sctp-ipv6-test", true);
-    DO_TEST("udplite-ipv6-test", true);
-    DO_TEST("esp-ipv6-test", true);
-    DO_TEST("ah-ipv6-test", true);
-    DO_TEST("all-ipv6-test", true);
+    DO_TEST("tcp-ipv6-test-invalid", true);
+    DO_TEST("udp-ipv6-test-invalid", true);
+    DO_TEST("icmpv6-test-invalid", true);
+    DO_TEST("sctp-ipv6-test-invalid", true);
+    DO_TEST("udplite-ipv6-test-invalid", true);
+    DO_TEST("esp-ipv6-test-invalid", true);
+    DO_TEST("ah-ipv6-test-invalid", true);
+    DO_TEST("all-ipv6-test-invalid", true);
 
     DO_TEST("ref-test", false);
     DO_TEST("ref-rule-test", false);
@@ -125,14 +125,14 @@ mymain(void)
 
     DO_TEST("conntrack-test", false);
 
-    DO_TEST("hex-data-test", true);
+    DO_TEST("hex-data-test-invalid", true);
 
-    DO_TEST("comment-test", true);
+    DO_TEST("comment-test-invalid", true);
 
     DO_TEST("example-1", false);
     DO_TEST("example-2", false);
 
-    DO_TEST("chain_prefixtest1", true); /* derived from arp-test */
+    DO_TEST("chain_prefixtest1-invalid", true); /* derived from arp-test */
 
     DO_TEST("attr-value-test", false);
     DO_TEST("iter-test1", false);