[#1386] Addressed review comments

Addressed review comments for !980.

src/bin/dhcp4/tests/fqdn_unittest.cc
src/lib/dhcpsrv/tests/ncr_generator_unittest.cc
    Added missing test parameter comments

diff --git a/src/bin/dhcp4/tests/fqdn_unittest.cc b/src/bin/dhcp4/tests/fqdn_unittest.cc
index fde07dbf4dbea8166f231637e96a3642b8dca84c..7445bdd21586c97c0c9f3168f0d27c592f272064 100644 (file)
--- a/src/bin/dhcp4/tests/fqdn_unittest.cc
+++ b/src/bin/dhcp4/tests/fqdn_unittest.cc
@@ -750,6 +750,7 @@ public:
     /// @param not_strict_expire_check - when true the comparison of the NCR
     /// lease expiration time is conducted as greater than or equal to rather
     /// equal to CLTT plus lease length.
+    /// @param exp_use_cr expected value of conflict resolution flag
     void verifyNameChangeRequest(const isc::dhcp_ddns::NameChangeType type,
                                  const bool reverse, const bool forward,
                                  const std::string& addr,

diff --git a/src/lib/dhcpsrv/tests/ncr_generator_unittest.cc b/src/lib/dhcpsrv/tests/ncr_generator_unittest.cc
index e447f973f261ccc3c7fd3ed3c6cd2399cedc122b..34ebee4838f130e5277f40da6d9e32c914fef979 100644 (file)
--- a/src/lib/dhcpsrv/tests/ncr_generator_unittest.cc
+++ b/src/lib/dhcpsrv/tests/ncr_generator_unittest.cc
@@ -220,9 +220,10 @@ public:
     /// @param rev Perform reverse update.
     /// @param fqdn Hostname.
     /// @param exp_dhcid Expected DHCID.
+    /// @param exp_use_cr expected value of conflict resolution flag
     void testNCR(const NameChangeType chg_type, const bool fwd, const bool rev,
                  const std::string& fqdn, const std::string exp_dhcid,
-                 const bool conflict_resolution = true) {
+                 const bool exp_use_cr = true) {
         // Queue NCR.
         ASSERT_NO_FATAL_FAILURE(sendNCR(chg_type, fwd, rev, fqdn));
         // Expecting one NCR be generated.
@@ -230,7 +231,7 @@ public:
         // Check the details of the NCR.
         verifyNameChangeRequest(chg_type, rev, fwd, lease_->addr_.toText(), exp_dhcid,
                                 lease_->cltt_ + lease_->valid_lft_,
-                                lease_->valid_lft_, fqdn, conflict_resolution);
+                                lease_->valid_lft_, fqdn, exp_use_cr);
     }
 
     /// @brief Test that calling queueNCR for NULL lease doesn't cause
@@ -242,7 +243,6 @@ public:
         ASSERT_NO_FATAL_FAILURE(queueNCR(chg_type, lease_));
         EXPECT_EQ(0, d2_mgr_.getQueueSize());
     }
-
 };
 
 /// @brief Test fixture class implementation for DHCPv6.