mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-19 13:27:35 +02:00
Merge 825f4a64e6 into merged_master (Bitcoin PR bitcoin/bitcoin#22976)
This commit is contained in:
commit
eea9829aa6
26 changed files with 93 additions and 93 deletions
|
|
@ -300,9 +300,9 @@ public:
|
|||
}
|
||||
|
||||
if (expect.default_int) {
|
||||
BOOST_CHECK_EQUAL(test.GetArg("-value", 99999), 99999);
|
||||
BOOST_CHECK_EQUAL(test.GetIntArg("-value", 99999), 99999);
|
||||
} else if (expect.int_value) {
|
||||
BOOST_CHECK_EQUAL(test.GetArg("-value", 99999), *expect.int_value);
|
||||
BOOST_CHECK_EQUAL(test.GetIntArg("-value", 99999), *expect.int_value);
|
||||
} else {
|
||||
BOOST_CHECK(!success);
|
||||
}
|
||||
|
|
@ -432,8 +432,8 @@ static void TestParse(const std::string& str, bool expected_bool, int64_t expect
|
|||
BOOST_CHECK(test.ParseParameters(2, (char**)argv, error));
|
||||
BOOST_CHECK_EQUAL(test.GetBoolArg("-value", false), expected_bool);
|
||||
BOOST_CHECK_EQUAL(test.GetBoolArg("-value", true), expected_bool);
|
||||
BOOST_CHECK_EQUAL(test.GetArg("-value", 99998), expected_int);
|
||||
BOOST_CHECK_EQUAL(test.GetArg("-value", 99999), expected_int);
|
||||
BOOST_CHECK_EQUAL(test.GetIntArg("-value", 99998), expected_int);
|
||||
BOOST_CHECK_EQUAL(test.GetIntArg("-value", 99999), expected_int);
|
||||
}
|
||||
|
||||
// Test bool and int parsing.
|
||||
|
|
@ -784,9 +784,9 @@ BOOST_AUTO_TEST_CASE(util_GetArg)
|
|||
|
||||
BOOST_CHECK_EQUAL(testArgs.GetArg("strtest1", "default"), "string...");
|
||||
BOOST_CHECK_EQUAL(testArgs.GetArg("strtest2", "default"), "default");
|
||||
BOOST_CHECK_EQUAL(testArgs.GetArg("inttest1", -1), 12345);
|
||||
BOOST_CHECK_EQUAL(testArgs.GetArg("inttest2", -1), 81985529216486895LL);
|
||||
BOOST_CHECK_EQUAL(testArgs.GetArg("inttest3", -1), -1);
|
||||
BOOST_CHECK_EQUAL(testArgs.GetIntArg("inttest1", -1), 12345);
|
||||
BOOST_CHECK_EQUAL(testArgs.GetIntArg("inttest2", -1), 81985529216486895LL);
|
||||
BOOST_CHECK_EQUAL(testArgs.GetIntArg("inttest3", -1), -1);
|
||||
BOOST_CHECK_EQUAL(testArgs.GetBoolArg("booltest1", false), true);
|
||||
BOOST_CHECK_EQUAL(testArgs.GetBoolArg("booltest2", false), false);
|
||||
BOOST_CHECK_EQUAL(testArgs.GetBoolArg("booltest3", false), false);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue