diff --git a/doc/unit-tests.md b/doc/unit-tests.md --- a/doc/unit-tests.md +++ b/doc/unit-tests.md @@ -54,7 +54,7 @@ The build system is setup to compile an executable called `test_bitcoin` that runs all of the unit tests. The main source file is called -test_bitcoin.cpp. To add a new unit test file to our test suite you need +setup_common.cpp. To add a new unit test file to our test suite you need to add the file to `src/test/CMakeLists.txt`. The pattern is to create one test file for each class or source file for which you want to create unit tests. The file naming convention is `_tests.cpp` diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include --- a/src/Makefile.bench.include +++ b/src/Makefile.bench.include @@ -32,8 +32,8 @@ bench/base58.cpp \ bench/lockedpool.cpp \ bench/prevector.cpp \ - test/test_bitcoin.h \ - test/test_bitcoin.cpp + test/setup_common.h \ + test/setup_common.cpp nodist_bench_bench_bitcoin_SOURCES = $(GENERATED_BENCH_FILES) diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include --- a/src/Makefile.qttest.include +++ b/src/Makefile.qttest.include @@ -37,10 +37,10 @@ qt/test/wallettests.h TEST_BITCOIN_CPP = \ - test/test_bitcoin.cpp + test/setup_common.cpp TEST_BITCOIN_H = \ - test/test_bitcoin.h + test/setup_common.h qt_test_test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ $(QT_INCLUDES) $(QT_TEST_INCLUDES) $(PROTOBUF_CFLAGS) diff --git a/src/Makefile.test.include b/src/Makefile.test.include --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -55,8 +55,8 @@ test/main.cpp \ test/scriptflags.cpp \ test/sigutil.cpp \ - test/test_bitcoin.h \ - test/test_bitcoin.cpp + test/setup_common.h \ + test/setup_common.cpp FUZZ_SUITE = \ test/test_bitcoin.cpp \ diff --git a/src/bench/CMakeLists.txt b/src/bench/CMakeLists.txt --- a/src/bench/CMakeLists.txt +++ b/src/bench/CMakeLists.txt @@ -55,7 +55,7 @@ util_time.cpp # TODO: make a test library - ../test/test_bitcoin.cpp + ../test/setup_common.cpp # Add the generated headers to trigger the conversion command ${BENCH_DATA_GENERATED_HEADERS} diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp --- a/src/bench/bench.cpp +++ b/src/bench/bench.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include diff --git a/src/qt/test/CMakeLists.txt b/src/qt/test/CMakeLists.txt --- a/src/qt/test/CMakeLists.txt +++ b/src/qt/test/CMakeLists.txt @@ -17,7 +17,7 @@ util.cpp # Test framework - ../../test/test_bitcoin.cpp + ../../test/setup_common.cpp ) target_link_libraries(test_bitcoin-qt bitcoin-qt-base Qt5::Test) diff --git a/src/qt/test/addressbooktests.cpp b/src/qt/test/addressbooktests.cpp --- a/src/qt/test/addressbooktests.cpp +++ b/src/qt/test/addressbooktests.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp --- a/src/qt/test/rpcnestedtests.cpp +++ b/src/qt/test/rpcnestedtests.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp --- a/src/qt/test/wallettests.cpp +++ b/src/qt/test/wallettests.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/src/rpc/test/server_tests.cpp b/src/rpc/test/server_tests.cpp --- a/src/rpc/test/server_tests.cpp +++ b/src/rpc/test/server_tests.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include -#include +#include #include #include diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -77,7 +77,7 @@ main.cpp scriptflags.cpp sigutil.cpp - test_bitcoin.cpp + setup_common.cpp # Tests generated from JSON ${JSON_HEADERS} diff --git a/src/test/activation_tests.cpp b/src/test/activation_tests.cpp --- a/src/test/activation_tests.cpp +++ b/src/test/activation_tests.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp --- a/src/test/addrman_tests.cpp +++ b/src/test/addrman_tests.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include diff --git a/src/test/allocator_tests.cpp b/src/test/allocator_tests.cpp --- a/src/test/allocator_tests.cpp +++ b/src/test/allocator_tests.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include diff --git a/src/test/amount_tests.cpp b/src/test/amount_tests.cpp --- a/src/test/amount_tests.cpp +++ b/src/test/amount_tests.cpp @@ -4,7 +4,7 @@ #include -#include +#include #include diff --git a/src/test/arith_uint256_tests.cpp b/src/test/arith_uint256_tests.cpp --- a/src/test/arith_uint256_tests.cpp +++ b/src/test/arith_uint256_tests.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include diff --git a/src/test/avalanche_tests.cpp b/src/test/avalanche_tests.cpp --- a/src/test/avalanche_tests.cpp +++ b/src/test/avalanche_tests.cpp @@ -7,7 +7,7 @@ #include #include // For PeerLogicValidation -#include +#include #include diff --git a/src/test/base32_tests.cpp b/src/test/base32_tests.cpp --- a/src/test/base32_tests.cpp +++ b/src/test/base32_tests.cpp @@ -4,7 +4,7 @@ #include -#include +#include #include diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp --- a/src/test/base58_tests.cpp +++ b/src/test/base58_tests.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include diff --git a/src/test/base64_tests.cpp b/src/test/base64_tests.cpp --- a/src/test/base64_tests.cpp +++ b/src/test/base64_tests.cpp @@ -4,7 +4,7 @@ #include -#include +#include #include diff --git a/src/test/bip32_tests.cpp b/src/test/bip32_tests.cpp --- a/src/test/bip32_tests.cpp +++ b/src/test/bip32_tests.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include diff --git a/src/test/bitmanip_tests.cpp b/src/test/bitmanip_tests.cpp --- a/src/test/bitmanip_tests.cpp +++ b/src/test/bitmanip_tests.cpp @@ -2,7 +2,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include +#include #include #include diff --git a/src/test/blockchain_tests.cpp b/src/test/blockchain_tests.cpp --- a/src/test/blockchain_tests.cpp +++ b/src/test/blockchain_tests.cpp @@ -2,7 +2,7 @@ #include -#include +#include #include diff --git a/src/test/blockcheck_tests.cpp b/src/test/blockcheck_tests.cpp --- a/src/test/blockcheck_tests.cpp +++ b/src/test/blockcheck_tests.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp --- a/src/test/blockencodings_tests.cpp +++ b/src/test/blockencodings_tests.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include diff --git a/src/test/blockfilter_tests.cpp b/src/test/blockfilter_tests.cpp --- a/src/test/blockfilter_tests.cpp +++ b/src/test/blockfilter_tests.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include diff --git a/src/test/blockindex_tests.cpp b/src/test/blockindex_tests.cpp --- a/src/test/blockindex_tests.cpp +++ b/src/test/blockindex_tests.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include diff --git a/src/test/blockstatus_tests.cpp b/src/test/blockstatus_tests.cpp --- a/src/test/blockstatus_tests.cpp +++ b/src/test/blockstatus_tests.cpp @@ -6,7 +6,7 @@ #include -#include +#include #include diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp --- a/src/test/bloom_tests.cpp +++ b/src/test/bloom_tests.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include diff --git a/src/test/bswap_tests.cpp b/src/test/bswap_tests.cpp --- a/src/test/bswap_tests.cpp +++ b/src/test/bswap_tests.cpp @@ -4,7 +4,7 @@ #include -#include +#include #include diff --git a/src/test/cashaddr_tests.cpp b/src/test/cashaddr_tests.cpp --- a/src/test/cashaddr_tests.cpp +++ b/src/test/cashaddr_tests.cpp @@ -5,7 +5,7 @@ #include -#include +#include #include diff --git a/src/test/cashaddrenc_tests.cpp b/src/test/cashaddrenc_tests.cpp --- a/src/test/cashaddrenc_tests.cpp +++ b/src/test/cashaddrenc_tests.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include diff --git a/src/test/checkdatasig_tests.cpp b/src/test/checkdatasig_tests.cpp --- a/src/test/checkdatasig_tests.cpp +++ b/src/test/checkdatasig_tests.cpp @@ -6,7 +6,7 @@ #include