Modify "util_datadir" unit test to not use gArgs.

This commit is contained in:
Kiminuo 2021-02-26 09:52:50 +01:00
parent 1add318704
commit 1cb52ba065

View File

@ -49,24 +49,27 @@ BOOST_FIXTURE_TEST_SUITE(util_tests, BasicTestingSetup)
BOOST_AUTO_TEST_CASE(util_datadir) BOOST_AUTO_TEST_CASE(util_datadir)
{ {
ClearDatadirCache(); // Use local args variable instead of m_args to avoid making assumptions about test setup
const fs::path dd_norm = GetDataDir(); ArgsManager args;
args.ForceSetArg("-datadir", m_path_root.string());
gArgs.ForceSetArg("-datadir", dd_norm.string() + "/"); const fs::path dd_norm = args.GetDataDirPath();
ClearDatadirCache();
BOOST_CHECK_EQUAL(dd_norm, GetDataDir());
gArgs.ForceSetArg("-datadir", dd_norm.string() + "/."); args.ForceSetArg("-datadir", dd_norm.string() + "/");
ClearDatadirCache(); ClearDatadirCache();
BOOST_CHECK_EQUAL(dd_norm, GetDataDir()); BOOST_CHECK_EQUAL(dd_norm, args.GetDataDirPath());
gArgs.ForceSetArg("-datadir", dd_norm.string() + "/./"); args.ForceSetArg("-datadir", dd_norm.string() + "/.");
ClearDatadirCache(); ClearDatadirCache();
BOOST_CHECK_EQUAL(dd_norm, GetDataDir()); BOOST_CHECK_EQUAL(dd_norm, args.GetDataDirPath());
gArgs.ForceSetArg("-datadir", dd_norm.string() + "/.//"); args.ForceSetArg("-datadir", dd_norm.string() + "/./");
ClearDatadirCache(); ClearDatadirCache();
BOOST_CHECK_EQUAL(dd_norm, GetDataDir()); BOOST_CHECK_EQUAL(dd_norm, args.GetDataDirPath());
args.ForceSetArg("-datadir", dd_norm.string() + "/.//");
ClearDatadirCache();
BOOST_CHECK_EQUAL(dd_norm, args.GetDataDirPath());
} }
BOOST_AUTO_TEST_CASE(util_check) BOOST_AUTO_TEST_CASE(util_check)