[5110_fix] Compilation and unit-test fixed after rebase to current master

src/bin/d2/tests/d2_simple_parser_unittest.cc

@@ -946,7 +946,7 @@ TEST_F(DdnsDomainParserTest, invalidDomain) {
                          "    \"port\": 200 },"
                          "  {  \"ip-address\": \"127.0.0.3\" , "
                          "    \"port\": 300 } ] } ";
-    PARSE_FAIL(config, "String parameter name not found(<string>:1:1)");
+    PARSE_FAIL(config, "missing parameter 'name' (<string>:1:1)");
 
     // Create a domain configuration with an empty server list.
     config = "{ \"name\": \"example.com\" , "

src/bin/d2/tests/parser_unittest.cc

@@ -263,7 +263,7 @@ void testFile(const std::string& fname) {
     ElementPtr reference_json;
     ConstElementPtr test_json;
 
-    string decommented = dhcp::test::decommentJSONfile(fname);
+    string decommented = isc::test::decommentJSONfile(fname);
     EXPECT_NO_THROW(reference_json = Element::fromJSONFile(decommented, true));
 
     // remove the temporary file

src/bin/d2/tests/testdata/d2_cfg_tests.json

@@ -315,7 +315,7 @@
 #-----
 ,{
 "description" : "D2.tsig-keys, missing key name",
-"logic-error" : "element: tsig-keys : String parameter name not found(<string>:1:62)<string>:1:47",
+"logic-error" : "element: tsig-keys : missing parameter 'name' (<string>:1:62)<string>:1:47",
 "data" :
     {
     "forward-ddns" : {},
@@ -420,7 +420,7 @@
 #----- D2.tsig-keys, algorithm tests
 ,{
 "description" : "D2.tsig-keys, missing algorithm",
-"logic-error" : "element: tsig-keys : String parameter algorithm not found(<string>:1:62)<string>:1:47",
+"logic-error" : "element: tsig-keys : missing parameter 'algorithm' (<string>:1:62)<string>:1:47",
 "data" :
     {
     "forward-ddns" : {},
@@ -665,7 +665,7 @@
 #----- D2.tsig-keys, secret tests
 ,{
 "description" : "D2.tsig-keys, missing secret",
-"logic-error" : "element: tsig-keys : String parameter secret not found(<string>:1:62)<string>:1:47",
+"logic-error" : "element: tsig-keys : missing parameter 'secret' (<string>:1:62)<string>:1:47",
 "data" :
     {
     "forward-ddns" : {},