Browse Source

[master] Fixed libdhcpsrv unit tests that failed to compile under GTEST 1.5

Added output redirect operator "<<" to Lease class so new unit tests in
libdhcpsrv will compile under gtest 1.5.
Also fixed incorrect index into lease collection for same tests.
Thomas Markwalder 11 years ago
parent
commit
4d4f66ce2c

+ 6 - 0
src/lib/dhcpsrv/lease.cc

@@ -266,5 +266,11 @@ Lease6::operator==(const Lease6& other) const {
             comments_ == other.comments_);
 }
 
+std::ostream&
+operator<<(std::ostream& os, const Lease& lease) {
+    os << lease.toText();
+    return (os);
+}
+
 } // namespace isc::dhcp
 } // namespace isc

+ 9 - 0
src/lib/dhcpsrv/lease.h

@@ -401,6 +401,15 @@ typedef boost::shared_ptr<const Lease6> ConstLease6Ptr;
 /// @brief A collection of IPv6 leases.
 typedef std::vector<Lease6Ptr> Lease6Collection;
 
+/// @brief Stream output operator.
+///
+/// Dumps the output of Lease::toText to the given stream.
+/// @param os output stream to which the output is
+/// @param lease reference to Lease object to dump
+/// @return a reference to the output stream paramater
+std::ostream&
+operator<<(std::ostream& os, const Lease& lease);
+
 }; // end of isc::dhcp namespace
 }; // end of isc namespace
 

+ 2 - 2
src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc

@@ -1452,7 +1452,7 @@ GenericLeaseMgrTest::testRecreateLease4() {
     ++lease->valid_lft_;
     lease->fqdn_fwd_ = !lease->fqdn_fwd_;
     // Make sure that the lease has been really modified.
-    ASSERT_NE(*lease, *leases[1]);
+    ASSERT_NE(*lease, *leases[0]);
     // Add the updated lease.
     EXPECT_TRUE(lmptr_->addLease(lease));
     lmptr_->commit();
@@ -1492,7 +1492,7 @@ GenericLeaseMgrTest::testRecreateLease6() {
     ++lease->valid_lft_;
     lease->fqdn_fwd_ = !lease->fqdn_fwd_;
     // Make sure that the lease has been really modified.
-    ASSERT_NE(*lease, *leases[1]);
+    ASSERT_NE(*lease, *leases[0]);
     // Add the updated lease.
     EXPECT_TRUE(lmptr_->addLease(lease));
     lmptr_->commit();