zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix test/gtest bugs caught by latest macOS clang

This commit is contained in:
kozyilmaz 2017-12-21 12:35:16 +03:00
parent 1683c2d5bf
commit bf69507cb5
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gtest/test_deprecation.cpp
View File

@ -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 {

11
src/test/rpc_wallet_tests.cpp
View File

@ -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);