aboutsummaryrefslogtreecommitdiff
path: root/src/test/rpc_tests.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-06-04 10:31:22 +0200
committerJonas Schnelli <jonas.schnelli@include7.ch>2015-06-04 13:18:35 +0200
commit043df2b56831bef4c4b726ae4fc761d4710b99be (patch)
tree8d4dd21f5e8693a4fd793fb4daffc102da47a553 /src/test/rpc_tests.cpp
parent519eedeba76a2192bbded69b3c7e7e96bfc549a2 (diff)
Simplify RPCclient, adapt json_parse_error test
# Conflicts: # src/test/rpc_tests.cpp
Diffstat (limited to 'src/test/rpc_tests.cpp')
-rw-r--r--src/test/rpc_tests.cpp23
1 files changed, 10 insertions, 13 deletions
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp
index 576e62a0bb..0b33ddb086 100644
--- a/src/test/rpc_tests.cpp
+++ b/src/test/rpc_tests.cpp
@@ -143,23 +143,20 @@ BOOST_AUTO_TEST_CASE(rpc_parse_monetary_values)
BOOST_AUTO_TEST_CASE(json_parse_errors)
{
- UniValue value;
// Valid
- BOOST_CHECK_EQUAL(value.read(std::string("1.0")), false);
- BOOST_CHECK_EQUAL(value.read(std::string("[1.0]")), true);
- // Valid, with trailing whitespace
- BOOST_CHECK_EQUAL(value.read(std::string("1.0 ")), false);
- BOOST_CHECK_EQUAL(value.read(std::string("[1.0 ] ")), true);
+ BOOST_CHECK_EQUAL(ParseNonRFCJSONValue("1.0").get_real(), 1.0);
+ // Valid, with leading or trailing whitespace
+ BOOST_CHECK_EQUAL(ParseNonRFCJSONValue(" 1.0").get_real(), 1.0);
+ BOOST_CHECK_EQUAL(ParseNonRFCJSONValue("1.0 ").get_real(), 1.0);
// Invalid, initial garbage
- BOOST_CHECK_EQUAL(value.read(std::string("[1.0")), false);
- BOOST_CHECK_EQUAL(value.read(std::string("[a1.0]")), false);
- BOOST_CHECK_EQUAL(value.read(std::string("[\"a1.0\"]")), true);
+ BOOST_CHECK_THROW(ParseNonRFCJSONValue("[1.0"), std::runtime_error);
+ BOOST_CHECK_THROW(ParseNonRFCJSONValue("a1.0"), std::runtime_error);
// Invalid, trailing garbage
- BOOST_CHECK_EQUAL(value.read(std::string("1.0sds")), false);
- BOOST_CHECK_EQUAL(value.read(std::string("1.0]")), false);
+ BOOST_CHECK_THROW(ParseNonRFCJSONValue("1.0sds"), std::runtime_error);
+ BOOST_CHECK_THROW(ParseNonRFCJSONValue("1.0]"), std::runtime_error);
// BTC addresses should fail parsing
- BOOST_CHECK_EQUAL(value.read(std::string("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W")), false);
- BOOST_CHECK_EQUAL(value.read(std::string("3J98t1WpEZ73CNmQviecrnyiWrnqRhWNL")), false);
+ BOOST_CHECK_THROW(ParseNonRFCJSONValue("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W"), std::runtime_error);
+ BOOST_CHECK_THROW(ParseNonRFCJSONValue("3J98t1WpEZ73CNmQviecrnyiWrnqRhWNL"), std::runtime_error);
}
BOOST_AUTO_TEST_CASE(rpc_boostasiotocnetaddr)