diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-11-20 18:41:32 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-11-20 19:51:49 -0500 |
| commit | fa21ca09a807e18476babe2651ad62df6477bbf0 (patch) | |
| tree | 539e5c07937b9d82f5e8c59a199a2bd3570a0aa1 /src/test | |
| parent | 6d58a5c3b05585b01c960776e00856637ff1794d (diff) | |
| download | bitcoin-fa21ca09a807e18476babe2651ad62df6477bbf0.tar.xz | |
test: Add BOOST_REQUIRE to getters returning optional
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/coins_tests.cpp | 9 | ||||
| -rw-r--r-- | src/test/dbwrapper_tests.cpp | 8 | ||||
| -rw-r--r-- | src/test/util_tests.cpp | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp index 521312f1b7..d3cbaedf00 100644 --- a/src/test/coins_tests.cpp +++ b/src/test/coins_tests.cpp @@ -2,17 +2,18 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include <attributes.h> #include <coins.h> +#include <consensus/validation.h> #include <script/standard.h> +#include <test/test_bitcoin.h> #include <uint256.h> #include <undo.h> #include <util/strencodings.h> -#include <test/test_bitcoin.h> #include <validation.h> -#include <consensus/validation.h> -#include <vector> #include <map> +#include <vector> #include <boost/test/unit_test.hpp> @@ -36,7 +37,7 @@ class CCoinsViewTest : public CCoinsView std::map<COutPoint, Coin> map_; public: - bool GetCoin(const COutPoint& outpoint, Coin& coin) const override + NODISCARD bool GetCoin(const COutPoint& outpoint, Coin& coin) const override { std::map<COutPoint, Coin>::const_iterator it = map_.find(outpoint); if (it == map_.end()) { diff --git a/src/test/dbwrapper_tests.cpp b/src/test/dbwrapper_tests.cpp index 9957ac074b..1034d4ade2 100644 --- a/src/test/dbwrapper_tests.cpp +++ b/src/test/dbwrapper_tests.cpp @@ -102,15 +102,15 @@ BOOST_AUTO_TEST_CASE(dbwrapper_iterator) char key_res; uint256 val_res; - it->GetKey(key_res); - it->GetValue(val_res); + BOOST_REQUIRE(it->GetKey(key_res)); + BOOST_REQUIRE(it->GetValue(val_res)); BOOST_CHECK_EQUAL(key_res, key); BOOST_CHECK_EQUAL(val_res.ToString(), in.ToString()); it->Next(); - it->GetKey(key_res); - it->GetValue(val_res); + BOOST_REQUIRE(it->GetKey(key_res)); + BOOST_REQUIRE(it->GetValue(val_res)); BOOST_CHECK_EQUAL(key_res, key2); BOOST_CHECK_EQUAL(val_res.ToString(), in2.ToString()); diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp index f461c7496f..9acebdd820 100644 --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -187,7 +187,7 @@ struct TestArgsManager : public ArgsManager m_config_args.clear(); } std::string error; - ReadConfigStream(streamConfig, error); + BOOST_REQUIRE(ReadConfigStream(streamConfig, error)); } void SetNetworkOnlyArg(const std::string arg) { |