Skip to content

Commit 145fe95

Browse files
practicalswiftpracticalswift
committed
tests: Check return value of ParseParameters(...)
1 parent 7c5bc2a commit 145fe95

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

‎src/test/getarg_tests.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static void ResetArgs(const std::string& strArg)
2828
vecChar.push_back(s.c_str());
2929

3030
std::string error;
31-
gArgs.ParseParameters(vecChar.size(), vecChar.data(), error);
31+
BOOST_CHECK(gArgs.ParseParameters(vecChar.size(), vecChar.data(), error));
3232
}
3333

3434
static void SetupArgs(const std::vector<std::string>& args)

‎src/test/util_tests.cpp‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -210,13 +210,13 @@ BOOST_AUTO_TEST_CASE(util_ParseParameters)
210210

211211
std::string error;
212212
testArgs.SetupArgs(4, avail_args);
213-
testArgs.ParseParameters(0, (char**)argv_test, error);
213+
BOOST_CHECK(testArgs.ParseParameters(0, (char**)argv_test, error));
214214
BOOST_CHECK(testArgs.GetOverrideArgs().empty() && testArgs.GetConfigArgs().empty());
215215

216-
testArgs.ParseParameters(1, (char**)argv_test, error);
216+
BOOST_CHECK(testArgs.ParseParameters(1, (char**)argv_test, error));
217217
BOOST_CHECK(testArgs.GetOverrideArgs().empty() && testArgs.GetConfigArgs().empty());
218218

219-
testArgs.ParseParameters(7, (char**)argv_test, error);
219+
BOOST_CHECK(testArgs.ParseParameters(7, (char**)argv_test, error));
220220
// expectation: -ignored is ignored (program name argument),
221221
// -a, -b and -ccc end up in map, -d ignored because it is after
222222
// a non-option argument (non-GNU option parsing)
@@ -242,7 +242,7 @@ BOOST_AUTO_TEST_CASE(util_GetBoolArg)
242242
"ignored", "-a", "-nob", "-c=0", "-d=1", "-e=false", "-f=true"};
243243
std::string error;
244244
testArgs.SetupArgs(6, avail_args);
245-
testArgs.ParseParameters(7, (char**)argv_test, error);
245+
BOOST_CHECK(testArgs.ParseParameters(7, (char**)argv_test, error));
246246

247247
// Each letter should be set.
248248
for (const char opt : "abcdef")
@@ -278,7 +278,7 @@ BOOST_AUTO_TEST_CASE(util_GetBoolArgEdgeCases)
278278
const char *argv_test[] = {"ignored", "-nofoo", "-foo", "-nobar=0"};
279279
testArgs.SetupArgs(2, avail_args);
280280
std::string error;
281-
testArgs.ParseParameters(4, (char**)argv_test, error);
281+
BOOST_CHECK(testArgs.ParseParameters(4, (char**)argv_test, error));
282282

283283
// This was passed twice, second one overrides the negative setting.
284284
BOOST_CHECK(!testArgs.IsArgNegated("-foo"));
@@ -290,7 +290,7 @@ BOOST_AUTO_TEST_CASE(util_GetBoolArgEdgeCases)
290290

291291
// Config test
292292
const char *conf_test = "nofoo=1\nfoo=1\nnobar=0\n";
293-
testArgs.ParseParameters(1, (char**)argv_test, error);
293+
BOOST_CHECK(testArgs.ParseParameters(1, (char**)argv_test, error));
294294
testArgs.ReadConfigString(conf_test);
295295

296296
// This was passed twice, second one overrides the negative setting,
@@ -305,7 +305,7 @@ BOOST_AUTO_TEST_CASE(util_GetBoolArgEdgeCases)
305305
// Combined test
306306
const char *combo_test_args[] = {"ignored", "-nofoo", "-bar"};
307307
const char *combo_test_conf = "foo=1\nnobar=1\n";
308-
testArgs.ParseParameters(3, (char**)combo_test_args, error);
308+
BOOST_CHECK(testArgs.ParseParameters(3, (char**)combo_test_args, error));
309309
testArgs.ReadConfigString(combo_test_conf);
310310

311311
// Command line overrides, but doesn't erase old setting
@@ -557,62 +557,62 @@ BOOST_AUTO_TEST_CASE(util_GetChainName)
557557
const char* testnetconf = "testnet=1\nregtest=0\n[test]\nregtest=1";
558558
std::string error;
559559

560-
test_args.ParseParameters(0, (char**)argv_testnet, error);
560+
BOOST_CHECK(test_args.ParseParameters(0, (char**)argv_testnet, error));
561561
BOOST_CHECK_EQUAL(test_args.GetChainName(), "main");
562562

