Activate DynamicGraph Datastructure Tests (#52)

* Activate DynamicGraph tests * Fix the death test error * Add missing namespace ::testing::MatchesRegex
franziska-wegner · Dec 26, 2023 · fe424e7 · fe424e7
1 parent 9fb0083
commit fe424e7
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 9 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -31,9 +31,9 @@ add_executable(TestGraph DataStructures/Graphs/TestGraph.cpp)
 target_link_libraries(TestGraph EGOA ${GUROBI_LIBRARIES} gtest gtest_main gmock_main)
 add_test(NAME TestGraph COMMAND TestGraph)
 
-# add_executable(TestDynamicGraph DataStructures/Graphs/TestDynamicGraph.cpp)
-# target_link_libraries(TestDynamicGraph EGOA ${GUROBI_LIBRARIES} gtest gtest_main gmock_main)
-# add_test(NAME TestDynamicGraph COMMAND TestDynamicGraph)
+add_executable(TestDynamicGraph DataStructures/Graphs/TestDynamicGraph.cpp)
+target_link_libraries(TestDynamicGraph EGOA ${GUROBI_LIBRARIES} gtest gtest_main gmock_main)
+add_test(NAME TestDynamicGraph COMMAND TestDynamicGraph)
 
 # add_executable(TestPowerGrid DataStructures/Graphs/TestPowerGrid.cpp)
 # target_link_libraries(TestPowerGrid EGOA ${GUROBI_LIBRARIES} gtest gtest_main gmock_main)

diff --git a/tests/DataStructures/Graphs/TestDynamicGraph.cpp b/tests/DataStructures/Graphs/TestDynamicGraph.cpp
@@ -7,16 +7,39 @@
 
 #include "TestDynamicGraph.hpp"
 
+using ::testing::MatchesRegex;
+
 namespace egoa::test {
 
 #pragma mark DeleteVertex
 
-TEST_F(TestDynamicGraphEmptyDeathTest, DeleteVertex) {
-    auto assertionMessage =
-        this->assertionString("RemoveVertexAt", "VertexExists\\(id\\)");
-    Types::vertexId id = 0;
-    EXPECT_DEATH( { this->graph_.RemoveVertexAt(id); }, assertionMessage);
-}
+#ifdef EGOA_ENABLE_ASSERTION
+    TEST_F(TestDynamicGraphEmptyDeathTest, DeleteVertex) {
+        auto assertionMessage =
+            this->assertionString("RemoveVertexAt", "VertexExists\\(id\\)");
+        Types::vertexId id = 0;
+        EXPECT_DEATH( { this->graph_.RemoveVertexAt(id); }, assertionMessage);
+    }
+#else
+#ifdef EGOA_ENABLE_EXCEPTION_HANDLING
+    TEST_F  ( TestDynamicGraphEmpty
+            , DeleteVertexExceptionHandling ) 
+    {
+        auto assertionString = this->assertionString("RemoveVertexAt", "VertexExists\\(id\\)");
+        Types::vertexId id = 0;
+        try {
+            this->graph_.RemoveVertexAt(id);
+        } catch ( std::runtime_error const & error ) 
+        {
+            EXPECT_THAT ( error.what(), MatchesRegex(assertionString.c_str()) );
+        } catch ( ... ) 
+        {
+            FAIL()  << "Expected std::runtime_error with message: " 
+                    << assertionString;
+        }
+    }
+#endif // ifdef EGOA_ENABLE_EXCEPTION_HANDLING
+#endif // ifdef EGOA_ENABLE_ASSERTION
 
 TEST_F(TestDynamicGraphSingleVertex, DeleteVertex) {
     this->graph_.RemoveVertexAt(this->id_);