Merge pull request #1726 from evoskuil/master

Generalize test directory fixture setup.

Author: evoskuil

test/test.hpp

@@ -105,6 +105,20 @@ bool create(const std::filesystem::path& file_path) NOEXCEPT;
 bool exists(const std::filesystem::path& file_path) NOEXCEPT;
 bool remove(const std::filesystem::path& file_path) NOEXCEPT;
 
+struct directory_setup_fixture
+{
+    DELETE_COPY_MOVE(directory_setup_fixture);
+
+    directory_setup_fixture() NOEXCEPT
+    {
+        BOOST_REQUIRE(clear(directory));
+    }
+    ~directory_setup_fixture() NOEXCEPT
+    {
+        BOOST_REQUIRE(clear(directory));
+    }
+};
+
 // Utility to convert a const reference instance to moveable.
 template <typename Type>
 Type move_copy(const Type& instance) NOEXCEPT

test/unicode/utf8_everywhere/ifstream.cpp

@@ -18,24 +18,11 @@
  */
 #include "../../test.hpp"
 
-struct ifstream_tests_setup_fixture
-{
-    ifstream_tests_setup_fixture()
-    {
-        test::remove(TEST_NAME);
-    }
-
-    ~ifstream_tests_setup_fixture()
-    {
-        test::remove(TEST_NAME);
-    }
-};
-
-BOOST_FIXTURE_TEST_SUITE(ifstream_tests, ifstream_tests_setup_fixture)
+BOOST_FIXTURE_TEST_SUITE(ifstream_tests, test::directory_setup_fixture)
 
 BOOST_AUTO_TEST_CASE(ifstream__construct__valid_path__round_trip)
 {
-    ofstream out(TEST_NAME, std::ofstream::out);
+    ofstream out(TEST_PATH, std::ofstream::out);
     BOOST_REQUIRE(out.good());
     BOOST_REQUIRE(!out.bad());
 
@@ -46,7 +33,7 @@ BOOST_AUTO_TEST_CASE(ifstream__construct__valid_path__round_trip)
     out.close();
     BOOST_REQUIRE(out.good());
 
-    ifstream in(TEST_NAME);
+    ifstream in(TEST_PATH);
     BOOST_REQUIRE(in.good());
 
     std::string line;

test/unicode/utf8_everywhere/ofstream.cpp

@@ -18,24 +18,11 @@
  */
 #include "../../test.hpp"
 
-struct ofstream_tests_setup_fixture
-{
-    ofstream_tests_setup_fixture()
-    {
-        test::remove(TEST_NAME);
-    }
-
-    ~ofstream_tests_setup_fixture()
-    {
-        test::remove(TEST_NAME);
-    }
-};
-
-BOOST_FIXTURE_TEST_SUITE(ofstream_tests, ofstream_tests_setup_fixture)
+BOOST_FIXTURE_TEST_SUITE(ofstream_tests, test::directory_setup_fixture)
 
 BOOST_AUTO_TEST_CASE(ofstream__construct__valid_path__round_trip)
 {
-    ofstream out(TEST_NAME, std::ofstream::out);
+    ofstream out(TEST_PATH, std::ofstream::out);
     BOOST_REQUIRE(out.good());
     BOOST_REQUIRE(!out.bad());
 
@@ -46,7 +33,7 @@ BOOST_AUTO_TEST_CASE(ofstream__construct__valid_path__round_trip)
     out.close();
     BOOST_REQUIRE(out.good());
 
-    ifstream in(TEST_NAME);
+    ifstream in(TEST_PATH);
     BOOST_REQUIRE(in.good());
 
     std::string line;