From: Marcin Siodelski <marcin@isc.org>
Date: Mon, 13 Jun 2016 19:00:50 +0000 (+0200)
Subject: [3573] Addressed review comments.
X-Git-Tag: fdxhook_base~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=774b4fa4feca1fb195bad2f9796bc4be4ed4a270;p=thirdparty%2Fkea.git

[3573] Addressed review comments.

Decided to not move the HostTest::doExchange class to the test
utils as it would cause circular dependency.
---

diff --git a/src/bin/dhcp6/tests/host_unittest.cc b/src/bin/dhcp6/tests/host_unittest.cc
index 8be402809c..bb82a25e54 100644
--- a/src/bin/dhcp6/tests/host_unittest.cc
+++ b/src/bin/dhcp6/tests/host_unittest.cc
@@ -273,7 +273,8 @@ public:
                              const Dhcp6Client::Configuration& config) const {
         Option6AddrLstPtr opt = boost::dynamic_pointer_cast<
             Option6AddrLst>(config.findOption(option_type));
-        ASSERT_TRUE(opt) << "option " << option_type << " not found";
+        ASSERT_TRUE(opt) << "option " << option_type << " not found or it "
+            "is of incorrect type";
         Option6AddrLst::AddressContainer addrs = opt->getAddresses();
         ASSERT_GE(addrs.size(), 1) << "test failed for option type " << option_type;
         EXPECT_EQ(expected_addr, addrs[0].toText())
@@ -720,7 +721,7 @@ TEST_F(HostTest, overrideRequestedOptionsInformationRequest) {
 
 // This test checks that host specific options override subnet specific
 // options. Overridden options are requested with Option Request
-// option (Reuqest case).
+// option (Request case).
 TEST_F(HostTest, overrideRequestedOptionsRequest) {
     testOverrideRequestedOptions(DHCPV6_REQUEST);
 }
@@ -748,7 +749,7 @@ TEST_F(HostTest, testHostOnlyOptionsInformationRequest) {
 
 // This test checks that client receives options when they are
 // solely defined in the host scope and not in the global or subnet
-// scope (Reuqest case).
+// scope (Request case).
 TEST_F(HostTest, testHostOnlyOptionsRequest) {
     testHostOnlyOptions(DHCPV6_REQUEST);
 }
@@ -768,7 +769,7 @@ TEST_F(HostTest, testHostOnlyOptionsRebind) {
 }
 
 // This test checks that host specific vendor options override vendor
-// options defined in the global scope (Reuqest case).
+// options defined in the global scope (Request case).
 TEST_F(HostTest, overrideVendorOptionsRequest) {
     testOverrideVendorOptions(DHCPV6_REQUEST);
 }