From 2c0935a7718a224331fbc9c15a6da91ec01b3f86 Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Tue, 16 Jul 2024 08:13:13 -0500
Subject: [PATCH] isolate test directory

---
 repertory/repertory_test/src/providers_test.cpp   | 15 +++++++--------
 repertory/repertory_test/src/remote_fuse_test.cpp |  2 +-
 .../repertory_test/src/remote_winfsp_test.cpp     |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/repertory/repertory_test/src/providers_test.cpp b/repertory/repertory_test/src/providers_test.cpp
index b59c71c7..36424c2d 100644
--- a/repertory/repertory_test/src/providers_test.cpp
+++ b/repertory/repertory_test/src/providers_test.cpp
@@ -626,7 +626,8 @@ static void run_tests(const app_config &cfg, i_provider &provider) {
 }
 
 TEST(providers, encrypt_provider) {
-  const auto config_path = utils::path::absolute("./providers_test_encrypt");
+  const auto config_path =
+      utils::path::combine(get_test_dir(), {"encrypt_provider"});
   ASSERT_TRUE(utils::file::delete_directory_recursively(config_path));
 
   console_consumer consumer{};
@@ -634,11 +635,7 @@ TEST(providers, encrypt_provider) {
   {
     app_config cfg(provider_type::encrypt, config_path);
 
-    const auto encrypt_path = utils::path::combine(
-        std::filesystem::path(utils::path::absolute(__FILE__))
-            .parent_path()
-            .string(),
-        {"encrypt"});
+    const auto encrypt_path = utils::path::combine(get_test_dir(), {"encrypt"});
 
     EXPECT_STREQ(
         encrypt_path.c_str(),
@@ -672,7 +669,8 @@ TEST(providers, encrypt_provider) {
 
 #if defined(REPERTORY_ENABLE_S3) && defined(REPERTORY_ENABLE_S3_TESTING)
 TEST(providers, s3_provider) {
-  const auto config_path = utils::path::absolute("./providers_test_s3");
+  const auto config_path =
+      utils::path::combine(get_test_dir(), {"s3_provider"});
   ASSERT_TRUE(utils::file::delete_directory_recursively(config_path));
 
   console_consumer consumer{};
@@ -710,7 +708,8 @@ TEST(providers, s3_provider) {
 #endif
 
 TEST(providers, sia_provider) {
-  const auto config_path = utils::path::absolute("./providers_test_sia");
+  const auto config_path =
+      utils::path::combine(get_test_dir(), {"sia_provider"});
   ASSERT_TRUE(utils::file::delete_directory_recursively(config_path));
 
   console_consumer consumer{};
diff --git a/repertory/repertory_test/src/remote_fuse_test.cpp b/repertory/repertory_test/src/remote_fuse_test.cpp
index 482bc150..c0156061 100644
--- a/repertory/repertory_test/src/remote_fuse_test.cpp
+++ b/repertory/repertory_test/src/remote_fuse_test.cpp
@@ -940,7 +940,7 @@ TEST(remote_fuse, all_tests) {
 
     event_system::instance().start();
 #if defined(_WIN32)
-    mount_location_ = std::string(__FILE__).substr(0, 2);
+    mount_location_ = std::string(get_test_dir()).substr(0, 2);
     mock_winfsp_drive drive(mount_location_);
     remote_server server(config, drive, mount_location_);
 #else
diff --git a/repertory/repertory_test/src/remote_winfsp_test.cpp b/repertory/repertory_test/src/remote_winfsp_test.cpp
index f925622f..e24df817 100644
--- a/repertory/repertory_test/src/remote_winfsp_test.cpp
+++ b/repertory/repertory_test/src/remote_winfsp_test.cpp
@@ -494,7 +494,7 @@ TEST(remote_winfsp, all_tests) {
 
     event_system::instance().start();
 #if defined(_WIN32)
-    mount_location_ = std::string(__FILE__).substr(0, 2);
+    mount_location_ = std::string(get_test_dir()).substr(0, 2);
     mock_winfsp_drive drive(mount_location_);
     remote_server server(config, drive, mount_location_);
 #else