From: Thomas Markwalder <tmark@isc.org>
Date: Fri, 8 Apr 2016 14:03:19 +0000 (-0400)
Subject: [4239] Fix constraint-based unit test failure
X-Git-Tag: trac4106_update_base~38^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=395104bb79de3709891adf475ea1a7af1967823b;p=thirdparty%2Fkea.git

[4239] Fix constraint-based unit test failure

src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc
   - GenericLeaseMgrTest::testLease6HWTypeAndSource() - now uses valid values
     for hardware address source
---

diff --git a/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc
index baa33c2167..4fd78815a8 100644
--- a/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc
@@ -916,8 +916,8 @@ GenericLeaseMgrTest::testLease6HWTypeAndSource() {
 
     // Those should use defines from Pkt::HWADDR_SOURCE_*, but let's
     // test an uncommon value (and 0 which means unknown).
-    hwaddr1->source_ = 123456u;
-    hwaddr2->source_ = 0;
+    hwaddr1->source_ = HWAddr::HWADDR_SOURCE_RAW;
+    hwaddr2->source_ = HWAddr::HWADDR_SOURCE_DUID;
 
     leases[1]->hwaddr_ = hwaddr1;     // Add hardware address to leases 1 and 2
     leases[2]->hwaddr_ = hwaddr2;
@@ -938,14 +938,14 @@ GenericLeaseMgrTest::testLease6HWTypeAndSource() {
     ASSERT_TRUE(stored1);
     ASSERT_TRUE(stored1->hwaddr_);
     EXPECT_EQ(123, stored1->hwaddr_->htype_);
-    EXPECT_EQ(123456, stored1->hwaddr_->source_);
+    EXPECT_EQ(HWAddr::HWADDR_SOURCE_RAW, stored1->hwaddr_->source_);
 
     // Second lease should have a hardware address in it
     Lease6Ptr stored2 = lmptr_->getLease6(leasetype6_[2], ioaddress6_[2]);
     ASSERT_TRUE(stored2);
     ASSERT_TRUE(stored2->hwaddr_);
     EXPECT_EQ(456, stored2->hwaddr_->htype_);
-    EXPECT_EQ(0, stored2->hwaddr_->source_);
+    EXPECT_EQ(HWAddr::HWADDR_SOURCE_DUID, stored2->hwaddr_->source_);
 
     // Third lease should NOT have any hardware address.
     Lease6Ptr stored3 = lmptr_->getLease6(leasetype6_[3], ioaddress6_[3]);