fix(tests): make delta graph test work with refactored code

KaHIP · Jul 31, 2024 · ffed00c · ffed00c
1 parent fc2e58a
commit ffed00c
Showing 1 changed file with 12 additions and 50 deletions.
diff --git a/tests/shm/datastructures/delta_partitioned_graph_test.cc b/tests/shm/datastructures/delta_partitioned_graph_test.cc
@@ -4,34 +4,28 @@
 #include "kaminpar-shm/datastructures/delta_partitioned_graph.h"
 
 namespace kaminpar::shm::testing {
-template <bool allow_read_after_move, bool compact_block_weight_delta>
-GenericDeltaPartitionedGraph<allow_read_after_move, compact_block_weight_delta>
-make_d_graph(const PartitionedGraph &p_graph) {
-  return GenericDeltaPartitionedGraph<allow_read_after_move, compact_block_weight_delta>(&p_graph);
-}
 
-TEST(DeltaPartitionedGraphTest, two_node_graph_delta_returns_original_blocks_ram) {
-  auto graph = make_empty_graph(2);
-  auto p_graph = make_p_graph(graph, 2, {0, 0});
-  auto d_graph = make_d_graph<true, false>(p_graph);
+namespace {
 
-  EXPECT_EQ(d_graph.block(0), p_graph.block(0));
-  EXPECT_EQ(d_graph.block(1), p_graph.block(1));
+DeltaPartitionedGraph make_d_graph(const PartitionedGraph &p_graph) {
+  return {&p_graph};
 }
 
-TEST(DeltaPartitionedGraphTest, two_node_graph_delta_returns_original_blocks_nram) {
+} // namespace
+
+TEST(DeltaPartitionedGraphTest, two_node_graph_delta_returns_original_blocks) {
   auto graph = make_empty_graph(2);
   auto p_graph = make_p_graph(graph, 2, {0, 0});
-  auto d_graph = make_d_graph<false, false>(p_graph);
+  auto d_graph = make_d_graph(p_graph);
 
   EXPECT_EQ(d_graph.block(0), p_graph.block(0));
   EXPECT_EQ(d_graph.block(1), p_graph.block(1));
 }
 
-TEST(DeltaPartitionedGraphTest, two_node_graph_delta_returns_new_blocks_ram) {
+TEST(DeltaPartitionedGraphTest, two_node_graph_delta_returns_new_blocks) {
   auto graph = make_empty_graph(2);
   auto p_graph = make_p_graph(graph, 2, {0, 0});
-  auto d_graph = make_d_graph<true, false>(p_graph);
+  auto d_graph = make_d_graph(p_graph);
 
   EXPECT_EQ(d_graph.block(0), p_graph.block(0));
   d_graph.set_block(0, 1);
@@ -41,57 +35,25 @@ TEST(DeltaPartitionedGraphTest, two_node_graph_delta_returns_new_blocks_ram) {
   EXPECT_EQ(d_graph.block(1), p_graph.block(1));
 }
 
-TEST(DeltaPartitionedGraphTest, two_node_graph_delta_returns_new_blocks_nram) {
-  auto graph = make_empty_graph(2);
-  auto p_graph = make_p_graph(graph, 2, {0, 0});
-  auto d_graph = make_d_graph<true, false>(p_graph);
-
-  EXPECT_EQ(d_graph.block(0), p_graph.block(0));
-  d_graph.set_block(0, 1);
-  // -- d_graph.block(0) query not allowed
-
-  EXPECT_EQ(d_graph.block(1), p_graph.block(1));
-}
-
-TEST(DeltaPartitionedGraphTest, two_node_graph_delta_returns_original_block_weights_compact) {
-  auto graph = make_empty_graph(2);
-  auto p_graph = make_p_graph(graph, 2, {0, 0});
-  auto d_graph = make_d_graph<true, true>(p_graph);
-
-  EXPECT_EQ(d_graph.block_weight(0), p_graph.block_weight(0));
-  EXPECT_EQ(d_graph.block_weight(1), p_graph.block_weight(1));
-}
-
 TEST(DeltaPartitionedGraphTest, two_node_graph_delta_returns_original_block_weights) {
   auto graph = make_empty_graph(2);
   auto p_graph = make_p_graph(graph, 2, {0, 0});
-  auto d_graph = make_d_graph<true, false>(p_graph);
+  auto d_graph = make_d_graph(p_graph);
 
   EXPECT_EQ(d_graph.block_weight(0), p_graph.block_weight(0));
   EXPECT_EQ(d_graph.block_weight(1), p_graph.block_weight(1));
 }
 
-TEST(DeltaPartitionedGraphTest, two_node_graph_delta_returns_modified_block_weights_compact) {
-  auto graph = make_empty_graph(2);
-  auto p_graph = make_p_graph(graph, 2, {0, 0});
-  auto d_graph = make_d_graph<true, true>(p_graph);
-
-  d_graph.set_block(0, 1);
-  d_graph.set_block(1, 1);
-
-  EXPECT_EQ(d_graph.block_weight(0), 0);
-  EXPECT_EQ(d_graph.block_weight(1), p_graph.total_node_weight());
-}
-
 TEST(DeltaPartitionedGraphTest, two_node_graph_delta_returns_modified_block_weights) {
   auto graph = make_empty_graph(2);
   auto p_graph = make_p_graph(graph, 2, {0, 0});
-  auto d_graph = make_d_graph<true, false>(p_graph);
+  auto d_graph = make_d_graph(p_graph);
 
   d_graph.set_block(0, 1);
   d_graph.set_block(1, 1);
 
   EXPECT_EQ(d_graph.block_weight(0), 0);
   EXPECT_EQ(d_graph.block_weight(1), p_graph.total_node_weight());
 }
+
 } // namespace kaminpar::shm::testing