From: Francis Dupont <fdupont@isc.org>
Date: Tue, 20 Oct 2020 09:51:10 +0000 (+0200)
Subject: [#1423] Protected all tests against free content
X-Git-Tag: Kea-1.9.1~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8c22b51599b7a0beb04ca95441cbe3418ea2261;p=thirdparty%2Fkea.git

[#1423] Protected all tests against free content
---

diff --git a/src/bin/agent/tests/parser_unittests.cc b/src/bin/agent/tests/parser_unittests.cc
index c32fd34101..125d650de3 100644
--- a/src/bin/agent/tests/parser_unittests.cc
+++ b/src/bin/agent/tests/parser_unittests.cc
@@ -743,6 +743,7 @@ TEST(ParserTest, mapEntries) {
                 // Handle maps.
                 for (auto elem : json->mapValue()) {
                     static_cast<void>(set.insert(elem.first));
+                    // Skip entries with free content.
                     if ((elem.first != "user-context") &&
                         (elem.first != "parameters")) {
                         extract(elem.second, set);
@@ -797,8 +798,9 @@ TEST(ParserTest, duplicateMapEntries) {
             } else if (json->getType() == Element::map) {
                 // Handle maps.
                 for (auto elem : json->mapValue()) {
-                    // Skip user-context.
-                    if (elem.first == "user-context") {
+                    // Skip entries with free content.
+                    if ((elem.first != "user-context") &&
+                        (elem.first != "parameters")) {
                         continue;
                     }
 
diff --git a/src/bin/d2/tests/parser_unittest.cc b/src/bin/d2/tests/parser_unittest.cc
index e10891c23a..70a372f5b9 100644
--- a/src/bin/d2/tests/parser_unittest.cc
+++ b/src/bin/d2/tests/parser_unittest.cc
@@ -685,7 +685,9 @@ TEST(ParserTest, mapEntries) {
                 // Handle maps.
                 for (auto elem : json->mapValue()) {
                     static_cast<void>(set.insert(elem.first));
-                    if (elem.first != "user-context") {
+                    // Skip entries with free content.
+                    if ((elem.first != "user-context") &&
+                        (elem.first != "parameters")) {
                         extract(elem.second, set);
                     }
                 }
@@ -738,8 +740,9 @@ TEST(ParserTest, duplicateMapEntries) {
             } else if (json->getType() == Element::map) {
                 // Handle maps.
                 for (auto elem : json->mapValue()) {
-                    // Skip user-context.
-                    if (elem.first == "user-context") {
+                    // Skip entries with free content.
+                    if ((elem.first != "user-context") &&
+                        (elem.first != "parameters")) {
                         continue;
                     }
 
diff --git a/src/bin/dhcp4/tests/parser_unittest.cc b/src/bin/dhcp4/tests/parser_unittest.cc
index 58562edf3b..b387652e67 100644
--- a/src/bin/dhcp4/tests/parser_unittest.cc
+++ b/src/bin/dhcp4/tests/parser_unittest.cc
@@ -743,7 +743,9 @@ TEST(ParserTest, mapEntries) {
                 // Handle maps.
                 for (auto elem : json->mapValue()) {
                     static_cast<void>(set.insert(elem.first));
-                    if (elem.first != "user-context") {
+                    // Skip entries with free content.
+                    if ((elem.first != "user-context") &&
+                        (elem.first != "parameters")) {
                         extract(elem.second, set);
                     }
                 }
@@ -812,6 +814,12 @@ TEST(ParserTest, duplicateMapEntries) {
             } else if (json->getType() == Element::map) {
                 // Handle maps.
                 for (auto elem : json->mapValue()) {
+                    // Skip entries with free content.
+                    if ((elem.first != "user-context") &&
+                        (elem.first != "parameters")) {
+                        continue;
+                    }
+
                     // Perform tests.
                     string dup = elem.first + "DDDD";
                     json->set(dup, elem.second);
diff --git a/src/bin/dhcp6/tests/parser_unittest.cc b/src/bin/dhcp6/tests/parser_unittest.cc
index 29e266812d..750ba034d7 100644
--- a/src/bin/dhcp6/tests/parser_unittest.cc
+++ b/src/bin/dhcp6/tests/parser_unittest.cc
@@ -733,7 +733,9 @@ TEST(ParserTest, mapEntries) {
                 // Handle maps.
                 for (auto elem : json->mapValue()) {
                     static_cast<void>(set.insert(elem.first));
-                    if (elem.first != "user-context") {
+                    // Skip entries with free content.
+                    if ((elem.first != "user-context") &&
+                        (elem.first != "parameters")) {
                         extract(elem.second, set);
                     }
                 }
@@ -802,6 +804,12 @@ TEST(ParserTest, duplicateMapEntries) {
             } else if (json->getType() == Element::map) {
                 // Handle maps.
                 for (auto elem : json->mapValue()) {
+                    // Skip entries with free content.
+                    if ((elem.first != "user-context") &&
+                        (elem.first != "parameters")) {
+                        continue;
+                    }
+
                     // Perform tests.
                     string dup = elem.first + "DDDD";
                     json->set(dup, elem.second);
diff --git a/src/bin/netconf/tests/parser_unittests.cc b/src/bin/netconf/tests/parser_unittests.cc
index 2aeeca0682..8cbf85de91 100644
--- a/src/bin/netconf/tests/parser_unittests.cc
+++ b/src/bin/netconf/tests/parser_unittests.cc
@@ -803,7 +803,9 @@ TEST(ParserTest, mapEntries) {
                 // Handle maps.
                 for (auto elem : json->mapValue()) {
                     static_cast<void>(set.insert(elem.first));
-                    if (elem.first != "user-context") {
+                    // Skip entries with free content.
+                    if ((elem.first != "user-context") &&
+                        (elem.first != "parameters")) {
                         extract(elem.second, set);
                     }
                 }
@@ -856,8 +858,9 @@ TEST(ParserTest, duplicateMapEntries) {
             } else if (json->getType() == Element::map) {
                 // Handle maps.
                 for (auto elem : json->mapValue()) {
-                    // Skip user-context.
-                    if (elem.first == "user-context") {
+                    // Skip entries with free content.
+                    if ((elem.first != "user-context") &&
+                        (elem.first != "parameters")) {
                         continue;
                     }