From 1cb52ba0656e78ca6c2ef84b1558198ad113b76a Mon Sep 17 00:00:00 2001 From: Kiminuo Date: Fri, 26 Feb 2021 09:52:50 +0100 Subject: [PATCH] Modify "util_datadir" unit test to not use gArgs. --- src/test/util_tests.cpp | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp index 76ffdc598af..a11716a7f1e 100644 --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -49,24 +49,27 @@ BOOST_FIXTURE_TEST_SUITE(util_tests, BasicTestingSetup) BOOST_AUTO_TEST_CASE(util_datadir) { - ClearDatadirCache(); - const fs::path dd_norm = GetDataDir(); + // Use local args variable instead of m_args to avoid making assumptions about test setup + ArgsManager args; + args.ForceSetArg("-datadir", m_path_root.string()); - gArgs.ForceSetArg("-datadir", dd_norm.string() + "/"); - ClearDatadirCache(); - BOOST_CHECK_EQUAL(dd_norm, GetDataDir()); + const fs::path dd_norm = args.GetDataDirPath(); - gArgs.ForceSetArg("-datadir", dd_norm.string() + "/."); + args.ForceSetArg("-datadir", dd_norm.string() + "/"); 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(); - 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(); - 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)