563-
test_args.ParseParameters(2, (char**)argv_testnet, error);
563+
BOOST_CHECK(test_args.ParseParameters(2, (char**)argv_testnet, error));
564564
BOOST_CHECK_EQUAL(test_args.GetChainName(), "test");
565565

566-
test_args.ParseParameters(2, (char**)argv_regtest, error);
566+
BOOST_CHECK(test_args.ParseParameters(2, (char**)argv_regtest, error));
567567
BOOST_CHECK_EQUAL(test_args.GetChainName(), "regtest");
568568

569-
test_args.ParseParameters(3, (char**)argv_test_no_reg, error);
569+
BOOST_CHECK(test_args.ParseParameters(3, (char**)argv_test_no_reg, error));
570570
BOOST_CHECK_EQUAL(test_args.GetChainName(), "test");
571571

572-
test_args.ParseParameters(3, (char**)argv_both, error);
572+
BOOST_CHECK(test_args.ParseParameters(3, (char**)argv_both, error));
573573
BOOST_CHECK_THROW(test_args.GetChainName(), std::runtime_error);
574574

575-
test_args.ParseParameters(0, (char**)argv_testnet, error);
575+
BOOST_CHECK(test_args.ParseParameters(0, (char**)argv_testnet, error));
576576
test_args.ReadConfigString(testnetconf);
577577
BOOST_CHECK_EQUAL(test_args.GetChainName(), "test");
578578

579-
test_args.ParseParameters(2, (char**)argv_testnet, error);
579+
BOOST_CHECK(test_args.ParseParameters(2, (char**)argv_testnet, error));
580580
test_args.ReadConfigString(testnetconf);
581581
BOOST_CHECK_EQUAL(test_args.GetChainName(), "test");
582582

583-
test_args.ParseParameters(2, (char**)argv_regtest, error);
583+
BOOST_CHECK(test_args.ParseParameters(2, (char**)argv_regtest, error));
584584
test_args.ReadConfigString(testnetconf);
585585
BOOST_CHECK_THROW(test_args.GetChainName(), std::runtime_error);
586586

587-
test_args.ParseParameters(3, (char**)argv_test_no_reg, error);
587+
BOOST_CHECK(test_args.ParseParameters(3, (char**)argv_test_no_reg, error));
588588
test_args.ReadConfigString(testnetconf);
589589
BOOST_CHECK_EQUAL(test_args.GetChainName(), "test");
590590

591-
test_args.ParseParameters(3, (char**)argv_both, error);
591+
BOOST_CHECK(test_args.ParseParameters(3, (char**)argv_both, error));
592592
test_args.ReadConfigString(testnetconf);
593593
BOOST_CHECK_THROW(test_args.GetChainName(), std::runtime_error);
594594

595595
// check setting the network to test (and thus making
596596
// [test] regtest=1 potentially relevant) doesn't break things
597597
test_args.SelectConfigNetwork("test");
598598

599-
test_args.ParseParameters(0, (char**)argv_testnet, error);
599+
BOOST_CHECK(test_args.ParseParameters(0, (char**)argv_testnet, error));
600600
test_args.ReadConfigString(testnetconf);
601601
BOOST_CHECK_EQUAL(test_args.GetChainName(), "test");
602602

603-
test_args.ParseParameters(2, (char**)argv_testnet, error);
603+
BOOST_CHECK(test_args.ParseParameters(2, (char**)argv_testnet, error));
604604
test_args.ReadConfigString(testnetconf);
605605
BOOST_CHECK_EQUAL(test_args.GetChainName(), "test");
606606

607-
test_args.ParseParameters(2, (char**)argv_regtest, error);
607+
BOOST_CHECK(test_args.ParseParameters(2, (char**)argv_regtest, error));
608608
test_args.ReadConfigString(testnetconf);
609609
BOOST_CHECK_THROW(test_args.GetChainName(), std::runtime_error);
610610

611-
test_args.ParseParameters(2, (char**)argv_test_no_reg, error);
611+
BOOST_CHECK(test_args.ParseParameters(2, (char**)argv_test_no_reg, error));
612612
test_args.ReadConfigString(testnetconf);
613613
BOOST_CHECK_EQUAL(test_args.GetChainName(), "test");
614614

615-
test_args.ParseParameters(3, (char**)argv_both, error);
615+
BOOST_CHECK(test_args.ParseParameters(3, (char**)argv_both, error));
616616
test_args.ReadConfigString(testnetconf);
617617
BOOST_CHECK_THROW(test_args.GetChainName(), std::runtime_error);
618618
}

0 commit comments

Comments
 (0)