[#1069] fix crashing unittests on no op database actions

diff --git a/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc
index e0778ebfbe38fb9354ecf69fc0a51f5dc54d8959..f8ce430e44d9c581d9bdc28fd69afed7a859f624 100644 (file)
--- a/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc
@@ -1782,9 +1782,9 @@ GenericLeaseMgrTest::testGetLeases6Duid() {
     Lease6Collection returned3 = lmptr_->getLeases6(*(lease3->duid_));
 
     //verify if the returned lease mathces
-    EXPECT_EQ(returned1.size(), 1);
-    EXPECT_EQ(returned2.size(), 1);
-    EXPECT_EQ(returned3.size(), 1);
+    ASSERT_EQ(returned1.size(), 1);
+    ASSERT_EQ(returned2.size(), 1);
+    ASSERT_EQ(returned3.size(), 1);
 
     //verify that the returned lease are same
     EXPECT_TRUE(returned1[0]->addr_ == lease1->addr_);

diff --git a/src/lib/dhcpsrv/tests/test_utils.cc b/src/lib/dhcpsrv/tests/test_utils.cc
index 3634e4ceb63a0f1e0ac175485d9174526e801f3a..62df2493a31412589582bc8eea451e963ee153bf 100644 (file)
--- a/src/lib/dhcpsrv/tests/test_utils.cc
+++ b/src/lib/dhcpsrv/tests/test_utils.cc
@@ -26,6 +26,8 @@ detailCompareLease(const Lease4Ptr& first, const Lease4Ptr& second) {
     // odd things happen when they are different: the EXPECT_EQ macro appears to
     // call the operator uint32_t() function, which causes an exception to be
     // thrown for IPv6 addresses.
+    ASSERT_TRUE(first);
+    ASSERT_TRUE(second);
     EXPECT_EQ(first->addr_, second->addr_);
 
     // We need to compare the actual HWAddr objects, not pointers
@@ -66,6 +68,8 @@ detailCompareLease(const Lease4Ptr& first, const Lease4Ptr& second) {
 
 void
 detailCompareLease(const Lease6Ptr& first, const Lease6Ptr& second) {
+    ASSERT_TRUE(first);
+    ASSERT_TRUE(second);
     EXPECT_EQ(first->type_, second->type_);
 
     // Compare address strings.  Comparison of address objects is not used, as

diff --git a/src/lib/dhcpsrv/testutils/host_data_source_utils.cc b/src/lib/dhcpsrv/testutils/host_data_source_utils.cc
index e69dea083c68446c1891d9e69a5c978cbf33e8ac..1fb6f3d47bc9c0001d70b1dbbaf3a9c5af91197e 100644 (file)
--- a/src/lib/dhcpsrv/testutils/host_data_source_utils.cc
+++ b/src/lib/dhcpsrv/testutils/host_data_source_utils.cc
@@ -209,6 +209,8 @@ HostDataSourceUtils::compareDuids(const ConstHostPtr& host1,
 void
 HostDataSourceUtils::compareHosts(const ConstHostPtr& host1,
                                   const ConstHostPtr& host2) {
+    ASSERT_TRUE(host1);
+    ASSERT_TRUE(host2);
     // Let's compare HW addresses and expect match.
     compareHwaddrs(host1, host2, true);