]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[3952] Abandon hooks tests on unrecoverable error
authorStephen Morris <stephen@isc.org>
Tue, 22 Sep 2015 13:40:29 +0000 (14:40 +0100)
committerStephen Morris <stephen@isc.org>
Tue, 22 Sep 2015 13:40:29 +0000 (14:40 +0100)
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.

src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc

index 33df3b39a33e96a3a41bfd795ad07ff4fc1cc795..49f8cbefdefca5465bee7e165484cf8d6332eb97 100644 (file)
@@ -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]);
 }