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@xxxxxxxxxx>
---
...ipv6-test.xml => ah-ipv6-test-invalid.xml} | 0
...pv6-test.xml => all-ipv6-test-invalid.xml} | 0
.../{arp-test.xml => arp-test-invalid.xml} | 0
...est1.xml => chain_prefixtest1-invalid.xml} | 0
...ment-test.xml => comment-test-invalid.xml} | 0
...pv6-test.xml => esp-ipv6-test-invalid.xml} | 0
...ata-test.xml => hex-data-test-invalid.xml} | 0
.../{icmp-test.xml => icmp-test-invalid.xml} | 0
...cmpv6-test.xml => icmpv6-test-invalid.xml} | 0
.../{ip-test.xml => ip-test-invalid.xml} | 0
.../{ipv6-test.xml => ipv6-test-invalid.xml} | 0
.../{mac-test.xml => mac-test-invalid.xml} | 0
.../{rarp-test.xml => rarp-test-invalid.xml} | 0
...v6-test.xml => sctp-ipv6-test-invalid.xml} | 0
.../{sctp-test.xml => sctp-test-invalid.xml} | 0
...pv6-test.xml => tcp-ipv6-test-invalid.xml} | 0
.../{tcp-test.xml => tcp-test-invalid.xml} | 0
...pv6-test.xml => udp-ipv6-test-invalid.xml} | 0
.../{udp-test.xml => udp-test-invalid.xml} | 0
...test.xml => udplite-ipv6-test-invalid.xml} | 0
.../{vlan-test.xml => vlan-test-invalid.xml} | 0
tests/nwfilterxml2xmltest.c | 44 +++++++++----------
22 files changed, 22 insertions(+), 22 deletions(-)
rename tests/nwfilterxml2xmlin/{ah-ipv6-test.xml => ah-ipv6-test-invalid.xml} (100%)
rename tests/nwfilterxml2xmlin/{all-ipv6-test.xml => all-ipv6-test-invalid.xml} (100%)
rename tests/nwfilterxml2xmlin/{arp-test.xml => arp-test-invalid.xml} (100%)
rename tests/nwfilterxml2xmlin/{chain_prefixtest1.xml => chain_prefixtest1-invalid.xml} (100%)
rename tests/nwfilterxml2xmlin/{comment-test.xml => comment-test-invalid.xml} (100%)
rename tests/nwfilterxml2xmlin/{esp-ipv6-test.xml => esp-ipv6-test-invalid.xml} (100%)
rename tests/nwfilterxml2xmlin/{hex-data-test.xml => hex-data-test-invalid.xml} (100%)
rename tests/nwfilterxml2xmlin/{icmp-test.xml => icmp-test-invalid.xml} (100%)
rename tests/nwfilterxml2xmlin/{icmpv6-test.xml => icmpv6-test-invalid.xml} (100%)
rename tests/nwfilterxml2xmlin/{ip-test.xml => ip-test-invalid.xml} (100%)
rename tests/nwfilterxml2xmlin/{ipv6-test.xml => ipv6-test-invalid.xml} (100%)
rename tests/nwfilterxml2xmlin/{mac-test.xml => mac-test-invalid.xml} (100%)
rename tests/nwfilterxml2xmlin/{rarp-test.xml => rarp-test-invalid.xml} (100%)
rename tests/nwfilterxml2xmlin/{sctp-ipv6-test.xml => sctp-ipv6-test-invalid.xml} (100%)
rename tests/nwfilterxml2xmlin/{sctp-test.xml => sctp-test-invalid.xml} (100%)
rename tests/nwfilterxml2xmlin/{tcp-ipv6-test.xml => tcp-ipv6-test-invalid.xml} (100%)
rename tests/nwfilterxml2xmlin/{tcp-test.xml => tcp-test-invalid.xml} (100%)
rename tests/nwfilterxml2xmlin/{udp-ipv6-test.xml => udp-ipv6-test-invalid.xml} (100%)
rename tests/nwfilterxml2xmlin/{udp-test.xml => udp-test-invalid.xml} (100%)
rename tests/nwfilterxml2xmlin/{udplite-ipv6-test.xml => udplite-ipv6-test-invalid.xml} (100%)
rename tests/nwfilterxml2xmlin/{vlan-test.xml => vlan-test-invalid.xml} (100%)
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 52a4af12cc..9def1e2634 100644
--- 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);
--
2.26.2
