Test

kiminuo · Feb 10, 2021 · 3323455 · 3323455
1 parent deb185d
commit 3323455
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 24 deletions.
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
@@ -46,28 +46,6 @@ namespace BCLog {
 
 BOOST_FIXTURE_TEST_SUITE(util_tests, BasicTestingSetup)
 
-BOOST_AUTO_TEST_CASE(util_datadir)
-{
-    ClearDatadirCache();
-    const fs::path dd_norm = GetDataDir();
-
-    gArgs.ForceSetArg("-datadir", dd_norm.string() + "/");
-    ClearDatadirCache();
-    BOOST_CHECK_EQUAL(dd_norm, GetDataDir());
-
-    gArgs.ForceSetArg("-datadir", dd_norm.string() + "/.");
-    ClearDatadirCache();
-    BOOST_CHECK_EQUAL(dd_norm, GetDataDir());
-
-    gArgs.ForceSetArg("-datadir", dd_norm.string() + "/./");
-    ClearDatadirCache();
-    BOOST_CHECK_EQUAL(dd_norm, GetDataDir());
-
-    gArgs.ForceSetArg("-datadir", dd_norm.string() + "/.//");
-    ClearDatadirCache();
-    BOOST_CHECK_EQUAL(dd_norm, GetDataDir());
-}
-
 BOOST_AUTO_TEST_CASE(util_check)
 {
     // Check that Assert can forward
@@ -303,6 +281,30 @@ class CheckValueTest : public TestChain100Setup
     }
 };
 
+BOOST_AUTO_TEST_CASE(util_datadir)
+{
+    TestArgsManager testArgs;
+
+    ClearDatadirCache();
+    const fs::path dd_norm = GetDataDir(testArgs);
+
+    testArgs.ForceSetArg("-datadir", dd_norm.string() + "/");
+    ClearDatadirCache();
+    BOOST_CHECK_EQUAL(dd_norm, GetDataDir(testArgs));
+
+    testArgs.ForceSetArg("-datadir", dd_norm.string() + "/.");
+    ClearDatadirCache();
+    BOOST_CHECK_EQUAL(dd_norm, GetDataDir(testArgs));
+
+    testArgs.ForceSetArg("-datadir", dd_norm.string() + "/./");
+    ClearDatadirCache();
+    BOOST_CHECK_EQUAL(dd_norm, GetDataDir(testArgs));
+
+    testArgs.ForceSetArg("-datadir", dd_norm.string() + "/.//");
+    ClearDatadirCache();
+    BOOST_CHECK_EQUAL(dd_norm, GetDataDir(testArgs));
+}
+
 BOOST_FIXTURE_TEST_CASE(util_CheckValue, CheckValueTest)
 {
     using M = ArgsManager;

diff --git a/src/util/system.cpp b/src/util/system.cpp
@@ -767,7 +767,7 @@ const fs::path &GetBlocksDir()
     return path;
 }
 
-const fs::path &GetDataDir(bool fNetSpecific)
+const fs::path &GetDataDir(ArgsManager& argsManager, bool fNetSpecific)
 {
     LOCK(csPathCached);
     fs::path &path = fNetSpecific ? pathCachedNetSpecific : pathCached;
@@ -776,7 +776,7 @@ const fs::path &GetDataDir(bool fNetSpecific)
     // this function
     if (!path.empty()) return path;
 
-    std::string datadir = gArgs.GetArg("-datadir", "");
+    std::string datadir = argsManager.GetArg("-datadir", "");
     if (!datadir.empty()) {
         path = fs::system_complete(datadir);
         if (!fs::is_directory(path)) {
@@ -798,6 +798,11 @@ const fs::path &GetDataDir(bool fNetSpecific)
     return path;
 }
 
+const fs::path &GetDataDir(bool fNetSpecific)
+{
+    return GetDataDir(gArgs, fNetSpecific);
+}
+
 bool CheckDataDirOption()
 {
     std::string datadir = gArgs.GetArg("-datadir", "");

diff --git a/src/util/system.h b/src/util/system.h
@@ -36,6 +36,7 @@
 #include <vector>
 
 class UniValue;
+class ArgsManager;
 
 // Application startup time (used for uptime calculation)
 int64_t GetStartupTime();
@@ -94,6 +95,7 @@ fs::path GetDefaultDataDir();
 // The blocks directory is always net specific.
 const fs::path &GetBlocksDir();
 const fs::path &GetDataDir(bool fNetSpecific = true);
+const fs::path &GetDataDir(ArgsManager& argsManager, bool fNetSpecific = true);
 // Return true if -datadir option points to a valid directory or is not specified.
 bool CheckDataDirOption();
 /** Tests only */