From 883a5c7d021fe29539d417796a5b07e265f1c696 Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 26 May 2021 19:47:47 +0800 Subject: [PATCH 01/16] test: remove BasicTestingSetup from allocator unit tests --- src/test/allocator_tests.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/test/allocator_tests.cpp b/src/test/allocator_tests.cpp index b523173a4..3779e7b96 100644 --- a/src/test/allocator_tests.cpp +++ b/src/test/allocator_tests.cpp @@ -2,15 +2,18 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include #include -#include - +#include #include +#include +#include +#include #include -BOOST_FIXTURE_TEST_SUITE(allocator_tests, BasicTestingSetup) +BOOST_AUTO_TEST_SUITE(allocator_tests) BOOST_AUTO_TEST_CASE(arena_tests) { From 05590651a0b9ebc5f5fdbdcbbc1efe4bf64888d0 Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 26 May 2021 19:48:10 +0800 Subject: [PATCH 02/16] test: remove BasicTestingSetup from amount unit tests --- src/test/amount_tests.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/amount_tests.cpp b/src/test/amount_tests.cpp index 65ba2bab1..77b7758a1 100644 --- a/src/test/amount_tests.cpp +++ b/src/test/amount_tests.cpp @@ -4,11 +4,12 @@ #include #include -#include + +#include #include -BOOST_FIXTURE_TEST_SUITE(amount_tests, BasicTestingSetup) +BOOST_AUTO_TEST_SUITE(amount_tests) BOOST_AUTO_TEST_CASE(MoneyRangeTest) { From 4c389ba04b36cc2916d49435e07155144882a637 Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 26 May 2021 19:49:06 +0800 Subject: [PATCH 03/16] test: remove BasicTestingSetup from arith_uint256 unit tests --- src/test/arith_uint256_tests.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/arith_uint256_tests.cpp b/src/test/arith_uint256_tests.cpp index a135c9378..a00888aae 100644 --- a/src/test/arith_uint256_tests.cpp +++ b/src/test/arith_uint256_tests.cpp @@ -3,19 +3,19 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include -#include #include #include #include +#include #include #include #include -#include #include +#include -BOOST_FIXTURE_TEST_SUITE(arith_uint256_tests, BasicTestingSetup) +BOOST_AUTO_TEST_SUITE(arith_uint256_tests) /// Convert vector to arith_uint256, via uint256 blob static inline arith_uint256 arith_uint256V(const std::vector& vch) From fd144f64265a4752fe36391c51bb6b8ccdff838f Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 26 May 2021 19:51:06 +0800 Subject: [PATCH 04/16] test: remove BasicTestingSetup from base32 unit tests --- src/test/base32_tests.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/base32_tests.cpp b/src/test/base32_tests.cpp index 3b44564dd..22853555e 100644 --- a/src/test/base32_tests.cpp +++ b/src/test/base32_tests.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include #include #include @@ -10,7 +9,7 @@ using namespace std::literals; -BOOST_FIXTURE_TEST_SUITE(base32_tests, BasicTestingSetup) +BOOST_AUTO_TEST_SUITE(base32_tests) BOOST_AUTO_TEST_CASE(base32_testvectors) { From f4dcbe4498e55d2ed818b35cd15652fd427b7a7b Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 26 May 2021 20:01:54 +0800 Subject: [PATCH 05/16] test: remove BasicTestingSetup from base64 unit tests --- src/test/base64_tests.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/base64_tests.cpp b/src/test/base64_tests.cpp index 714fccffa..9d1dfd46f 100644 --- a/src/test/base64_tests.cpp +++ b/src/test/base64_tests.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include #include #include @@ -10,7 +9,7 @@ using namespace std::literals; -BOOST_FIXTURE_TEST_SUITE(base64_tests, BasicTestingSetup) +BOOST_AUTO_TEST_SUITE(base64_tests) BOOST_AUTO_TEST_CASE(base64_testvectors) { From a13dc24831e4a2d8e16a41d8c95cdaa8afdec783 Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 26 May 2021 20:04:53 +0800 Subject: [PATCH 06/16] test: remove BasicTestingSetup from bech32 unit tests --- src/test/bech32_tests.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/bech32_tests.cpp b/src/test/bech32_tests.cpp index 2651e4643..c0344b3cb 100644 --- a/src/test/bech32_tests.cpp +++ b/src/test/bech32_tests.cpp @@ -3,12 +3,13 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include -#include #include #include -BOOST_FIXTURE_TEST_SUITE(bech32_tests, BasicTestingSetup) +#include + +BOOST_AUTO_TEST_SUITE(bech32_tests) BOOST_AUTO_TEST_CASE(bech32_testvectors_valid) { From 6d3b78c0e2f427d3a7431885cc175464a527a12a Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 26 May 2021 20:08:59 +0800 Subject: [PATCH 07/16] test: remove BasicTestingSetup from bswap unit tests --- src/test/bswap_tests.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/bswap_tests.cpp b/src/test/bswap_tests.cpp index 2dbca4e8b..4e75e74d7 100644 --- a/src/test/bswap_tests.cpp +++ b/src/test/bswap_tests.cpp @@ -3,11 +3,10 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include -#include #include -BOOST_FIXTURE_TEST_SUITE(bswap_tests, BasicTestingSetup) +BOOST_AUTO_TEST_SUITE(bswap_tests) BOOST_AUTO_TEST_CASE(bswap_tests) { From 39cec22935302418963cc2e7db4ad2fa9656849d Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 26 May 2021 20:15:06 +0800 Subject: [PATCH 08/16] test: remove BasicTestingSetup from compilerbug unit tests --- src/test/compilerbug_tests.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/compilerbug_tests.cpp b/src/test/compilerbug_tests.cpp index b68bc279e..a9cec624a 100644 --- a/src/test/compilerbug_tests.cpp +++ b/src/test/compilerbug_tests.cpp @@ -3,9 +3,8 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include -#include -BOOST_FIXTURE_TEST_SUITE(compilerbug_tests, BasicTestingSetup) +BOOST_AUTO_TEST_SUITE(compilerbug_tests) #if defined(__GNUC__) // This block will also be built under clang, which is fine (as it supports noinline) From cd5bc4b4708b28cabcfabbcd7f5ba1155f5b1517 Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 26 May 2021 20:16:46 +0800 Subject: [PATCH 09/16] test: remove BasicTestingSetup from hash unit tests --- src/test/hash_tests.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/hash_tests.cpp b/src/test/hash_tests.cpp index 41a626c0e..677bf39fd 100644 --- a/src/test/hash_tests.cpp +++ b/src/test/hash_tests.cpp @@ -10,7 +10,7 @@ #include -BOOST_FIXTURE_TEST_SUITE(hash_tests, BasicTestingSetup) +BOOST_AUTO_TEST_SUITE(hash_tests) BOOST_AUTO_TEST_CASE(murmurhash3) { From 3974c962b61a1e18f8177ffa30791ad9ad2ba6e4 Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 26 May 2021 20:26:06 +0800 Subject: [PATCH 10/16] test: remove BasicTestingSetup from merkleblock tests --- src/test/merkleblock_tests.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/merkleblock_tests.cpp b/src/test/merkleblock_tests.cpp index 98b27994a..e540b59b3 100644 --- a/src/test/merkleblock_tests.cpp +++ b/src/test/merkleblock_tests.cpp @@ -8,8 +8,10 @@ #include +#include +#include -BOOST_FIXTURE_TEST_SUITE(merkleblock_tests, BasicTestingSetup) +BOOST_AUTO_TEST_SUITE(merkleblock_tests) /** * Create a CMerkleBlock using a list of txids which will be found in the From 57ba949ef585f8124914c43ea9a53afee201b998 Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 26 May 2021 20:34:42 +0800 Subject: [PATCH 11/16] test: remove BasicTestingSetup from policy_fee unit tests --- src/test/policy_fee_tests.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/policy_fee_tests.cpp b/src/test/policy_fee_tests.cpp index 6d8872b11..4a15be6ca 100644 --- a/src/test/policy_fee_tests.cpp +++ b/src/test/policy_fee_tests.cpp @@ -5,11 +5,11 @@ #include #include -#include - #include -BOOST_FIXTURE_TEST_SUITE(policy_fee_tests, BasicTestingSetup) +#include + +BOOST_AUTO_TEST_SUITE(policy_fee_tests) BOOST_AUTO_TEST_CASE(FeeRounder) { From 1aee83421fe2128757b48f6317a3e7fed784adb6 Mon Sep 17 00:00:00 2001 From: fanquake Date: Wed, 26 May 2021 20:37:50 +0800 Subject: [PATCH 12/16] test: remove BasicTestingSetup from reverse_lock unit tests --- src/test/reverselock_tests.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/reverselock_tests.cpp b/src/test/reverselock_tests.cpp index 7da364d31..21576bb86 100644 --- a/src/test/reverselock_tests.cpp +++ b/src/test/reverselock_tests.cpp @@ -7,7 +7,9 @@ #include -BOOST_FIXTURE_TEST_SUITE(reverselock_tests, BasicTestingSetup) +#include + +BOOST_AUTO_TEST_SUITE(reverselock_tests) BOOST_AUTO_TEST_CASE(reverselock_basics) { From ef8bb0473be62c07f96eb269b927dcec86c1e862 Mon Sep 17 00:00:00 2001 From: fanquake Date: Thu, 27 May 2021 13:51:11 +0800 Subject: [PATCH 13/16] test: remove BasicTestingSetup from sync unit tests --- src/test/sync_tests.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/sync_tests.cpp b/src/test/sync_tests.cpp index 3e4d1dac9..f5a8fc3aa 100644 --- a/src/test/sync_tests.cpp +++ b/src/test/sync_tests.cpp @@ -8,6 +8,7 @@ #include #include +#include namespace { template @@ -76,7 +77,7 @@ void TestInconsistentLockOrderDetected(MutexType& mutex1, MutexType& mutex2) NO_ } } // namespace -BOOST_FIXTURE_TEST_SUITE(sync_tests, BasicTestingSetup) +BOOST_AUTO_TEST_SUITE(sync_tests) BOOST_AUTO_TEST_CASE(potential_deadlock_detected) { From c0497a49281e68b57e2a1e6c48c950b2edc80821 Mon Sep 17 00:00:00 2001 From: fanquake Date: Thu, 27 May 2021 13:59:54 +0800 Subject: [PATCH 14/16] test: remove BasicTestingSetup from torcontrol unit tests --- src/test/torcontrol_tests.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/torcontrol_tests.cpp b/src/test/torcontrol_tests.cpp index 41aa17988..659caaef6 100644 --- a/src/test/torcontrol_tests.cpp +++ b/src/test/torcontrol_tests.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. // -#include #include @@ -15,7 +14,7 @@ std::pair SplitTorReplyLine(const std::string& s); std::map ParseTorReplyMapping(const std::string& s); -BOOST_FIXTURE_TEST_SUITE(torcontrol_tests, BasicTestingSetup) +BOOST_AUTO_TEST_SUITE(torcontrol_tests) static void CheckSplitTorReplyLine(std::string input, std::string command, std::string args) { From b53d3c1b1fd739c314b0b34f361fcd992092fc29 Mon Sep 17 00:00:00 2001 From: fanquake Date: Thu, 27 May 2021 15:11:30 +0800 Subject: [PATCH 15/16] test: remove BasicTestingSetup from uint256 unit tests --- src/test/uint256_tests.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/uint256_tests.cpp b/src/test/uint256_tests.cpp index ae626d461..b4744cabc 100644 --- a/src/test/uint256_tests.cpp +++ b/src/test/uint256_tests.cpp @@ -13,8 +13,9 @@ #include #include #include +#include -BOOST_FIXTURE_TEST_SUITE(uint256_tests, BasicTestingSetup) +BOOST_AUTO_TEST_SUITE(uint256_tests) const unsigned char R1Array[] = "\x9c\x52\x4a\xdb\xcf\x56\x11\x12\x2b\x29\x12\x5e\x5d\x35\xd2\xd2" From 6c3fcd5591eb9947f35483014ecb0d8ab217b780 Mon Sep 17 00:00:00 2001 From: fanquake Date: Thu, 27 May 2021 15:14:55 +0800 Subject: [PATCH 16/16] test: remove BasicTestingSetup from util_threadnames unit tests --- src/test/util_threadnames_tests.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/util_threadnames_tests.cpp b/src/test/util_threadnames_tests.cpp index f3f9fb2bf..a5b456dd7 100644 --- a/src/test/util_threadnames_tests.cpp +++ b/src/test/util_threadnames_tests.cpp @@ -2,12 +2,12 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include #include #include #include #include +#include #include #include @@ -17,7 +17,7 @@ #include -BOOST_FIXTURE_TEST_SUITE(util_threadnames_tests, BasicTestingSetup) +BOOST_AUTO_TEST_SUITE(util_threadnames_tests) const std::string TEST_THREAD_NAME_BASE = "test_thread.";