From: Francis Dupont <fdupont@isc.org>
Date: Sat, 17 Dec 2016 14:51:22 +0000 (+0100)
Subject: [5017] Finished config_parser_unittest.cc files
X-Git-Tag: trac5088_base~1^2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=90db0cc91c4bae4f291ebdce4c0b6eda914473e8;p=thirdparty%2Fkea.git

[5017] Finished config_parser_unittest.cc files
---

diff --git a/src/bin/dhcp4/tests/config_parser_unittest.cc b/src/bin/dhcp4/tests/config_parser_unittest.cc
index ba940b516f..17e8ec74c9 100644
--- a/src/bin/dhcp4/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp4/tests/config_parser_unittest.cc
@@ -3811,6 +3811,8 @@ TEST_F(Dhcp4ParserTest, reservationBogus) {
     EXPECT_NO_THROW(x = configureDhcp4Server(*srv_, json));
     checkResult(x, 1);
 
+    EXPECT_THROW(parseDHCP4(config), Dhcp4ParseError);
+
     // Case 2: DUID and HW Address both specified.
     config = "{ " + genIfaceConfig() + "," +
         "\"rebind-timer\": 2000, "
@@ -4035,6 +4037,9 @@ TEST_F(Dhcp4ParserTest, declineTimerError) {
 
     // Check that the error contains error position.
     EXPECT_TRUE(errorContainsPosition(status, "<string>"));
+
+    // Check that the Dhcp4 parser catches the type error
+    EXPECT_THROW(parseDHCP4(config), Dhcp4ParseError);
 }
 
 // Check that configuration for the expired leases processing may be
@@ -4427,6 +4432,8 @@ TEST_F(Dhcp4ParserTest, invalidClientClassDictionary) {
     EXPECT_NO_THROW(status = configureDhcp4Server(*srv_, json));
     ASSERT_TRUE(status);
     checkResult(status, 1);
+
+    EXPECT_THROW(parseDHCP4(config), Dhcp4ParseError);
 }
 
 // Test verifies that regular configuration does not provide any user context
diff --git a/src/bin/dhcp6/tests/config_parser_unittest.cc b/src/bin/dhcp6/tests/config_parser_unittest.cc
index 460fc625b4..fe282e7806 100644
--- a/src/bin/dhcp6/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp6/tests/config_parser_unittest.cc
@@ -1579,8 +1579,8 @@ TEST_F(Dhcp6ParserTest, pdPoolPrefixExclude) {
         "] }";
 
     // Convert the JSON string into Elements.
-    ElementPtr json;
-    ASSERT_NO_THROW(json = Element::fromJSON(config));
+    ConstElementPtr json;
+    ASSERT_NO_THROW(json = parseDHCP6(config));
 
     // Verify that DHCP6 configuration processing succeeds.
     // Returned value must be non-empty ConstElementPtr to config result.