Browse Source

[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.
Stephen Morris 9 years ago
parent
commit
98bfa1817b
1 changed files with 4 additions and 4 deletions
  1. 4 4
      src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc

+ 4 - 4
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]);
 }