[5351] Missing commit

diff --git a/src/lib/dhcpsrv/tests/cfg_duid_unittest.cc b/src/lib/dhcpsrv/tests/cfg_duid_unittest.cc
index e2fd4dee980c234b4def07f69cc91ecbbe38ce96..d15cc5567bfff150140c532edb5a5da9b761d8be 100644 (file)
--- a/src/lib/dhcpsrv/tests/cfg_duid_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cfg_duid_unittest.cc
@@ -116,7 +116,7 @@ TEST_F(CfgDUIDTest, setValues) {
     ASSERT_NO_THROW(cfg_duid.setTime(32100));
     ASSERT_NO_THROW(cfg_duid.setEnterpriseId(10));
     ASSERT_NO_THROW(cfg_duid.setPersist(false));
-    std::string user_context = "{ \"comment\": \"foo\", \"bar\": 1 }";
+    std::string user_context = "{ \"comment\": \"bar\", \"foo\": 1 }";
     ASSERT_NO_THROW(cfg_duid.setContext(Element::fromJSON(user_context)));
 
     // Check that values have been set correctly.
@@ -130,14 +130,14 @@ TEST_F(CfgDUIDTest, setValues) {
     EXPECT_EQ(user_context, cfg_duid.getContext()->str());
 
     std::string expected = "{\n"
-        " \"comment\": \"foo\",\n"
+        " \"comment\": \"bar\",\n"
         " \"type\": \"EN\",\n"
         " \"identifier\": \"ABCDEF\",\n"
         " \"htype\": 100,\n"
         " \"time\": 32100,\n"
         " \"enterprise-id\": 10,\n"
         " \"persist\": false,\n"
-        " \"user-context\": { \"bar\": 1 }\n"
+        " \"user-context\": { \"foo\": 1 }\n"
         "}";
     runToElementTest<CfgDUID>(expected, cfg_duid);
 }

diff --git a/src/lib/dhcpsrv/tests/cfg_option_def_unittest.cc b/src/lib/dhcpsrv/tests/cfg_option_def_unittest.cc
index ded5b591a0a6a53f3d8f954ab57cb828f231855a..df7be812b3f08b2f81c848102490328b59b604f4 100644 (file)
--- a/src/lib/dhcpsrv/tests/cfg_option_def_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cfg_option_def_unittest.cc
@@ -282,7 +282,7 @@ TEST(CfgOptionDefTest, unparse) {
         "    \"record-types\": \"uint16, uint16\",\n"
         "    \"encapsulate\": \"\",\n"
         "    \"space\": \"dns\",\n"
-        "    \"user-context\": \"bar\": 1 }\n"
+        "    \"user-context\": { \"bar\": 1 }\n"
         "},{\n"
         "    \"name\": \"option-foo\",\n"
         "    \"code\": 5,\n"