[3624] Addressed code review comments.

The FQDN option test now also covers checking the length of the FQDN option
when multi-labeled partial domain names are specified.

diff --git a/src/lib/dhcp/tests/option4_client_fqdn_unittest.cc b/src/lib/dhcp/tests/option4_client_fqdn_unittest.cc
index 404aee8845fb5185b65ef9a17cf8ca2e03bee18b..a35d1abbd7a4a9651336c832db01a64de5e75273 100644 (file)
--- a/src/lib/dhcp/tests/option4_client_fqdn_unittest.cc
+++ b/src/lib/dhcp/tests/option4_client_fqdn_unittest.cc
@@ -955,6 +955,18 @@ TEST(Option4ClientFqdnTest, len) {
     );
     ASSERT_TRUE(option);
     EXPECT_EQ(12, option->len());
+
+    // Another test for partial domain name but this time the domain name
+    // contains two labels.
+    ASSERT_NO_THROW(
+        option.reset(new Option4ClientFqdn(Option4ClientFqdn::FLAG_E,
+                                           Option4ClientFqdn::RCODE_CLIENT(),
+                                           "myhost.example",
+                                           Option4ClientFqdn::PARTIAL))
+    );
+    ASSERT_TRUE(option);
+    EXPECT_EQ(20, option->len());
+
 }
 
 // This test verifies that the correct length of the option in on-wire
@@ -974,6 +986,17 @@ TEST(Option4ClientFqdnTest, lenAscii) {
     // of the string plus terminating dot.
     EXPECT_EQ(24, option->len());
 
+    // Let's change the domain name and see if the length is different.
+    ASSERT_NO_THROW(
+        option.reset(new Option4ClientFqdn(0, Option4ClientFqdn::RCODE_CLIENT(),
+                                           "example.com"))
+    );
+    ASSERT_TRUE(option);
+
+    EXPECT_EQ(17, option->len());
+
+    // Let's test the length of the option when the partial domain name is
+    // specified.
     ASSERT_NO_THROW(
         option.reset(new Option4ClientFqdn(0, Option4ClientFqdn::RCODE_CLIENT(),
                                            "myhost",
@@ -985,6 +1008,18 @@ TEST(Option4ClientFqdnTest, lenAscii) {
     // domain name is equal to the length of the "myhost".
     EXPECT_EQ(11, option->len());
 
+    // Another check for partial domain name but this time the domain name
+    // contains two labels.
+    ASSERT_NO_THROW(
+        option.reset(new Option4ClientFqdn(0, Option4ClientFqdn::RCODE_CLIENT(),
+                                           "myhost.example",
+                                           Option4ClientFqdn::PARTIAL))
+    );
+    ASSERT_TRUE(option);
+
+    EXPECT_EQ(19, option->len());
+
+
     // A special case is an empty domain name for which the returned length
     // should be a sum of the header length, RCODE1, RCODE2 and flag fields
     // length.