zcash-hackworks
/
zcash-patched-for-explorer
mirror of https://github.com/zcash-hackworks/zcash-patched-for-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Auto merge of #3089 - kozyilmaz:clang, r=str4d 

[macOS] Fix test/gtest bugs caught by latest clang

Tests fail with latest clang on macOS (clang-900.0.39.2)

```
test/rpc_wallet_tests.cpp:1064:26: error: implicit conversion from 'double' to 'CAmount' (aka 'long long') changes value from 123.456 to 123 [-Werror,-Wliteral-conversion]
test/rpc_wallet_tests.cpp:1071:18: error: implicit conversion from 'double' to 'CAmount' (aka 'long long') changes value from 1.111 to 1 [-Werror,-Wliteral-conversion]
gtest/test_deprecation.cpp:28:1: error: control reaches end of non-void function [-Werror,-Wreturn-type]
```

Part of #2246.
This commit is contained in:
Homu 2018-03-15 17:21:23 -07:00
parent 5abe4e6348 bf69507cb5
commit bc8221da81
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

@ -47,6 +47,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)
@ -1078,14 +1085,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);