Skip to content

Commit c5054e4

Browse files
laanwjWarrows
authored andcommitted
tests: add a BasicTestingSetup and apply to all tests
Make sure that chainparams and logging is properly initialized. Doing this for every test may be overkill, but this initialization is so simple that that does not matter. This should fix the travis issues.
1 parent 962a1bc commit c5054e4

33 files changed

+143
-98
lines changed

src/test/Checkpoints_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
using namespace std;
1818

19-
BOOST_FIXTURE_TEST_SUITE(Checkpoints_tests, TestingSetup)
19+
BOOST_FIXTURE_TEST_SUITE(Checkpoints_tests, BasicTestingSetup)
2020

2121
BOOST_AUTO_TEST_CASE(sanity)
2222
{

src/test/allocator_tests.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
#include "util.h"
66

77
#include "allocators.h"
8+
#include "test/test_pivx.h"
89

910
#include <boost/test/unit_test.hpp>
1011

11-
BOOST_AUTO_TEST_SUITE(allocator_tests)
12+
BOOST_FIXTURE_TEST_SUITE(allocator_tests, BasicTestingSetup)
1213

1314
// Dummy memory page locker for platform independent tests
1415
static const void *last_lock_addr, *last_unlock_addr;

src/test/arith_uint256_tests.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
#include "arith_uint256.h"
1414
#include <string>
1515
#include "version.h"
16+
#include "test/test_pivx.h"
1617

17-
BOOST_AUTO_TEST_SUITE(arith_uint256_tests)
18-
///BOOST_FIXTURE_TEST_SUITE(arith_uint256_tests, BasicTestingSetup)
18+
BOOST_FIXTURE_TEST_SUITE(arith_uint256_tests, BasicTestingSetup)
1919

2020
/// Convert vector to arith_uint256, via uint256 blob
2121
inline arith_uint256 arith_uint256V(const std::vector<unsigned char>& vch)

src/test/base32_tests.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

55
#include "utilstrencodings.h"
6+
#include "test/test_pivx.h"
67

78
#include <boost/test/unit_test.hpp>
89

9-
BOOST_AUTO_TEST_SUITE(base32_tests)
10+
BOOST_FIXTURE_TEST_SUITE(base32_tests, BasicTestingSetup)
1011

1112
BOOST_AUTO_TEST_CASE(base32_testvectors)
1213
{

src/test/base58_tests.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@
1414
#include "uint256.h"
1515
#include "util.h"
1616
#include "utilstrencodings.h"
17+
#include "test/test_pivx.h"
1718

1819
#include <boost/test/unit_test.hpp>
1920

2021
#include <univalue.h>
2122

2223
extern UniValue read_json(const std::string& jsondata);
2324

24-
BOOST_AUTO_TEST_SUITE(base58_tests)
25+
BOOST_FIXTURE_TEST_SUITE(base58_tests, BasicTestingSetup)
2526

2627
// Goal: test low-level base58 encoding functionality
2728
BOOST_AUTO_TEST_CASE(base58_EncodeBase58)

src/test/base64_tests.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

55
#include "utilstrencodings.h"
6+
#include "test/test_pivx.h"
67

78
#include <boost/test/unit_test.hpp>
89

9-
BOOST_AUTO_TEST_SUITE(base64_tests)
10+
BOOST_FIXTURE_TEST_SUITE(base64_tests, BasicTestingSetup)
1011

1112
BOOST_AUTO_TEST_CASE(base64_testvectors)
1213
{

src/test/bip32_tests.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include "key.h"
99
#include "uint256.h"
1010
#include "util.h"
11+
#include "test/test_bitcoin.h"
1112

1213
#include <string>
1314
#include <vector>
@@ -107,7 +108,7 @@ void RunTest(const TestVector &test) {
107108
}
108109
}
109110

110-
BOOST_AUTO_TEST_SUITE(bip32_tests)
111+
BOOST_FIXTURE_TEST_SUITE(bip32_tests, BasicTestingSetup)
111112

112113
BOOST_AUTO_TEST_CASE(bip32_test1) {
113114
RunTest(test1);

src/test/bloom_tests.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "uint256.h"
1515
#include "util.h"
1616
#include "utilstrencodings.h"
17+
#include "test/test_pivx.h"
1718

1819
#include <vector>
1920

@@ -23,7 +24,7 @@
2324
using namespace std;
2425
using namespace boost::tuples;
2526

26-
BOOST_AUTO_TEST_SUITE(bloom_tests)
27+
BOOST_FIXTURE_TEST_SUITE(bloom_tests, BasicTestingSetup)
2728

2829
BOOST_AUTO_TEST_CASE(bloom_create_insert_serialize)
2930
{

src/test/checkblock_tests.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "clientversion.h"
1212
#include "main.h"
1313
#include "utiltime.h"
14+
#include "test/test_pivx.h"
1415

1516
#include <cstdio>
1617

@@ -19,7 +20,7 @@
1920
#include <boost/test/unit_test.hpp>
2021

2122

22-
BOOST_AUTO_TEST_SUITE(CheckBlock_tests)
23+
BOOST_FIXTURE_TEST_SUITE(CheckBlock_tests, BasicTestingSetup)
2324

2425
bool read_block(const std::string& filename, CBlock& block)
2526
{

src/test/coins_tests.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "coins.h"
66
#include "random.h"
77
#include "uint256.h"
8+
#include "test/test_pivx.h"
89

910
#include <vector>
1011
#include <map>
@@ -60,7 +61,7 @@ class CCoinsViewTest : public CCoinsView
6061
};
6162
}
6263

63-
BOOST_AUTO_TEST_SUITE(coins_tests)
64+
BOOST_FIXTURE_TEST_SUITE(coins_tests, BasicTestingSetup)
6465

6566
static const unsigned int NUM_SIMULATION_ITERATIONS = 40000;
6667

src/test/compress_tests.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
#include "compressor.h"
66
#include "util.h"
7+
#include "test/test_pivx.h"
78

89
#include <stdint.h>
910

@@ -21,7 +22,7 @@
2122
// amounts 50 .. 21000000
2223
#define NUM_MULTIPLES_50BTC 420000
2324

24-
BOOST_AUTO_TEST_SUITE(compress_tests)
25+
BOOST_FIXTURE_TEST_SUITE(compress_tests, BasicTestingSetup)
2526

2627
bool static TestEncode(uint64_t in) {
2728
return in == CTxOutCompressor::DecompressAmount(CTxOutCompressor::CompressAmount(in));

src/test/crypto_tests.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111
#include "crypto/hmac_sha512.h"
1212
#include "random.h"
1313
#include "utilstrencodings.h"
14+
#include "test/test_pivx.h"
1415

1516
#include <vector>
1617

1718
#include <boost/assign/list_of.hpp>
1819
#include <boost/test/unit_test.hpp>
1920

20-
BOOST_AUTO_TEST_SUITE(crypto_tests)
21+
BOOST_FIXTURE_TEST_SUITE(crypto_tests, BasicTestingSetup)
2122

2223
template<typename Hasher, typename In, typename Out>
2324
void TestVector(const Hasher &h, const In &in, const Out &out) {

src/test/getarg_tests.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

66
#include "util.h"
7+
#include "test/test_pivx.h"
78

89
#include <string>
910
#include <vector>
1011

1112
#include <boost/algorithm/string.hpp>
1213
#include <boost/test/unit_test.hpp>
1314

14-
BOOST_AUTO_TEST_SUITE(getarg_tests)
15+
BOOST_FIXTURE_TEST_SUITE(getarg_tests, BasicTestingSetup)
1516

1617
static void ResetArgs(const std::string& strArg)
1718
{

src/test/hash_tests.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44

55
#include "hash.h"
66
#include "utilstrencodings.h"
7+
#include "test/test_pivx.h"
78

89
#include <vector>
910

1011
#include <boost/test/unit_test.hpp>
1112

1213
using namespace std;
1314

14-
BOOST_AUTO_TEST_SUITE(hash_tests)
15+
BOOST_FIXTURE_TEST_SUITE(hash_tests, BasicTestingSetup)
1516

1617
BOOST_AUTO_TEST_CASE(murmurhash3)
1718
{

src/test/key_tests.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ void dumpKeyInfo(uint256 privkey)
5959
}
6060
#endif
6161

62-
6362
BOOST_FIXTURE_TEST_SUITE(key_tests, TestingSetup)
6463

6564
BOOST_AUTO_TEST_CASE(key_test1)

src/test/mruset_tests.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#include "random.h"
88
#include "util.h"
9+
#include "test/test_pivx.h"
910

1011
#include <set>
1112

@@ -34,7 +35,7 @@ class mrutester
3435
}
3536
};
3637

37-
BOOST_AUTO_TEST_SUITE(mruset_tests)
38+
BOOST_FIXTURE_TEST_SUITE(mruset_tests, BasicTestingSetup)
3839

3940
// Test that an mruset behaves like a set, as long as no more than MAX_SIZE elements are in it
4041
BOOST_AUTO_TEST_CASE(mruset_like_set)

src/test/netbase_tests.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
66

77
#include "netbase.h"
8+
#include "test/test_pivx.h"
89

910
#include <string>
1011

1112
#include <boost/test/unit_test.hpp>
1213

1314
using namespace std;
1415

15-
BOOST_AUTO_TEST_SUITE(netbase_tests)
16+
BOOST_FIXTURE_TEST_SUITE(netbase_tests, BasicTestingSetup)
1617

1718
BOOST_AUTO_TEST_CASE(netbase_networks)
1819
{

src/test/pmt_tests.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
#include "streams.h"
99
#include "uint256.h"
1010
#include "version.h"
11+
#include "random.h"
12+
#include "test/test_pivx.h"
1113

1214
#include <vector>
1315

@@ -27,7 +29,7 @@ class CPartialMerkleTreeTester : public CPartialMerkleTree
2729
}
2830
};
2931

30-
BOOST_AUTO_TEST_SUITE(pmt_tests)
32+
BOOST_FIXTURE_TEST_SUITE(pmt_tests, BasicTestingSetup)
3133

3234
BOOST_AUTO_TEST_CASE(pmt_test1)
3335
{

src/test/sanity_tests.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include "test_pivx.h"
88

99
#include <boost/test/unit_test.hpp>
10+
1011
BOOST_FIXTURE_TEST_SUITE(sanity_tests, TestingSetup)
1112

1213
BOOST_AUTO_TEST_CASE(basic_sanity)

src/test/scriptnum_tests.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@
55

66
#include "libzerocoin/bignum.h"
77
#include "script/script.h"
8+
#include "test/test_pivx.h"
9+
810
#include <boost/test/unit_test.hpp>
911
#include <limits.h>
1012
#include <stdint.h>
11-
BOOST_AUTO_TEST_SUITE(scriptnum_tests)
13+
14+
BOOST_FIXTURE_TEST_SUITE(scriptnum_tests, BasicTestingSetup)
1215

1316
static const long values[] = \
1417
{ 0, 1, CHAR_MIN, CHAR_MAX, UCHAR_MAX, SHRT_MIN, USHRT_MAX, INT_MIN, INT_MAX, static_cast<long>UINT_MAX, LONG_MIN, LONG_MAX };

src/test/serialize_tests.cpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@
44

55
#include "serialize.h"
66
#include "streams.h"
7+
#include "hash.h"
8+
#include "test/test_pivx.h"
79

810
#include <stdint.h>
911

1012
#include <boost/test/unit_test.hpp>
1113

1214
using namespace std;
1315

14-
BOOST_AUTO_TEST_SUITE(serialize_tests)
16+
BOOST_FIXTURE_TEST_SUITE(serialize_tests, BasicTestingSetup)
1517

1618
BOOST_AUTO_TEST_CASE(varints)
1719
{
@@ -70,8 +72,8 @@ static bool isCanonicalException(const std::ios_base::failure& ex)
7072

7173
// The string returned by what() can be different for different platforms.
7274
// Instead of directly comparing the ex.what() with an expected string,
73-
// create an instance of exception to see if ex.what() matches
74-
// the expected explanatory string returned by the exception instance.
75+
// create an instance of exception to see if ex.what() matches
76+
// the expected explanatory string returned by the exception instance.
7577
return strcmp(expectedException.what(), ex.what()) == 0;
7678
}
7779

src/test/sighash_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ void static RandomTransaction(CMutableTransaction &tx, bool fSingle) {
114114
}
115115
}
116116

117-
BOOST_FIXTURE_TEST_SUITE(sighash_tests, TestingSetup)
117+
BOOST_FIXTURE_TEST_SUITE(sighash_tests, BasicTestingSetup)
118118

119119
BOOST_AUTO_TEST_CASE(sighash_test)
120120
{

src/test/sigopcount_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Serialize(const CScript& s)
2424
return sSerialized;
2525
}
2626

27-
BOOST_FIXTURE_TEST_SUITE(sigopcount_tests, TestingSetup)
27+
BOOST_FIXTURE_TEST_SUITE(sigopcount_tests, BasicTestingSetup)
2828

2929
BOOST_AUTO_TEST_CASE(GetSigOpCount)
3030
{

src/test/skiplist_tests.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
#include "main.h"
77
#include "random.h"
88
#include "util.h"
9+
#include "test/test_pivx.h"
910

1011
#include <vector>
1112

1213
#include <boost/test/unit_test.hpp>
1314

1415
#define SKIPLIST_LENGTH 300000
1516

16-
BOOST_AUTO_TEST_SUITE(skiplist_tests)
17+
BOOST_FIXTURE_TEST_SUITE(skiplist_tests, BasicTestingSetup)
1718

1819
BOOST_AUTO_TEST_CASE(skiplist_test)
1920
{

src/test/test_pivx.cpp

+9-3
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,21 @@ CWallet* pwalletMain;
2525
extern bool fPrintToConsole;
2626
extern void noui_connect();
2727

28-
TestingSetup::TestingSetup()
28+
BasicTestingSetup::BasicTestingSetup()
2929
{
3030
ECC_Start();
3131
SetupEnvironment();
3232
fPrintToDebugLog = false; // don't want to write to debug.log file
3333
fCheckBlockIndex = true;
3434
SelectParams(CBaseChainParams::UNITTEST);
35-
noui_connect();
35+
}
36+
BasicTestingSetup::~BasicTestingSetup()
37+
{
38+
ECC_Stop();
39+
}
40+
41+
TestingSetup::TestingSetup()
42+
{
3643
#ifdef ENABLE_WALLET
3744
bitdb.MakeMock();
3845
#endif
@@ -75,7 +82,6 @@ TestingSetup::~TestingSetup()
7582
bitdb.Reset();
7683
#endif
7784
boost::filesystem::remove_all(pathTemp);
78-
ECC_Stop();
7985
}
8086

8187
void Shutdown(void* parg)

0 commit comments

Comments
 (0)