scripted-diff: Rename test_bitcoin to test/setup_common

-BEGIN VERIFY SCRIPT-
sed -i --regexp-extended -e 's/test_bitcoin\.(h|cpp)/setup_common.\1/g' $(git grep -l test_bitcoin)
git mv ./src/test/test_bitcoin.h   ./src/test/setup_common.h
git mv ./src/test/test_bitcoin.cpp ./src/test/setup_common.cpp
sed -i -e 's/BITCOIN_TEST_TEST_BITCOIN_H/BITCOIN_TEST_SETUP_COMMON_H/g' ./src/test/setup_common.h
-END VERIFY SCRIPT-
This commit is contained in:
MarcoFalke 2019-04-11 09:44:10 -04:00
parent fa8685d49e
commit fa821904bf
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
88 changed files with 95 additions and 95 deletions

View file

@ -22,8 +22,8 @@
<ItemGroup>
<ClCompile Include="..\..\src\test\util.h" />
<ClCompile Include="..\..\src\test\util.cpp" />
<ClCompile Include="..\..\src\test\test_bitcoin.h" />
<ClCompile Include="..\..\src\test\test_bitcoin.cpp" />
<ClCompile Include="..\..\src\test\setup_common.h" />
<ClCompile Include="..\..\src\test\setup_common.cpp" />
<ClCompile Include="..\..\src\bench\base58.cpp" />
<ClCompile Include="..\..\src\bench\bech32.cpp" />
<ClCompile Include="..\..\src\bench\bench.cpp" />

View file

@ -24,7 +24,7 @@
<ClCompile Include="..\..\src\test\*_properties.cpp" />
<ClCompile Include="..\..\src\test\gen\*_gen.cpp" />
<ClCompile Include="..\..\src\wallet\test\*_tests.cpp" />
<ClCompile Include="..\..\src\test\test_bitcoin.cpp" />
<ClCompile Include="..\..\src\test\setup_common.cpp" />
<ClCompile Include="..\..\src\test\main.cpp" />
<ClCompile Include="..\..\src\wallet\test\*_fixture.cpp" />
</ItemGroup>

View file

@ -33,8 +33,8 @@ bench_bench_bitcoin_SOURCES = \
bench/lockedpool.cpp \
bench/poly1305.cpp \
bench/prevector.cpp \
test/test_bitcoin.h \
test/test_bitcoin.cpp \
test/setup_common.h \
test/setup_common.cpp \
test/util.h \
test/util.cpp

View file

@ -33,10 +33,10 @@ TEST_QT_H = \
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)

View file

@ -52,12 +52,12 @@ GENERATED_TEST_FILES = $(JSON_TEST_FILES:.json=.json.h) $(RAW_TEST_FILES:.raw=.r
BITCOIN_TEST_SUITE = \
test/main.cpp \
test/test_bitcoin.h \
test/test_bitcoin.cpp
test/setup_common.h \
test/setup_common.cpp
FUZZ_SUITE = \
test/test_bitcoin.h \
test/test_bitcoin.cpp \
test/setup_common.h \
test/setup_common.cpp \
test/fuzz/fuzz.cpp \
test/fuzz/fuzz.h

View file

@ -5,7 +5,7 @@
#include <bench/bench.h>
#include <chainparams.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <validation.h>
#include <algorithm>

View file

@ -1,6 +1,6 @@
#include <qt/test/addressbooktests.h>
#include <qt/test/util.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <interfaces/chain.h>
#include <interfaces/node.h>

View file

@ -12,7 +12,7 @@
#include <rpc/register.h>
#include <rpc/server.h>
#include <qt/rpcconsole.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <univalue.h>
#include <util/system.h>

View file

@ -15,7 +15,7 @@
#include <qt/transactionview.h>
#include <qt/walletmodel.h>
#include <key_io.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <validation.h>
#include <wallet/wallet.h>
#include <qt/overviewpage.h>

View file

@ -42,7 +42,7 @@ unit tests as possible).
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/Makefile.test.include`. 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 `<source_filename>_tests.cpp`

View file

@ -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 <addrman.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <string>
#include <boost/test/unit_test.hpp>

View file

@ -5,7 +5,7 @@
#include <util/system.h>
#include <support/allocators/secure.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <memory>

View file

@ -4,7 +4,7 @@
#include <amount.h>
#include <policy/feerate.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>

View file

@ -12,7 +12,7 @@
#include <arith_uint256.h>
#include <string>
#include <version.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
BOOST_FIXTURE_TEST_SUITE(arith_uint256_tests, BasicTestingSetup)

View file

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <util/strencodings.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>

View file

@ -5,7 +5,7 @@
#include <test/data/base58_encode_decode.json.h>
#include <base58.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <util/strencodings.h>
#include <univalue.h>

View file

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <util/strencodings.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>

View file

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <bech32.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>

View file

@ -9,7 +9,7 @@
#include <uint256.h>
#include <util/system.h>
#include <util/strencodings.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <string>
#include <vector>

View file

@ -3,7 +3,7 @@
#include <stdlib.h>
#include <rpc/blockchain.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
/* Equality between doubles is imprecise. Comparison should be done
* with a small threshold of tolerance, rather than exact equality.

View file

@ -8,7 +8,7 @@
#include <pow.h>
#include <random.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>

View file

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <test/data/blockfilters.json.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <blockfilter.h>
#include <core_io.h>

View file

@ -15,7 +15,7 @@
#include <uint256.h>
#include <util/system.h>
#include <util/strencodings.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <vector>

View file

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <compat/byteswap.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>

View file

@ -6,7 +6,7 @@
#include <util/time.h>
#include <validation.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <checkqueue.h>
#include <boost/test/unit_test.hpp>
#include <boost/thread.hpp>

View file

@ -6,7 +6,7 @@
#include <coins.h>
#include <consensus/validation.h>
#include <script/standard.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <uint256.h>
#include <undo.h>
#include <util/strencodings.h>

View file

@ -4,7 +4,7 @@
#include <compressor.h>
#include <util/system.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <stdint.h>

View file

@ -13,7 +13,7 @@
#include <crypto/hmac_sha512.h>
#include <random.h>
#include <util/strencodings.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <vector>

View file

@ -4,7 +4,7 @@
#include <boost/test/unit_test.hpp>
#include <cuckoocache.h>
#include <script/sigcache.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <random.h>
#include <thread>

View file

@ -5,7 +5,7 @@
#include <dbwrapper.h>
#include <uint256.h>
#include <random.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <memory>

View file

@ -15,7 +15,7 @@
#include <util/system.h>
#include <validation.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <stdint.h>

View file

@ -6,7 +6,7 @@
#include <string>
#include <script/sign.h>
#include <script/standard.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>
#include <script/descriptor.h>
#include <util/strencodings.h>

View file

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <flatfile.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>

View file

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
//
#include <fs.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>

View file

@ -4,7 +4,7 @@
#include <util/strencodings.h>
#include <util/system.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <string>
#include <vector>

View file

@ -5,7 +5,7 @@
#include <crypto/siphash.h>
#include <hash.h>
#include <util/strencodings.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <vector>

View file

@ -9,7 +9,7 @@
#include <key_io.h>
#include <script/script.h>
#include <util/strencodings.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>

View file

@ -8,7 +8,7 @@
#include <uint256.h>
#include <util/system.h>
#include <util/strencodings.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <string>
#include <vector>

View file

@ -9,7 +9,7 @@
#include <uint256.h>
#include <util/system.h>
#include <util/strencodings.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <string>
#include <vector>

View file

@ -4,7 +4,7 @@
#include <limitedmap.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>

View file

@ -6,7 +6,7 @@
#include <txmempool.h>
#include <util/system.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>
#include <list>

View file

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <consensus/merkle.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>

View file

@ -4,7 +4,7 @@
#include <merkleblock.h>
#include <uint256.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>

View file

@ -18,7 +18,7 @@
#include <util/system.h>
#include <util/strencodings.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <memory>

View file

@ -11,7 +11,7 @@
#include <script/sign.h>
#include <script/ismine.h>
#include <uint256.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>

View file

@ -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 <addrman.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <string>
#include <boost/test/unit_test.hpp>
#include <hash.h>

View file

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <netbase.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <util/strencodings.h>
#include <string>

View file

@ -9,7 +9,7 @@
#include <uint256.h>
#include <arith_uint256.h>
#include <version.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <vector>

View file

@ -8,7 +8,7 @@
#include <uint256.h>
#include <util/system.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>

View file

@ -7,7 +7,7 @@
#include <pow.h>
#include <random.h>
#include <util/system.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>

View file

@ -9,7 +9,7 @@
#include <serialize.h>
#include <streams.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>

View file

@ -12,7 +12,7 @@
#include <support/events.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <vector>

View file

@ -4,7 +4,7 @@
#include <random.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>

View file

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <reverselock.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>

View file

@ -12,7 +12,7 @@
#include <key_io.h>
#include <netbase.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/algorithm/string.hpp>
#include <boost/test/unit_test.hpp>

View file

@ -4,7 +4,7 @@
#include <compat/sanity.h>
#include <key.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>

View file

@ -5,7 +5,7 @@
#include <random.h>
#include <scheduler.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/thread.hpp>
#include <boost/test/unit_test.hpp>

View file

@ -13,7 +13,7 @@
#include <policy/settings.h>
#include <script/sign.h>
#include <script/ismine.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <vector>

View file

@ -8,7 +8,7 @@
#include <script/script.h>
#include <script/script_error.h>
#include <script/standard.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>

View file

@ -12,7 +12,7 @@
#include <script/sign.h>
#include <util/system.h>
#include <util/strencodings.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <rpc/util.h>
#if defined(HAVE_CONSENSUS_LIB)

View file

@ -4,7 +4,7 @@
#include <test/scriptnum10.h>
#include <script/script.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>
#include <limits.h>

View file

@ -5,7 +5,7 @@
#include <serialize.h>
#include <streams.h>
#include <hash.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <stdint.h>

View file

@ -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 <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <banman.h>
#include <chainparams.h>

View file

@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_TEST_TEST_BITCOIN_H
#define BITCOIN_TEST_TEST_BITCOIN_H
#ifndef BITCOIN_TEST_SETUP_COMMON_H
#define BITCOIN_TEST_SETUP_COMMON_H
#include <chainparamsbase.h>
#include <fs.h>

View file

@ -10,7 +10,7 @@
#include <script/script.h>
#include <serialize.h>
#include <streams.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <util/system.h>
#include <util/strencodings.h>
#include <version.h>

View file

@ -9,7 +9,7 @@
#include <script/script.h>
#include <script/standard.h>
#include <uint256.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <vector>

View file

@ -4,7 +4,7 @@
#include <chain.h>
#include <util/system.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <vector>

View file

@ -4,7 +4,7 @@
#include <streams.h>
#include <support/allocators/zeroafterfree.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>

View file

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <sync.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>

View file

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
//
#include <timedata.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>

View file

@ -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 <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <torcontrol.h>
#include <boost/test/unit_test.hpp>

View file

@ -4,7 +4,7 @@
#include <test/data/tx_invalid.json.h>
#include <test/data/tx_valid.json.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <clientversion.h>
#include <checkqueue.h>

View file

@ -5,7 +5,7 @@
#include <chainparams.h>
#include <index/txindex.h>
#include <script/standard.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <util/system.h>
#include <util/time.h>
#include <validation.h>

View file

@ -8,7 +8,7 @@
#include <consensus/validation.h>
#include <primitives/transaction.h>
#include <script/script.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>

View file

@ -11,7 +11,7 @@
#include <random.h>
#include <script/standard.h>
#include <script/sign.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <util/time.h>
#include <core_io.h>
#include <keystore.h>

View file

@ -4,7 +4,7 @@
#include <arith_uint256.h>
#include <uint256.h>
#include <version.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/test/unit_test.hpp>
#include <stdint.h>

View file

@ -9,7 +9,7 @@
#include <sync.h>
#include <util/strencodings.h>
#include <util/moneystr.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <stdint.h>
#include <vector>

View file

@ -10,7 +10,7 @@
#include <miner.h>
#include <pow.h>
#include <random.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <validation.h>
#include <validationinterface.h>

View file

@ -6,7 +6,7 @@
#include <net.h>
#include <validation.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <boost/signals2/signal.hpp>
#include <boost/test/unit_test.hpp>

View file

@ -4,7 +4,7 @@
#include <chain.h>
#include <versionbits.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <chainparams.h>
#include <validation.h>
#include <consensus/params.h>

View file

@ -8,7 +8,7 @@
#include <amount.h>
#include <primitives/transaction.h>
#include <random.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <wallet/test/wallet_test_fixture.h>
#include <boost/test/unit_test.hpp>

View file

@ -7,7 +7,7 @@
#include <boost/test/unit_test.hpp>
#include <fs.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <wallet/db.h>

View file

@ -6,7 +6,7 @@
#define BITCOIN_WALLET_TEST_INIT_TEST_FIXTURE_H
#include <interfaces/chain.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
struct InitWalletDirTestingSetup: public BasicTestingSetup {

View file

@ -4,7 +4,7 @@
#include <boost/test/unit_test.hpp>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <wallet/test/init_test_fixture.h>
#include <init.h>

View file

@ -12,7 +12,7 @@
#include <univalue.h>
#include <boost/test/unit_test.hpp>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <wallet/test/wallet_test_fixture.h>
BOOST_FIXTURE_TEST_SUITE(psbt_wallet_tests, WalletTestingSetup)

View file

@ -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 <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <util/strencodings.h>
#include <wallet/crypter.h>

View file

@ -5,7 +5,7 @@
#ifndef BITCOIN_WALLET_TEST_WALLET_TEST_FIXTURE_H
#define BITCOIN_WALLET_TEST_WALLET_TEST_FIXTURE_H
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <interfaces/chain.h>
#include <interfaces/wallet.h>

View file

@ -13,7 +13,7 @@
#include <consensus/validation.h>
#include <interfaces/chain.h>
#include <rpc/server.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <validation.h>
#include <wallet/coincontrol.h>
#include <wallet/test/wallet_test_fixture.h>