From: Stephen Morris <stephen@isc.org>
Date: Tue, 22 Sep 2015 13:40:29 +0000 (+0100)
Subject: [3952] Abandon hooks tests on unrecoverable error
X-Git-Tag: trac4074_base~22^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=98bfa1817b72cd4f70c371fe4eff80484d4b9f59;p=thirdparty%2Fkea.git

[3952] Abandon hooks tests on unrecoverable error

Changed some EXPECT_EQ tests to ASSERT_EQ in cases where the length
of a vector was checked and subsequently followed by checks that
accessed elements of the array.  This way, if the array is too short,
the test will cleanly exit rather than possibly segmentation fault.
---

diff --git a/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
index 33df3b39a3..49f8cbefde 100644
--- a/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
+++ b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
@@ -884,7 +884,7 @@ TEST_F(ParseConfigTest, oneHooksLibrary) {
     bool changed;
     hooks_libraries_parser_->getLibraries(libraries, changed);
     EXPECT_TRUE(changed);
-    EXPECT_EQ(1, libraries.size());
+    ASSERT_EQ(1, libraries.size());
     EXPECT_EQ(CALLOUT_LIBRARY_1, libraries[0]);
 }
 
@@ -904,7 +904,7 @@ TEST_F(ParseConfigTest, twoHooksLibraries) {
     bool changed;
     hooks_libraries_parser_->getLibraries(libraries, changed);
     EXPECT_TRUE(changed);
-    EXPECT_EQ(2, libraries.size());
+    ASSERT_EQ(2, libraries.size());
     EXPECT_EQ(CALLOUT_LIBRARY_1, libraries[0]);
     EXPECT_EQ(CALLOUT_LIBRARY_2, libraries[1]);
 }
@@ -931,7 +931,7 @@ TEST_F(ParseConfigTest, reconfigureSameHooksLibraries) {
     bool changed;
     hooks_libraries_parser_->getLibraries(libraries, changed);
     EXPECT_FALSE(changed);
-    EXPECT_EQ(2, libraries.size());
+    ASSERT_EQ(2, libraries.size());
     EXPECT_EQ(CALLOUT_LIBRARY_1, libraries[0]);
     EXPECT_EQ(CALLOUT_LIBRARY_2, libraries[1]);
 }
@@ -959,7 +959,7 @@ TEST_F(ParseConfigTest, reconfigureReverseHooksLibraries) {
     bool changed;
     hooks_libraries_parser_->getLibraries(libraries, changed);
     EXPECT_TRUE(changed);
-    EXPECT_EQ(2, libraries.size());
+    ASSERT_EQ(2, libraries.size());
     EXPECT_EQ(CALLOUT_LIBRARY_2, libraries[0]);
     EXPECT_EQ(CALLOUT_LIBRARY_1, libraries[1]);
 }