From: Thomas Markwalder <tmark@isc.org>
Date: Tue, 8 Sep 2015 13:38:49 +0000 (-0400)
Subject: [2615] Addressed review comments
X-Git-Tag: fd4o6_base~8^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d22230dd1315906a15ab3b6529704ae82de5591b;p=thirdparty%2Fkea.git

[2615] Addressed review comments

Minor changes to commentary, etc.
---

diff --git a/src/bin/dhcp4/tests/out_of_range_unittest.cc b/src/bin/dhcp4/tests/out_of_range_unittest.cc
index 066cf45810..a2920724ed 100644
--- a/src/bin/dhcp4/tests/out_of_range_unittest.cc
+++ b/src/bin/dhcp4/tests/out_of_range_unittest.cc
@@ -19,16 +19,12 @@
 #include <dhcp_ddns/ncr_msg.h>
 #include <dhcp/tests/iface_mgr_test_config.h>
 #include <dhcpsrv/cfgmgr.h>
-#include <dhcpsrv/host.h>
-#include <dhcpsrv/host_mgr.h>
 #include <dhcpsrv/subnet_id.h>
 #include <dhcp4/tests/dhcp4_test_utils.h>
 #include <dhcp4/tests/dhcp4_client.h>
-#include <boost/shared_ptr.hpp>
 
 using namespace isc;
 using namespace isc::asiolink;
-using namespace isc::data;
 using namespace isc::dhcp;
 using namespace isc::dhcp::test;
 
@@ -46,10 +42,8 @@ namespace {
 ///   - 1 hostname reservation (dynamic host) for HW address:
 ///     dd:dd:dd:dd:dd:01,
 ///   - DDNS enabled
-/// - Configuration 1:
-///   - Same as configuration 1 but with a different pool range
-/// - Configuration 2 - same subnet as reference, different pool,
-///       no reservations
+/// - Configuration 1 - same subnet, different pool
+/// - Configuration 2 - same subnet, different pool, no reservations
 /// - Configuration 3 - different subnet with reservations
 /// - Configuration 4 - different subnet with no reservations
 /// - Configuration 5 - same as reference, no reservations
@@ -451,7 +445,7 @@ TEST_F(OutOfRangeTest, dynamicHostOutOfSubnet) {
 // whose address is within the configured subnet and pool, but whose
 // reservation has been removed:
 //
-// a: Is allowed to renew 
+// a: Is allowed to renew
 // b: Is released properly upon release, including DNS removal
 //
 TEST_F(OutOfRangeTest, dynamicHostReservationRemoved) {
diff --git a/src/bin/dhcp4/tests/release_unittest.cc b/src/bin/dhcp4/tests/release_unittest.cc
index 8d80994fb8..c1ac1fda9a 100644
--- a/src/bin/dhcp4/tests/release_unittest.cc
+++ b/src/bin/dhcp4/tests/release_unittest.cc
@@ -286,7 +286,7 @@ TEST_F(ReleaseTest, releaseNonMatchingIPAddress) {
 }
 
 // This test verifies that an incoming RELEASE for an address within
-// a subnet that has been removed
+// a subnet that has been removed can still be released.
 TEST_F(ReleaseTest, releaseNoSubnet) {
     Dhcp4Client client(Dhcp4Client::SELECTING);
     // Configure DHCP server.
diff --git a/src/bin/dhcp6/tests/dhcp6_client.h b/src/bin/dhcp6/tests/dhcp6_client.h
index e1cf0a5ca0..35462321ce 100644
--- a/src/bin/dhcp6/tests/dhcp6_client.h
+++ b/src/bin/dhcp6/tests/dhcp6_client.h
@@ -235,8 +235,6 @@ public:
     /// @todo Perform sanity checks on returned messages.
     void doRebind();
 
-    void doRelease();
-
     /// @brief Sends Request to the server and receives Reply.
     ///
     /// This function simulates sending the Request message to the server and