From: Francis Dupont <fdupont@isc.org>
Date: Sat, 23 Dec 2017 19:53:25 +0000 (+0100)
Subject: [5351] Missing commit
X-Git-Tag: trac5494_base~3^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7b46c728b02460f49031a59243bfee5a3f266f4;p=thirdparty%2Fkea.git

[5351] Missing commit
---

diff --git a/src/lib/dhcpsrv/tests/cfg_duid_unittest.cc b/src/lib/dhcpsrv/tests/cfg_duid_unittest.cc
index e2fd4dee98..d15cc5567b 100644
--- 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 ded5b591a0..df7be812b3 100644
--- 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"