From bf69507cb579f88c36c80d29379c050fb28aaad6 Mon Sep 17 00:00:00 2001 From: kozyilmaz Date: Thu, 21 Dec 2017 12:35:16 +0300 Subject: [PATCH] Fix test/gtest bugs caught by latest macOS clang --- src/gtest/test_deprecation.cpp | 2 +- src/test/rpc_wallet_tests.cpp | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/gtest/test_deprecation.cpp b/src/gtest/test_deprecation.cpp index 72d98cf91..c44b810f1 100644 --- a/src/gtest/test_deprecation.cpp +++ b/src/gtest/test_deprecation.cpp @@ -24,7 +24,7 @@ static bool ThreadSafeMessageBox(MockUIInterface *mock, const std::string& caption, unsigned int style) { - mock->ThreadSafeMessageBox(message, caption, style); + return mock->ThreadSafeMessageBox(message, caption, style); } class DeprecationTest : public ::testing::Test { diff --git a/src/test/rpc_wallet_tests.cpp b/src/test/rpc_wallet_tests.cpp index e444eb2a5..9f8734648 100644 --- a/src/test/rpc_wallet_tests.cpp +++ b/src/test/rpc_wallet_tests.cpp @@ -46,6 +46,13 @@ bool find_error(const UniValue& objError, const std::string& expected) { return find_value(objError, "message").get_str().find(expected) != string::npos; } +static UniValue ValueFromString(const std::string &str) +{ + UniValue value; + BOOST_CHECK(value.setNumStr(str)); + return value; +} + BOOST_FIXTURE_TEST_SUITE(rpc_wallet_tests, TestingSetup) BOOST_AUTO_TEST_CASE(rpc_addmultisig) @@ -1061,14 +1068,14 @@ BOOST_AUTO_TEST_CASE(rpc_z_sendmany_internals) CTransaction tx = proxy.getTx(); BOOST_CHECK(tx.vout.size() == 0); - CAmount amount = 123.456; + CAmount amount = AmountFromValue(ValueFromString("123.456")); proxy.add_taddr_change_output_to_tx(amount); tx = proxy.getTx(); BOOST_CHECK(tx.vout.size() == 1); CTxOut out = tx.vout[0]; BOOST_CHECK_EQUAL(out.nValue, amount); - amount = 1.111; + amount = AmountFromValue(ValueFromString("1.111")); proxy.add_taddr_change_output_to_tx(amount); tx = proxy.getTx(); BOOST_CHECK(tx.vout.size() == 2);