Generalize test directory fixture setup.

evoskuil · evoskuil · commit eb678b23de16 · 2025-10-04T23:48:57.000-04:00
diff --git a/test/file/rotator.cpp b/test/file/rotator.cpp
@@ -18,25 +18,7 @@
  */
 #include "../test.hpp"
 
-struct rotator_setup_fixture
-{
-    DELETE_COPY_MOVE(rotator_setup_fixture);
-    BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
-
-    rotator_setup_fixture() NOEXCEPT
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    ~rotator_setup_fixture() NOEXCEPT
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    BC_POP_WARNING()
-};
-
-BOOST_FIXTURE_TEST_SUITE(rotator_tests, rotator_setup_fixture)
+BOOST_FIXTURE_TEST_SUITE(rotator_tests, test::directory_setup_fixture)
 
 // ostream instance.
 using rotate = file::stream::out::rotator;
diff --git a/test/file/utilities.cpp b/test/file/utilities.cpp
@@ -18,25 +18,7 @@
  */
 #include "../test.hpp"
 
-struct file_utilities_setup_fixture
-{
-    DELETE_COPY_MOVE(file_utilities_setup_fixture);
-    BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
-
-    file_utilities_setup_fixture() NOEXCEPT
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    ~file_utilities_setup_fixture() NOEXCEPT
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    BC_POP_WARNING()
-};
-
-BOOST_FIXTURE_TEST_SUITE(file_utilities_tests, file_utilities_setup_fixture)
+BOOST_FIXTURE_TEST_SUITE(file_utilities_tests, test::directory_setup_fixture)
 
 using namespace system;
 static_assert(file::invalid == -1);
diff --git a/test/locks/file_lock.cpp b/test/locks/file_lock.cpp
@@ -18,20 +18,7 @@
  */
 #include "../test.hpp"
 
-struct file_lock_setup_fixture
-{
-    file_lock_setup_fixture() noexcept
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    ~file_lock_setup_fixture() noexcept
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-};
-
-BOOST_FIXTURE_TEST_SUITE(file_lock_tests, file_lock_setup_fixture)
+BOOST_FIXTURE_TEST_SUITE(file_lock_tests, test::directory_setup_fixture)
 
 class access final
   : public file_lock
diff --git a/test/locks/flush_lock.cpp b/test/locks/flush_lock.cpp
@@ -18,20 +18,7 @@
  */
 #include "../test.hpp"
 
-struct flush_lock_setup_fixture
-{
-    flush_lock_setup_fixture() noexcept
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    ~flush_lock_setup_fixture() noexcept
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-};
-
-BOOST_FIXTURE_TEST_SUITE(flush_lock_tests, flush_lock_setup_fixture)
+BOOST_FIXTURE_TEST_SUITE(flush_lock_tests, test::directory_setup_fixture)
 
 BOOST_AUTO_TEST_CASE(flush_lock__construct__file__expected)
 {
diff --git a/test/locks/interprocess_lock.cpp b/test/locks/interprocess_lock.cpp
@@ -18,20 +18,7 @@
  */
 #include "../test.hpp"
 
-struct interprocess_lock_setup_fixture
-{
-    interprocess_lock_setup_fixture() noexcept
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    ~interprocess_lock_setup_fixture() noexcept
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-};
-
-BOOST_FIXTURE_TEST_SUITE(interprocess_lock_tests, interprocess_lock_setup_fixture)
+BOOST_FIXTURE_TEST_SUITE(interprocess_lock_tests, test::directory_setup_fixture)
 
 BOOST_AUTO_TEST_CASE(interprocess_lock__construct__file__expected)
 {
diff --git a/test/memory/map.cpp b/test/memory/map.cpp
@@ -22,25 +22,7 @@
 // error::load_failure, error::flush_failure, error::unload_failure codes, but
 // don't want to make this class virtual.
 
-struct map_setup_fixture
-{
-    DELETE_COPY_MOVE(map_setup_fixture);
-    BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
-
-    map_setup_fixture() NOEXCEPT
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    ~map_setup_fixture() NOEXCEPT
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    BC_POP_WARNING()
-};
-
-BOOST_FIXTURE_TEST_SUITE(map_tests, map_setup_fixture)
+BOOST_FIXTURE_TEST_SUITE(map_tests, test::directory_setup_fixture)
 
 BOOST_AUTO_TEST_CASE(map__file__always__expected)
 {
diff --git a/test/query/archive_read.cpp b/test/query/archive_read.cpp
@@ -20,25 +20,7 @@
 #include "../mocks/blocks.hpp"
 #include "../mocks/chunk_store.hpp"
 
-struct query_archive_read_setup_fixture
-{
-    DELETE_COPY_MOVE(query_archive_read_setup_fixture);
-    BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
-
-    query_archive_read_setup_fixture() NOEXCEPT
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    ~query_archive_read_setup_fixture() NOEXCEPT
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    BC_POP_WARNING()
-};
-
-BOOST_FIXTURE_TEST_SUITE(query_archive_read_tests, query_archive_read_setup_fixture)
+BOOST_FIXTURE_TEST_SUITE(query_archive_read_tests, test::directory_setup_fixture)
 
 ////const auto events_handler = [](auto, auto) {};
 
diff --git a/test/query/archive_write.cpp b/test/query/archive_write.cpp
@@ -20,25 +20,7 @@
 #include "../mocks/blocks.hpp"
 #include "../mocks/chunk_store.hpp"
 
-struct query_archive_write_setup_fixture
-{
-    DELETE_COPY_MOVE(query_archive_write_setup_fixture);
-    BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
-
-    query_archive_write_setup_fixture() NOEXCEPT
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    ~query_archive_write_setup_fixture() NOEXCEPT
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    BC_POP_WARNING()
-};
-
-BOOST_FIXTURE_TEST_SUITE(query_archive_write_tests, query_archive_write_setup_fixture)
+BOOST_FIXTURE_TEST_SUITE(query_archive_write_tests, test::directory_setup_fixture)
 
 // ensure context::flags is same size as chain_context::flags.
 static_assert(is_same_type<database::context::flag_t::integer, decltype(system::chain::context{}.flags)>);
diff --git a/test/query/confirm.cpp b/test/query/confirm.cpp
@@ -20,25 +20,7 @@
 #include "../mocks/blocks.hpp"
 #include "../mocks/chunk_store.hpp"
 
-struct query_confirm_setup_fixture
-{
-    DELETE_COPY_MOVE(query_confirm_setup_fixture);
-    BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
-
-    query_confirm_setup_fixture() NOEXCEPT
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    ~query_confirm_setup_fixture() NOEXCEPT
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    BC_POP_WARNING()
-};
-
-BOOST_FIXTURE_TEST_SUITE(query_confirm_tests, query_confirm_setup_fixture)
+BOOST_FIXTURE_TEST_SUITE(query_confirm_tests, test::directory_setup_fixture)
 
 // nop event handler.
 const auto events_handler = [](auto, auto) {};
diff --git a/test/query/consensus.cpp b/test/query/consensus.cpp
@@ -20,25 +20,7 @@
 #include "../mocks/blocks.hpp"
 #include "../mocks/chunk_store.hpp"
 
-struct query_consensus_setup_fixture
-{
-    DELETE_COPY_MOVE(query_consensus_setup_fixture);
-    BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
-
-    query_consensus_setup_fixture() NOEXCEPT
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    ~query_consensus_setup_fixture() NOEXCEPT
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    BC_POP_WARNING()
-};
-
-BOOST_FIXTURE_TEST_SUITE(query_consensus_tests, query_consensus_setup_fixture)
+BOOST_FIXTURE_TEST_SUITE(query_consensus_tests, test::directory_setup_fixture)
 
 ////const auto events_handler = [](auto, auto) {};
 
diff --git a/test/query/context.cpp b/test/query/context.cpp
@@ -20,25 +20,7 @@
 #include "../mocks/blocks.hpp"
 #include "../mocks/chunk_store.hpp"
 
-struct query_context_setup_fixture
-{
-    DELETE_COPY_MOVE(query_context_setup_fixture);
-    BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
-
-    query_context_setup_fixture() NOEXCEPT
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    ~query_context_setup_fixture() NOEXCEPT
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    BC_POP_WARNING()
-};
-
-BOOST_FIXTURE_TEST_SUITE(query_context_tests, query_context_setup_fixture)
+BOOST_FIXTURE_TEST_SUITE(query_context_tests, test::directory_setup_fixture)
 
 const auto events_handler = [](auto, auto) {};
 
diff --git a/test/query/extent.cpp b/test/query/extent.cpp
@@ -20,25 +20,7 @@
 #include "../mocks/blocks.hpp"
 #include "../mocks/chunk_store.hpp"
 
-struct query_extent_setup_fixture
-{
-    DELETE_COPY_MOVE(query_extent_setup_fixture);
-    BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
-
-    query_extent_setup_fixture() NOEXCEPT
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    ~query_extent_setup_fixture() NOEXCEPT
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    BC_POP_WARNING()
-};
-
-BOOST_FIXTURE_TEST_SUITE(query_extent_tests, query_extent_setup_fixture)
+BOOST_FIXTURE_TEST_SUITE(query_extent_tests, test::directory_setup_fixture)
 
 // nop event handler.
 const auto events_handler = [](auto, auto) {};
diff --git a/test/query/height.cpp b/test/query/height.cpp
@@ -20,25 +20,7 @@
 #include "../mocks/blocks.hpp"
 #include "../mocks/chunk_store.hpp"
 
-struct query_height_setup_fixture
-{
-    DELETE_COPY_MOVE(query_height_setup_fixture);
-    BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
-
-    query_height_setup_fixture() NOEXCEPT
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    ~query_height_setup_fixture() NOEXCEPT
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    BC_POP_WARNING()
-};
-
-BOOST_FIXTURE_TEST_SUITE(query_height_tests, query_height_setup_fixture)
+BOOST_FIXTURE_TEST_SUITE(query_height_tests, test::directory_setup_fixture)
 
 ////const auto events_handler = [](auto, auto) {};
 
diff --git a/test/query/initialize.cpp b/test/query/initialize.cpp
@@ -20,25 +20,7 @@
 #include "../mocks/blocks.hpp"
 #include "../mocks/chunk_store.hpp"
 
-struct query_initialize_setup_fixture
-{
-    DELETE_COPY_MOVE(query_initialize_setup_fixture);
-    BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
-
-    query_initialize_setup_fixture() NOEXCEPT
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    ~query_initialize_setup_fixture() NOEXCEPT
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    BC_POP_WARNING()
-};
-
-BOOST_FIXTURE_TEST_SUITE(query_initialize_tests, query_initialize_setup_fixture)
+BOOST_FIXTURE_TEST_SUITE(query_initialize_tests, test::directory_setup_fixture)
 
 // nop event handler.
 const auto events_handler = [](auto, auto) {};
diff --git a/test/query/network.cpp b/test/query/network.cpp
@@ -20,25 +20,7 @@
 #include "../mocks/blocks.hpp"
 #include "../mocks/chunk_store.hpp"
 
-struct query_network_setup_fixture
-{
-    DELETE_COPY_MOVE(query_network_setup_fixture);
-    BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
-
-    query_network_setup_fixture() NOEXCEPT
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    ~query_network_setup_fixture() NOEXCEPT
-    {
-        BOOST_REQUIRE(test::clear(test::directory));
-    }
-
-    BC_POP_WARNING()
-};
-
-BOOST_FIXTURE_TEST_SUITE(query_network_tests, query_network_setup_fixture)
+BOOST_FIXTURE_TEST_SUITE(query_network_tests, test::directory_setup_fixture)
 
 ////const auto events_handler = [](auto, auto) {};
 
diff --git a/test/query/objects.cpp b/test/query/objects.cpp
diff --git a/test/query/optional.cpp b/test/query/optional.cpp
diff --git a/test/query/translate.cpp b/test/query/translate.cpp
diff --git a/test/query/validate.cpp b/test/query/validate.cpp
diff --git a/test/store.cpp b/test/store.cpp
diff --git a/test/test.hpp b/test/test.hpp
