From 9973b3f8a8c9323641fc87fe057ad7130edc31ec Mon Sep 17 00:00:00 2001
From: Christian Mazakas <christian.mazakas@gmail.com>
Date: Fri, 27 Jan 2023 14:40:17 -0800
Subject: [PATCH] Comment tests back in

---
 test/exception/merge_exception_tests.cpp | 116 +++++++++++------------
 1 file changed, 58 insertions(+), 58 deletions(-)

diff --git a/test/exception/merge_exception_tests.cpp b/test/exception/merge_exception_tests.cpp
index 8d1cac42..6101e0bb 100644
--- a/test/exception/merge_exception_tests.cpp
+++ b/test/exception/merge_exception_tests.cpp
@@ -72,39 +72,39 @@ boost::unordered_node_map<test::exception::object, test::exception::object,
   test::exception::allocator2<test::exception::object> >* test_node_map_;
 
 // clang-format off
-// UNORDERED_MULTI_TEST(set_merge, merge_exception_test,
-//     ((test_set_))
-//     ((test_set_))
-//     ((0x0000)(0x6400)(0x0064)(0x0a64)(0x3232))
-//     ((0x0000)(0x0001)(0x0102))
-//     ((default_generator)(limited_range))
-//     ((default_generator)(limited_range))
-// )
-// UNORDERED_MULTI_TEST(map_merge, merge_exception_test,
-//     ((test_map_))
-//     ((test_map_))
-//     ((0x0000)(0x6400)(0x0064)(0x0a64)(0x3232))
-//     ((0x0101)(0x0200)(0x0201))
-//     ((default_generator)(limited_range))
-//     ((default_generator)(limited_range))
-// )
-// // Run fewer generate_collisions tests, as they're slow.
-// UNORDERED_MULTI_TEST(set_merge_collisions, merge_exception_test,
-//     ((test_set_))
-//     ((test_set_))
-//     ((0x0a0a))
-//     ((0x0202)(0x0100)(0x0201))
-//     ((generate_collisions))
-//     ((generate_collisions))
-// )
-// UNORDERED_MULTI_TEST(map_merge_collisions, merge_exception_test,
-//     ((test_map_))
-//     ((test_map_))
-//     ((0x0a0a))
-//     ((0x0000)(0x0002)(0x0102))
-//     ((generate_collisions))
-//     ((generate_collisions))
-// )
+UNORDERED_MULTI_TEST(set_merge, merge_exception_test,
+    ((test_set_))
+    ((test_set_))
+    ((0x0000)(0x6400)(0x0064)(0x0a64)(0x3232))
+    ((0x0000)(0x0001)(0x0102))
+    ((default_generator)(limited_range))
+    ((default_generator)(limited_range))
+)
+UNORDERED_MULTI_TEST(map_merge, merge_exception_test,
+    ((test_map_))
+    ((test_map_))
+    ((0x0000)(0x6400)(0x0064)(0x0a64)(0x3232))
+    ((0x0101)(0x0200)(0x0201))
+    ((default_generator)(limited_range))
+    ((default_generator)(limited_range))
+)
+// Run fewer generate_collisions tests, as they're slow.
+UNORDERED_MULTI_TEST(set_merge_collisions, merge_exception_test,
+    ((test_set_))
+    ((test_set_))
+    ((0x0a0a))
+    ((0x0202)(0x0100)(0x0201))
+    ((generate_collisions))
+    ((generate_collisions))
+)
+UNORDERED_MULTI_TEST(map_merge_collisions, merge_exception_test,
+    ((test_map_))
+    ((test_map_))
+    ((0x0a0a))
+    ((0x0000)(0x0002)(0x0102))
+    ((generate_collisions))
+    ((generate_collisions))
+)
 UNORDERED_MULTI_TEST(node_set_merge, merge_exception_test,
     ((test_node_set_))
     ((test_node_set_))
@@ -113,31 +113,31 @@ UNORDERED_MULTI_TEST(node_set_merge, merge_exception_test,
     ((default_generator)(limited_range))
     ((default_generator)(limited_range))
 )
-// UNORDERED_MULTI_TEST(node_map_merge, merge_exception_test,
-//     ((test_node_map_))
-//     ((test_node_map_))
-//     ((0x0000)(0x6400)(0x0064)(0x0a64)(0x3232))
-//     ((0x0101)(0x0200)(0x0201))
-//     ((default_generator)(limited_range))
-//     ((default_generator)(limited_range))
-// )
-// // Run fewer generate_collisions tests, as they're slow.
-// UNORDERED_MULTI_TEST(node_set_merge_collisions, merge_exception_test,
-//     ((test_node_set_))
-//     ((test_node_set_))
-//     ((0x0a0a))
-//     ((0x0202)(0x0100)(0x0201))
-//     ((generate_collisions))
-//     ((generate_collisions))
-// )
-// UNORDERED_MULTI_TEST(node_map_merge_collisions, merge_exception_test,
-//     ((test_node_map_))
-//     ((test_node_map_))
-//     ((0x0a0a))
-//     ((0x0000)(0x0002)(0x0102))
-//     ((generate_collisions))
-//     ((generate_collisions))
-// )
+UNORDERED_MULTI_TEST(node_map_merge, merge_exception_test,
+    ((test_node_map_))
+    ((test_node_map_))
+    ((0x0000)(0x6400)(0x0064)(0x0a64)(0x3232))
+    ((0x0101)(0x0200)(0x0201))
+    ((default_generator)(limited_range))
+    ((default_generator)(limited_range))
+)
+// Run fewer generate_collisions tests, as they're slow.
+UNORDERED_MULTI_TEST(node_set_merge_collisions, merge_exception_test,
+    ((test_node_set_))
+    ((test_node_set_))
+    ((0x0a0a))
+    ((0x0202)(0x0100)(0x0201))
+    ((generate_collisions))
+    ((generate_collisions))
+)
+UNORDERED_MULTI_TEST(node_map_merge_collisions, merge_exception_test,
+    ((test_node_map_))
+    ((test_node_map_))
+    ((0x0a0a))
+    ((0x0000)(0x0002)(0x0102))
+    ((generate_collisions))
+    ((generate_collisions))
+)
 // clang-format on
 #else
 boost::unordered_set<test::exception::object, test::exception::hash,