From: Francis Dupont <fdupont@isc.org>
Date: Thu, 19 Oct 2017 09:04:31 +0000 (+0200)
Subject: [5356] Fixed parsing of examples unit tests
X-Git-Tag: trac5389_base~3^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22162983c1b3ddd674f590965a8f14ac79a6cc23;p=thirdparty%2Fkea.git

[5356] Fixed parsing of examples unit tests
---

diff --git a/src/bin/dhcp4/tests/parser_unittest.cc b/src/bin/dhcp4/tests/parser_unittest.cc
index d687c09ad6..adadbe9676 100644
--- a/src/bin/dhcp4/tests/parser_unittest.cc
+++ b/src/bin/dhcp4/tests/parser_unittest.cc
@@ -242,8 +242,8 @@ void testFile(const std::string& fname) {
 TEST(ParserTest, file) {
     vector<string> configs = { "advanced.json" ,
                                "backends.json",
-                               "classify.json",
                                "cassandra.json",
+                               "classify.json",
                                "dhcpv4-over-dhcpv6.json",
                                "hooks.json",
                                "leases-expiration.json",
diff --git a/src/bin/dhcp6/tests/parser_unittest.cc b/src/bin/dhcp6/tests/parser_unittest.cc
index 2d9b5f83c2..fcb20b638e 100644
--- a/src/bin/dhcp6/tests/parser_unittest.cc
+++ b/src/bin/dhcp6/tests/parser_unittest.cc
@@ -246,11 +246,13 @@ TEST(ParserTest, file) {
     vector<string> configs;
     configs.push_back("advanced.json");
     configs.push_back("backends.json");
+    configs.push_back("cassandra.json");
     configs.push_back("classify.json");
     configs.push_back("dhcpv4-over-dhcpv6.json");
     configs.push_back("duid.json");
     configs.push_back("hooks.json");
-    configs.push_back("iPXE.json");
+    // Removed because decommentJSON does not work with URLs
+    // configs.push_back("iPXE.json");
     configs.push_back("leases-expiration.json");
     configs.push_back("multiple-options.json");
     configs.push_back("mysql-reservations.json");
@@ -259,6 +261,7 @@ TEST(ParserTest, file) {
     configs.push_back("several-subnets.json");
     configs.push_back("shared-network.json");
     configs.push_back("simple.json");
+    configs.push_back("softwire46.json");
     configs.push_back("stateless.json");
     configs.push_back("with-ddns.json");