From 7bcfafaf97afd5de4e9b29e647ca264ae6acd610 Mon Sep 17 00:00:00 2001 From: Razvan Becheriu Date: Thu, 19 Dec 2019 15:56:27 +0000 Subject: [PATCH] [#1069] fix crashing unittests on no op database actions --- src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc | 6 +++--- src/lib/dhcpsrv/tests/test_utils.cc | 4 ++++ src/lib/dhcpsrv/testutils/host_data_source_utils.cc | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc index e0778ebfbe..f8ce430e44 100644 --- 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 3634e4ceb6..62df2493a3 100644 --- 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 e69dea083c..1fb6f3d47b 100644 --- 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); -- GitLab