From 85279c473fe28b80b7c5e25ca6c3264dd78f44c6 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Thu, 30 Jun 2016 19:17:34 +0200 Subject: [PATCH] [4500] ASSERTs are not allowed in fixture methods --- src/bin/dhcp6/tests/hooks_unittest.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/bin/dhcp6/tests/hooks_unittest.cc b/src/bin/dhcp6/tests/hooks_unittest.cc index 8183a267b7..dc2a9969c7 100644 --- a/src/bin/dhcp6/tests/hooks_unittest.cc +++ b/src/bin/dhcp6/tests/hooks_unittest.cc @@ -410,16 +410,18 @@ public: callout_handle.getArgument("lease6", callback_lease6_); callout_handle.getArgument("ia_na", callback_ia_na_); + // Should be an ASSERT but it is not allowed here + EXPECT_TRUE(callback_lease6_); // Let's override some values in the lease - ASSERT_TRUE(callback_lease6_); callback_lease6_->iaid_ = override_iaid_; callback_lease6_->t1_ = override_t1_; callback_lease6_->t2_ = override_t2_; callback_lease6_->preferred_lft_ = override_preferred_; callback_lease6_->valid_lft_ = override_valid_; + // Should be an ASSERT but it is not allowed here + EXPECT_TRUE(callback_ia_na_); // Override the values to be sent to the client as well - ASSERT_TRUE(callback_ia_na_); callback_ia_na_->setIAID(override_iaid_); callback_ia_na_->setT1(override_t1_); callback_ia_na_->setT2(override_t2_); @@ -467,16 +469,18 @@ public: callout_handle.getArgument("lease6", callback_lease6_); callout_handle.getArgument("ia_na", callback_ia_na_); + // Should be an ASSERT but it is not allowed here + EXPECT_TRUE(callback_lease6_); // Let's override some values in the lease - ASSERT_TRUE(callback_lease6_); callback_lease6_->iaid_ = override_iaid_; callback_lease6_->t1_ = override_t1_; callback_lease6_->t2_ = override_t2_; callback_lease6_->preferred_lft_ = override_preferred_; callback_lease6_->valid_lft_ = override_valid_; + // Should be an ASSERT but it is not allowed here + EXPECT_TRUE(callback_ia_na_); // Override the values to be sent to the client as well - ASSERT_TRUE(callback_ia_na_); callback_ia_na_->setIAID(override_iaid_); callback_ia_na_->setT1(override_t1_); callback_ia_na_->setT2(override_t2_); -- 2.47.2