[#755,!503] Address outstanding review comments.

This checks that selected packet statistics is set to 0 before the test.

diff --git a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
index 60c9df32335b6c71dde0da50ebe7125c69f762a3..e8062b43ac269f65fa487cb1208243a25ba6563b 100644 (file)
--- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
@@ -2593,9 +2593,12 @@ TEST_F(Dhcpv6SrvTest, receiveParseFailedStat) {
     ObservationPtr pkt6_rcvd = mgr.getObservation("pkt6-received");
     ObservationPtr parse_fail = mgr.getObservation("pkt6-parse-failed");
     ObservationPtr recv_drop = mgr.getObservation("pkt6-receive-drop");
-    EXPECT_TRUE(pkt6_rcvd);
-    EXPECT_TRUE(parse_fail);
-    EXPECT_TRUE(recv_drop);
+    ASSERT_TRUE(pkt6_rcvd);
+    ASSERT_TRUE(parse_fail);
+    ASSERT_TRUE(recv_drop);
+    EXPECT_EQ(0, pkt6_rcvd->getInteger().first);
+    EXPECT_EQ(0, parse_fail->getInteger().first);
+    EXPECT_EQ(0, recv_drop->getInteger().first);
 
     // Simulate that we have received that traffic
     srv.fakeReceive(pkt);

diff --git a/src/bin/dhcp6/tests/dhcp6_test_utils.cc b/src/bin/dhcp6/tests/dhcp6_test_utils.cc
index 7210a288b1435b758fe1b83bea13fc658c31255e..eef9b61efcc133653b1b67176d18c570f4a041d4 100644 (file)
--- a/src/bin/dhcp6/tests/dhcp6_test_utils.cc
+++ b/src/bin/dhcp6/tests/dhcp6_test_utils.cc
@@ -773,8 +773,10 @@ Dhcpv6SrvTest::testReceiveStats(uint8_t pkt_type, const std::string& stat_name)
     // Check that the tested statistics is initially set to 0
     ObservationPtr pkt6_rcvd = mgr.getObservation("pkt6-received");
     ObservationPtr tested_stat = mgr.getObservation(stat_name);
-    EXPECT_TRUE(pkt6_rcvd);
-    EXPECT_TRUE(tested_stat);
+    ASSERT_TRUE(pkt6_rcvd);
+    ASSERT_TRUE(tested_stat);
+    EXPECT_EQ(0, pkt6_rcvd->getInteger().first);
+    EXPECT_EQ(0, tested_stat->getInteger().first);
 
     // Simulate that we have received that traffic
     srv.fakeReceive(pkt);

diff --git a/src/bin/dhcp6/tests/infrequest_unittest.cc b/src/bin/dhcp6/tests/infrequest_unittest.cc
index 4a3334611e5e924e3247d29f8a809557254dc901..efcef61fc7c586784480b225f0a57ea1ddf2c2f9 100644 (file)
--- a/src/bin/dhcp6/tests/infrequest_unittest.cc
+++ b/src/bin/dhcp6/tests/infrequest_unittest.cc
@@ -323,10 +323,14 @@ TEST_F(InfRequestTest, infRequestStats) {
     ObservationPtr pkt6_infreq_rcvd = mgr.getObservation("pkt6-infrequest-received");
     ObservationPtr pkt6_reply_sent = mgr.getObservation("pkt6-reply-sent");
     ObservationPtr pkt6_sent = mgr.getObservation("pkt6-sent");
-    EXPECT_TRUE(pkt6_rcvd);
-    EXPECT_TRUE(pkt6_infreq_rcvd);
-    EXPECT_TRUE(pkt6_reply_sent);
-    EXPECT_TRUE(pkt6_sent);
+    ASSERT_TRUE(pkt6_rcvd);
+    ASSERT_TRUE(pkt6_infreq_rcvd);
+    ASSERT_TRUE(pkt6_reply_sent);
+    ASSERT_TRUE(pkt6_sent);
+    EXPECT_EQ(0, pkt6_rcvd->getInteger().first);
+    EXPECT_EQ(0, pkt6_infreq_rcvd->getInteger().first);
+    EXPECT_EQ(0, pkt6_reply_sent->getInteger().first);
+    EXPECT_EQ(0, pkt6_sent->getInteger().first);
 
     // Perform 2-way exchange (Inf-request/reply)
     client.requestOption(D6O_NAME_SERVERS);

diff --git a/src/bin/dhcp6/tests/sarr_unittest.cc b/src/bin/dhcp6/tests/sarr_unittest.cc
index 98a0c0ec3dbaa89ae217989a622c75dbbc08f3f4..9a7cf16beb2df72b529cafa2bfe5fe885526f936 100644 (file)
--- a/src/bin/dhcp6/tests/sarr_unittest.cc
+++ b/src/bin/dhcp6/tests/sarr_unittest.cc
@@ -501,12 +501,18 @@ TEST_F(SARRTest, sarrStats) {
     ObservationPtr pkt6_request_rcvd = mgr.getObservation("pkt6-request-received");
     ObservationPtr pkt6_reply_sent = mgr.getObservation("pkt6-reply-sent");
     ObservationPtr pkt6_sent = mgr.getObservation("pkt6-sent");
-    EXPECT_TRUE(pkt6_rcvd);
-    EXPECT_TRUE(pkt6_solicit_rcvd);
-    EXPECT_TRUE(pkt6_adv_sent);
-    EXPECT_TRUE(pkt6_request_rcvd);
-    EXPECT_TRUE(pkt6_reply_sent);
-    EXPECT_TRUE(pkt6_sent);
+    ASSERT_TRUE(pkt6_rcvd);
+    ASSERT_TRUE(pkt6_solicit_rcvd);
+    ASSERT_TRUE(pkt6_adv_sent);
+    ASSERT_TRUE(pkt6_request_rcvd);
+    ASSERT_TRUE(pkt6_reply_sent);
+    ASSERT_TRUE(pkt6_sent);
+    EXPECT_EQ(0, pkt6_rcvd->getInteger().first);
+    EXPECT_EQ(0, pkt6_solicit_rcvd->getInteger().first);
+    EXPECT_EQ(0, pkt6_adv_sent->getInteger().first);
+    EXPECT_EQ(0, pkt6_request_rcvd->getInteger().first);
+    EXPECT_EQ(0, pkt6_reply_sent->getInteger().first);
+    EXPECT_EQ(0, pkt6_sent->getInteger().first);
 
     // Perform 4-way exchange.
     ASSERT_NO_THROW(client.doSARR());