From fb60cc9b5b251f8b08744507e52346311b451064 Mon Sep 17 00:00:00 2001 From: Brad Chase Date: Tue, 3 Jan 2017 10:21:37 -0500 Subject: [PATCH] Cleanup unit test support code (RIPD-1380): * Remove `src/test/support/mao` * Flatten `src/test/support/jtx` to `src/test/jtx` --- Builds/VisualStudio2015/RippleD.vcxproj | 422 ++++++++-------- .../VisualStudio2015/RippleD.vcxproj.filters | 468 +++++++++--------- CMakeLists.txt | 2 +- SConstruct | 2 +- src/test/app/AccountTxPaging_test.cpp | 2 +- src/test/app/CrossingLimits_test.cpp | 2 +- src/test/app/DeliverMin_test.cpp | 2 +- src/test/app/Discrepancy_test.cpp | 6 +- src/test/app/Flow_test.cpp | 4 +- src/test/app/Freeze_test.cpp | 2 +- src/test/app/MultiSign_test.cpp | 2 +- src/test/app/Offer_test.cpp | 6 +- src/test/app/OversizeMeta_test.cpp | 2 +- src/test/app/Path_test.cpp | 2 +- src/test/app/PayChan_test.cpp | 2 +- src/test/app/Regression_test.cpp | 2 +- src/test/app/SHAMapStore_test.cpp | 2 +- src/test/app/SetAuth_test.cpp | 2 +- src/test/app/SetRegularKey_test.cpp | 2 +- src/test/app/SetTrust_test.cpp | 2 +- src/test/app/SusPay_test.cpp | 2 +- src/test/app/Ticket_test.cpp | 2 +- src/test/app/Transaction_ordering_test.cpp | 2 +- src/test/app/TrustAndBalance_test.cpp | 4 +- src/test/app/TxQ_test.cpp | 6 +- src/test/app/ValidatorList_test.cpp | 2 +- src/test/core/Config_test.cpp | 2 +- src/test/core/Coroutine_test.cpp | 2 +- src/test/core/SociDB_test.cpp | 2 +- src/test/json/TestOutputSuite.h | 2 +- src/test/{support/mao.h => jtx.h} | 39 +- src/test/{support => jtx}/AbstractClient.h | 0 src/test/{support => }/jtx/Account.h | 0 src/test/{support => jtx}/BasicNetwork.h | 0 .../{support => jtx}/BasicNetwork_test.cpp | 2 +- src/test/{support => }/jtx/Env.h | 14 +- src/test/{support => }/jtx/Env_ss.h | 2 +- src/test/{support => jtx}/Env_test.cpp | 2 +- src/test/{support => jtx}/JSONRPCClient.h | 2 +- src/test/{support => }/jtx/JTx.h | 4 +- src/test/{support => jtx}/ManualTimeKeeper.h | 0 src/test/{support => jtx}/PathSet.h | 2 +- src/test/{support => jtx}/TestSuite.h | 0 src/test/{support => jtx}/WSClient.h | 2 +- src/test/{support => jtx}/WSClient_test.cpp | 4 +- src/test/{support => }/jtx/amount.h | 6 +- src/test/{support => }/jtx/balance.h | 4 +- src/test/{support => }/jtx/basic_prop.h | 0 src/test/{support => }/jtx/delivermin.h | 2 +- src/test/{support => }/jtx/fee.h | 4 +- src/test/{support => }/jtx/flags.h | 2 +- src/test/{support => }/jtx/impl/Account.cpp | 4 +- src/test/{support => }/jtx/impl/Env.cpp | 22 +- .../{support => jtx}/impl/JSONRPCClient.cpp | 2 +- .../impl/ManualTimeKeeper.cpp | 2 +- src/test/{support => jtx}/impl/WSClient.cpp | 4 +- src/test/{support => }/jtx/impl/amount.cpp | 4 +- src/test/{support => }/jtx/impl/balance.cpp | 2 +- .../{support => }/jtx/impl/delivermin.cpp | 2 +- src/test/{support => }/jtx/impl/fee.cpp | 2 +- src/test/{support => }/jtx/impl/flags.cpp | 2 +- src/test/{support => }/jtx/impl/jtx_json.cpp | 4 +- src/test/{support => }/jtx/impl/memo.cpp | 2 +- src/test/{support => }/jtx/impl/multisign.cpp | 4 +- src/test/{support => }/jtx/impl/offer.cpp | 2 +- src/test/{support => }/jtx/impl/owners.cpp | 2 +- src/test/{support => }/jtx/impl/paths.cpp | 2 +- src/test/{support => }/jtx/impl/pay.cpp | 2 +- src/test/{support => }/jtx/impl/quality2.cpp | 2 +- src/test/{support => }/jtx/impl/rate.cpp | 2 +- src/test/{support => }/jtx/impl/regkey.cpp | 2 +- src/test/{support => }/jtx/impl/sendmax.cpp | 2 +- src/test/{support => }/jtx/impl/seq.cpp | 2 +- src/test/{support => }/jtx/impl/sig.cpp | 4 +- src/test/{support => }/jtx/impl/tag.cpp | 2 +- src/test/{support => }/jtx/impl/ticket.cpp | 2 +- src/test/{support => }/jtx/impl/trust.cpp | 2 +- src/test/{support => }/jtx/impl/txflags.cpp | 2 +- src/test/{support => }/jtx/impl/utility.cpp | 2 +- src/test/{support => }/jtx/jtx_json.h | 2 +- src/test/{support => }/jtx/memo.h | 2 +- src/test/{support => }/jtx/multisign.h | 8 +- src/test/{support => }/jtx/noop.h | 2 +- src/test/{support => }/jtx/offer.h | 2 +- src/test/{support => }/jtx/owners.h | 2 +- src/test/{support => }/jtx/paths.h | 2 +- src/test/{support => }/jtx/pay.h | 4 +- src/test/{support => }/jtx/prop.h | 2 +- src/test/{support => }/jtx/quality.h | 2 +- src/test/{support => }/jtx/rate.h | 2 +- src/test/{support => }/jtx/regkey.h | 4 +- src/test/{support => }/jtx/require.h | 2 +- src/test/{support => }/jtx/requires.h | 0 src/test/{support => }/jtx/sendmax.h | 2 +- src/test/{support => }/jtx/seq.h | 4 +- src/test/{support => }/jtx/sig.h | 2 +- src/test/{support => }/jtx/tag.h | 2 +- src/test/{support => }/jtx/tags.h | 0 src/test/{support => }/jtx/ter.h | 2 +- src/test/{support => }/jtx/ticket.h | 6 +- src/test/{support => }/jtx/trust.h | 2 +- src/test/{support => }/jtx/txflags.h | 2 +- src/test/{support => }/jtx/utility.h | 2 +- src/test/ledger/BookDirs_test.cpp | 2 +- src/test/ledger/Directory_test.cpp | 2 +- src/test/ledger/PaymentSandbox_test.cpp | 2 +- src/test/ledger/SHAMapV2_test.cpp | 2 +- src/test/ledger/SkipList_test.cpp | 2 +- src/test/ledger/View_test.cpp | 2 +- src/test/overlay/cluster_test.cpp | 2 +- src/test/overlay/manifest_test.cpp | 2 +- src/test/rpc/AccountInfo_test.cpp | 2 +- src/test/rpc/AccountLinesRPC_test.cpp | 2 +- src/test/rpc/AccountObjects_test.cpp | 2 +- src/test/rpc/AccountOffers_test.cpp | 2 +- src/test/rpc/AccountSet_test.cpp | 2 +- src/test/rpc/Book_test.cpp | 4 +- src/test/rpc/GatewayBalances_test.cpp | 4 +- src/test/rpc/JSONRPC_test.cpp | 2 +- src/test/rpc/KeyGeneration_test.cpp | 2 +- src/test/rpc/LedgerClosed_test.cpp | 2 +- src/test/rpc/LedgerData_test.cpp | 2 +- src/test/rpc/LedgerRPC_test.cpp | 2 +- src/test/rpc/LedgerRequestRPC_test.cpp | 2 +- src/test/rpc/NoRipple_test.cpp | 2 +- src/test/rpc/RPCOverload_test.cpp | 6 +- src/test/rpc/RobustTransaction_test.cpp | 4 +- src/test/rpc/ServerInfo_test.cpp | 2 +- src/test/rpc/Subscribe_test.cpp | 4 +- src/test/server/ServerStatus_test.cpp | 6 +- src/test/support/jtx.h | 60 --- src/test/support/mao/Net.h | 39 -- src/test/support/mao/impl/Net.cpp | 31 -- src/test/unity/support_unity.cpp | 63 ++- 134 files changed, 671 insertions(+), 793 deletions(-) rename src/test/{support/mao.h => jtx.h} (51%) rename src/test/{support => jtx}/AbstractClient.h (100%) rename src/test/{support => }/jtx/Account.h (100%) rename src/test/{support => jtx}/BasicNetwork.h (100%) rename src/test/{support => jtx}/BasicNetwork_test.cpp (99%) rename src/test/{support => }/jtx/Env.h (98%) rename src/test/{support => }/jtx/Env_ss.h (98%) rename src/test/{support => jtx}/Env_test.cpp (99%) rename src/test/{support => jtx}/JSONRPCClient.h (97%) rename src/test/{support => }/jtx/JTx.h (98%) rename src/test/{support => jtx}/ManualTimeKeeper.h (100%) rename src/test/{support => jtx}/PathSet.h (99%) rename src/test/{support => jtx}/TestSuite.h (100%) rename src/test/{support => jtx}/WSClient.h (97%) rename src/test/{support => jtx}/WSClient_test.cpp (96%) rename src/test/{support => }/jtx/amount.h (98%) rename src/test/{support => }/jtx/balance.h (96%) rename src/test/{support => }/jtx/basic_prop.h (100%) rename src/test/{support => }/jtx/delivermin.h (97%) rename src/test/{support => }/jtx/fee.h (96%) rename src/test/{support => }/jtx/flags.h (99%) rename src/test/{support => }/jtx/impl/Account.cpp (97%) rename src/test/{support => }/jtx/impl/Env.cpp (97%) rename src/test/{support => jtx}/impl/JSONRPCClient.cpp (99%) rename src/test/{support => jtx}/impl/ManualTimeKeeper.cpp (98%) rename src/test/{support => jtx}/impl/WSClient.cpp (99%) rename src/test/{support => }/jtx/impl/amount.cpp (97%) rename src/test/{support => }/jtx/impl/balance.cpp (98%) rename src/test/{support => }/jtx/impl/delivermin.cpp (96%) rename src/test/{support => }/jtx/impl/fee.cpp (97%) rename src/test/{support => }/jtx/impl/flags.cpp (98%) rename src/test/{support => }/jtx/impl/jtx_json.cpp (95%) rename src/test/{support => }/jtx/impl/memo.cpp (98%) rename src/test/{support => }/jtx/impl/multisign.cpp (97%) rename src/test/{support => }/jtx/impl/offer.cpp (97%) rename src/test/{support => }/jtx/impl/owners.cpp (98%) rename src/test/{support => }/jtx/impl/paths.cpp (98%) rename src/test/{support => }/jtx/impl/pay.cpp (97%) rename src/test/{support => }/jtx/impl/quality2.cpp (98%) rename src/test/{support => }/jtx/impl/rate.cpp (97%) rename src/test/{support => }/jtx/impl/regkey.cpp (97%) rename src/test/{support => }/jtx/impl/sendmax.cpp (97%) rename src/test/{support => }/jtx/impl/seq.cpp (97%) rename src/test/{support => }/jtx/impl/sig.cpp (95%) rename src/test/{support => }/jtx/impl/tag.cpp (97%) rename src/test/{support => }/jtx/impl/ticket.cpp (98%) rename src/test/{support => }/jtx/impl/trust.cpp (98%) rename src/test/{support => }/jtx/impl/txflags.cpp (97%) rename src/test/{support => }/jtx/impl/utility.cpp (98%) rename src/test/{support => }/jtx/jtx_json.h (98%) rename src/test/{support => }/jtx/memo.h (98%) rename src/test/{support => }/jtx/multisign.h (96%) rename src/test/{support => }/jtx/noop.h (97%) rename src/test/{support => }/jtx/offer.h (97%) rename src/test/{support => }/jtx/owners.h (98%) rename src/test/{support => }/jtx/paths.h (98%) rename src/test/{support => }/jtx/pay.h (94%) rename src/test/{support => }/jtx/prop.h (97%) rename src/test/{support => }/jtx/quality.h (98%) rename src/test/{support => }/jtx/rate.h (97%) rename src/test/{support => }/jtx/regkey.h (95%) rename src/test/{support => }/jtx/require.h (98%) rename src/test/{support => }/jtx/requires.h (100%) rename src/test/{support => }/jtx/sendmax.h (97%) rename src/test/{support => }/jtx/seq.h (95%) rename src/test/{support => }/jtx/sig.h (98%) rename src/test/{support => }/jtx/tag.h (98%) rename src/test/{support => }/jtx/tags.h (100%) rename src/test/{support => }/jtx/ter.h (97%) rename src/test/{support => }/jtx/ticket.h (96%) rename src/test/{support => }/jtx/trust.h (97%) rename src/test/{support => }/jtx/txflags.h (97%) rename src/test/{support => }/jtx/utility.h (98%) delete mode 100644 src/test/support/jtx.h delete mode 100644 src/test/support/mao/Net.h delete mode 100644 src/test/support/mao/impl/Net.cpp diff --git a/Builds/VisualStudio2015/RippleD.vcxproj b/Builds/VisualStudio2015/RippleD.vcxproj index 4cb7ceeb5..105ad1791 100644 --- a/Builds/VisualStudio2015/RippleD.vcxproj +++ b/Builds/VisualStudio2015/RippleD.vcxproj @@ -4406,6 +4406,214 @@ True True + + + + + + + + + + + + + + True + True + + + + + + + + + + + True + True + + + + + + + True + True + + + True + True + + + True + True + + + True + True + + + True + True + + + True + True + + + True + True + + + True + True + + + True + True + + + True + True + + + True + True + + + True + True + + + True + True + + + True + True + + + True + True + + + True + True + + + True + True + + + True + True + + + True + True + + + True + True + + + True + True + + + True + True + + + True + True + + + True + True + + + True + True + + + True + True + + + True + True + + + True + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + True + True True @@ -4658,220 +4866,6 @@ True True - - - - - - True - True - - - True - True - - - True - True - - - True - True - - - True - True - - - - - - - - - - - - - - - - - - - - - - - - - True - True - - - True - True - - - True - True - - - True - True - - - True - True - - - True - True - - - True - True - - - True - True - - - True - True - - - True - True - - - True - True - - - True - True - - - True - True - - - True - True - - - True - True - - - True - True - - - True - True - - - True - True - - - True - True - - - True - True - - - True - True - - - True - True - - - True - True - - - True - True - - - True - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - True - - - - - - - - - - - True - True - True True diff --git a/Builds/VisualStudio2015/RippleD.vcxproj.filters b/Builds/VisualStudio2015/RippleD.vcxproj.filters index df307fb76..564d37882 100644 --- a/Builds/VisualStudio2015/RippleD.vcxproj.filters +++ b/Builds/VisualStudio2015/RippleD.vcxproj.filters @@ -433,6 +433,12 @@ {87249A3B-D8F5-1A8C-6C1D-F1CDCCF5242B} + + {1B5596EA-E920-0BF3-81F5-D0D3A1786006} + + + {EE178E31-46DB-6ED5-D5F4-81BDC7A96765} + {272EB630-1801-CFB7-68ED-3FD2AF1FEF87} @@ -460,24 +466,6 @@ {2E37F2EA-49FC-1F02-C3EA-D7EB608603A1} - - {EAFC737C-277F-7D41-3A99-8B752EB7D534} - - - {3195322A-2CFC-904C-A6AA-1B60F8E5490D} - - - {E6B36A4D-232C-FA63-7B5A-24ADE91F0F32} - - - {F9870E4C-E01C-B734-1475-92401F8766BF} - - - {52F836F7-261B-9EA5-8DC4-02E4B010F4D3} - - - {2AB83499-A4F2-EDED-BC79-6DC296EE9D8A} - {4FD99791-5191-0BFF-8D77-19500238E44E} @@ -5109,6 +5097,225 @@ test\json + + test + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx\impl + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + + + test\jtx + test\ledger @@ -5292,231 +5499,6 @@ test\shamap - - test\support - - - test\support - - - test\support - - - test\support - - - test\support\impl - - - test\support\impl - - - test\support\impl - - - test\support - - - test\support - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx\impl - - - test\support\jtx\impl - - - test\support\jtx\impl - - - test\support\jtx\impl - - - test\support\jtx\impl - - - test\support\jtx\impl - - - test\support\jtx\impl - - - test\support\jtx\impl - - - test\support\jtx\impl - - - test\support\jtx\impl - - - test\support\jtx\impl - - - test\support\jtx\impl - - - test\support\jtx\impl - - - test\support\jtx\impl - - - test\support\jtx\impl - - - test\support\jtx\impl - - - test\support\jtx\impl - - - test\support\jtx\impl - - - test\support\jtx\impl - - - test\support\jtx\impl - - - test\support\jtx\impl - - - test\support\jtx\impl - - - test\support\jtx\impl - - - test\support\jtx\impl - - - test\support\jtx\impl - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support\jtx - - - test\support - - - test\support\mao\impl - - - test\support\mao - - - test\support - - - test\support - - - test\support - - - test\support - test\unity diff --git a/CMakeLists.txt b/CMakeLists.txt index e47901706..b6735f521 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -299,7 +299,7 @@ foreach(curdir rpc server shamap - support) + jtx) file(GLOB_RECURSE cursrcs src/test/${curdir}/*.cpp) list(APPEND test_srcs "${cursrcs}") endforeach() diff --git a/SConstruct b/SConstruct index 724ec2b47..e7ac3bd30 100644 --- a/SConstruct +++ b/SConstruct @@ -963,7 +963,7 @@ def get_classic_sources(toolchain): append_sources(result, *list_sources('src/test/rpc', '.cpp')) append_sources(result, *list_sources('src/test/server', '.cpp')) append_sources(result, *list_sources('src/test/shamap', '.cpp')) - append_sources(result, *list_sources('src/test/support', '.cpp')) + append_sources(result, *list_sources('src/test/jtx', '.cpp')) if use_shp(toolchain): diff --git a/src/test/app/AccountTxPaging_test.cpp b/src/test/app/AccountTxPaging_test.cpp index 934ec9784..6919e7a23 100644 --- a/src/test/app/AccountTxPaging_test.cpp +++ b/src/test/app/AccountTxPaging_test.cpp @@ -16,7 +16,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include +#include #include #include #include diff --git a/src/test/app/CrossingLimits_test.cpp b/src/test/app/CrossingLimits_test.cpp index 5b1590886..547882d74 100644 --- a/src/test/app/CrossingLimits_test.cpp +++ b/src/test/app/CrossingLimits_test.cpp @@ -16,7 +16,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/test/app/DeliverMin_test.cpp b/src/test/app/DeliverMin_test.cpp index c38bef053..c9173c551 100644 --- a/src/test/app/DeliverMin_test.cpp +++ b/src/test/app/DeliverMin_test.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/test/app/Discrepancy_test.cpp b/src/test/app/Discrepancy_test.cpp index 83a391d24..0a8e5573e 100644 --- a/src/test/app/Discrepancy_test.cpp +++ b/src/test/app/Discrepancy_test.cpp @@ -18,9 +18,9 @@ //============================================================================== #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/test/app/Flow_test.cpp b/src/test/app/Flow_test.cpp index 0f42a6d4c..3b573524a 100644 --- a/src/test/app/Flow_test.cpp +++ b/src/test/app/Flow_test.cpp @@ -16,14 +16,14 @@ //============================================================================== #include -#include +#include #include #include #include #include #include #include -#include +#include #include #include namespace ripple { diff --git a/src/test/app/Freeze_test.cpp b/src/test/app/Freeze_test.cpp index 6c4b0ad33..db7fe38de 100644 --- a/src/test/app/Freeze_test.cpp +++ b/src/test/app/Freeze_test.cpp @@ -16,7 +16,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include +#include #include #include #include diff --git a/src/test/app/MultiSign_test.cpp b/src/test/app/MultiSign_test.cpp index 28c092f5e..ef3649cbe 100644 --- a/src/test/app/MultiSign_test.cpp +++ b/src/test/app/MultiSign_test.cpp @@ -18,7 +18,7 @@ #include #include // jss:: definitions #include -#include +#include namespace ripple { namespace test { diff --git a/src/test/app/Offer_test.cpp b/src/test/app/Offer_test.cpp index 53b24b9ff..22ac5cd56 100644 --- a/src/test/app/Offer_test.cpp +++ b/src/test/app/Offer_test.cpp @@ -18,9 +18,9 @@ //============================================================================== #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/test/app/OversizeMeta_test.cpp b/src/test/app/OversizeMeta_test.cpp index f3b5e0e3a..7e921856e 100644 --- a/src/test/app/OversizeMeta_test.cpp +++ b/src/test/app/OversizeMeta_test.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include diff --git a/src/test/app/Path_test.cpp b/src/test/app/Path_test.cpp index 9682f7754..fd6be84cb 100644 --- a/src/test/app/Path_test.cpp +++ b/src/test/app/Path_test.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/test/app/PayChan_test.cpp b/src/test/app/PayChan_test.cpp index 69b3ba421..23f4444f1 100644 --- a/src/test/app/PayChan_test.cpp +++ b/src/test/app/PayChan_test.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include diff --git a/src/test/app/Regression_test.cpp b/src/test/app/Regression_test.cpp index c06769eb4..9c80c1024 100644 --- a/src/test/app/Regression_test.cpp +++ b/src/test/app/Regression_test.cpp @@ -16,7 +16,7 @@ //============================================================================== #include -#include +#include #include #include #include diff --git a/src/test/app/SHAMapStore_test.cpp b/src/test/app/SHAMapStore_test.cpp index 6db40a4dc..0d6c3318e 100644 --- a/src/test/app/SHAMapStore_test.cpp +++ b/src/test/app/SHAMapStore_test.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include namespace ripple { namespace test { diff --git a/src/test/app/SetAuth_test.cpp b/src/test/app/SetAuth_test.cpp index 4374b0638..0eb67d1a8 100644 --- a/src/test/app/SetAuth_test.cpp +++ b/src/test/app/SetAuth_test.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include diff --git a/src/test/app/SetRegularKey_test.cpp b/src/test/app/SetRegularKey_test.cpp index 1538b3312..4ee75c311 100644 --- a/src/test/app/SetRegularKey_test.cpp +++ b/src/test/app/SetRegularKey_test.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include namespace ripple { diff --git a/src/test/app/SetTrust_test.cpp b/src/test/app/SetTrust_test.cpp index c1137a14f..89c505c37 100644 --- a/src/test/app/SetTrust_test.cpp +++ b/src/test/app/SetTrust_test.cpp @@ -16,7 +16,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include +#include #include #include diff --git a/src/test/app/SusPay_test.cpp b/src/test/app/SusPay_test.cpp index 941590453..fd8055fa1 100644 --- a/src/test/app/SusPay_test.cpp +++ b/src/test/app/SusPay_test.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include #include diff --git a/src/test/app/Ticket_test.cpp b/src/test/app/Ticket_test.cpp index 6c8b157c5..0b4104236 100644 --- a/src/test/app/Ticket_test.cpp +++ b/src/test/app/Ticket_test.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include diff --git a/src/test/app/Transaction_ordering_test.cpp b/src/test/app/Transaction_ordering_test.cpp index 99c45f802..3108ce7cd 100644 --- a/src/test/app/Transaction_ordering_test.cpp +++ b/src/test/app/Transaction_ordering_test.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include namespace ripple { namespace test { diff --git a/src/test/app/TrustAndBalance_test.cpp b/src/test/app/TrustAndBalance_test.cpp index 4e32c55ce..7d10715da 100644 --- a/src/test/app/TrustAndBalance_test.cpp +++ b/src/test/app/TrustAndBalance_test.cpp @@ -18,11 +18,11 @@ //============================================================================== #include -#include +#include #include #include #include -#include +#include namespace ripple { diff --git a/src/test/app/TxQ_test.cpp b/src/test/app/TxQ_test.cpp index 5ad9e7959..a4600ce45 100644 --- a/src/test/app/TxQ_test.cpp +++ b/src/test/app/TxQ_test.cpp @@ -24,13 +24,13 @@ #include #include #include -#include +#include #include #include #include #include -#include -#include +#include +#include #include namespace ripple { diff --git a/src/test/app/ValidatorList_test.cpp b/src/test/app/ValidatorList_test.cpp index 83589f3e0..777d6a7ee 100644 --- a/src/test/app/ValidatorList_test.cpp +++ b/src/test/app/ValidatorList_test.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/src/test/core/Config_test.cpp b/src/test/core/Config_test.cpp index ce627b040..e91417422 100644 --- a/src/test/core/Config_test.cpp +++ b/src/test/core/Config_test.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/test/core/Coroutine_test.cpp b/src/test/core/Coroutine_test.cpp index 89858bfae..27ef08ef3 100644 --- a/src/test/core/Coroutine_test.cpp +++ b/src/test/core/Coroutine_test.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/test/core/SociDB_test.cpp b/src/test/core/SociDB_test.cpp index d8d4661c5..66033c4ef 100644 --- a/src/test/core/SociDB_test.cpp +++ b/src/test/core/SociDB_test.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/test/json/TestOutputSuite.h b/src/test/json/TestOutputSuite.h index 3efa9a8d5..db92b6d5e 100644 --- a/src/test/json/TestOutputSuite.h +++ b/src/test/json/TestOutputSuite.h @@ -22,7 +22,7 @@ #include #include -#include +#include namespace ripple { namespace test { diff --git a/src/test/support/mao.h b/src/test/jtx.h similarity index 51% rename from src/test/support/mao.h rename to src/test/jtx.h index 7d719af20..3a2b72c7f 100644 --- a/src/test/support/mao.h +++ b/src/test/jtx.h @@ -17,11 +17,44 @@ */ //============================================================================== -#ifndef RIPPLE_TEST_MAO_H_INCLUDED -#define RIPPLE_TEST_MAO_H_INCLUDED +#ifndef RIPPLE_TEST_JTX_H_INCLUDED +#define RIPPLE_TEST_JTX_H_INCLUDED // Convenience header that includes everything -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif diff --git a/src/test/support/AbstractClient.h b/src/test/jtx/AbstractClient.h similarity index 100% rename from src/test/support/AbstractClient.h rename to src/test/jtx/AbstractClient.h diff --git a/src/test/support/jtx/Account.h b/src/test/jtx/Account.h similarity index 100% rename from src/test/support/jtx/Account.h rename to src/test/jtx/Account.h diff --git a/src/test/support/BasicNetwork.h b/src/test/jtx/BasicNetwork.h similarity index 100% rename from src/test/support/BasicNetwork.h rename to src/test/jtx/BasicNetwork.h diff --git a/src/test/support/BasicNetwork_test.cpp b/src/test/jtx/BasicNetwork_test.cpp similarity index 99% rename from src/test/support/BasicNetwork_test.cpp rename to src/test/jtx/BasicNetwork_test.cpp index 569a80d87..7ad4896fa 100644 --- a/src/test/support/BasicNetwork_test.cpp +++ b/src/test/jtx/BasicNetwork_test.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include #include diff --git a/src/test/support/jtx/Env.h b/src/test/jtx/Env.h similarity index 98% rename from src/test/support/jtx/Env.h rename to src/test/jtx/Env.h index ea682642b..4080a1e20 100644 --- a/src/test/support/jtx/Env.h +++ b/src/test/jtx/Env.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_TEST_JTX_ENV_H_INCLUDED #define RIPPLE_TEST_JTX_ENV_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/test/support/jtx/Env_ss.h b/src/test/jtx/Env_ss.h similarity index 98% rename from src/test/support/jtx/Env_ss.h rename to src/test/jtx/Env_ss.h index b98bc219f..63fd08016 100644 --- a/src/test/support/jtx/Env_ss.h +++ b/src/test/jtx/Env_ss.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_JTX_ENV_SS_H_INCLUDED #define RIPPLE_TEST_JTX_ENV_SS_H_INCLUDED -#include +#include namespace ripple { namespace test { diff --git a/src/test/support/Env_test.cpp b/src/test/jtx/Env_test.cpp similarity index 99% rename from src/test/support/Env_test.cpp rename to src/test/jtx/Env_test.cpp index ad7a5414f..18a4419cf 100644 --- a/src/test/support/Env_test.cpp +++ b/src/test/jtx/Env_test.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/test/support/JSONRPCClient.h b/src/test/jtx/JSONRPCClient.h similarity index 97% rename from src/test/support/JSONRPCClient.h rename to src/test/jtx/JSONRPCClient.h index b9165a6b4..8c0c5b65c 100644 --- a/src/test/support/JSONRPCClient.h +++ b/src/test/jtx/JSONRPCClient.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_HTTPCLIENT_H_INCLUDED #define RIPPLE_TEST_HTTPCLIENT_H_INCLUDED -#include +#include #include #include diff --git a/src/test/support/jtx/JTx.h b/src/test/jtx/JTx.h similarity index 98% rename from src/test/support/jtx/JTx.h rename to src/test/jtx/JTx.h index 490d78a8a..da82be28a 100644 --- a/src/test/support/jtx/JTx.h +++ b/src/test/jtx/JTx.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_JTX_JTX_H_INCLUDED #define RIPPLE_TEST_JTX_JTX_H_INCLUDED -#include -#include +#include +#include #include #include #include diff --git a/src/test/support/ManualTimeKeeper.h b/src/test/jtx/ManualTimeKeeper.h similarity index 100% rename from src/test/support/ManualTimeKeeper.h rename to src/test/jtx/ManualTimeKeeper.h diff --git a/src/test/support/PathSet.h b/src/test/jtx/PathSet.h similarity index 99% rename from src/test/support/PathSet.h rename to src/test/jtx/PathSet.h index 399c5cb07..c2ab7f257 100644 --- a/src/test/support/PathSet.h +++ b/src/test/jtx/PathSet.h @@ -22,7 +22,7 @@ #include #include -#include +#include namespace ripple { namespace test { diff --git a/src/test/support/TestSuite.h b/src/test/jtx/TestSuite.h similarity index 100% rename from src/test/support/TestSuite.h rename to src/test/jtx/TestSuite.h diff --git a/src/test/support/WSClient.h b/src/test/jtx/WSClient.h similarity index 97% rename from src/test/support/WSClient.h rename to src/test/jtx/WSClient.h index a870a5ce2..a6a823f67 100644 --- a/src/test/support/WSClient.h +++ b/src/test/jtx/WSClient.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_WSCLIENT_H_INCLUDED #define RIPPLE_TEST_WSCLIENT_H_INCLUDED -#include +#include #include #include #include diff --git a/src/test/support/WSClient_test.cpp b/src/test/jtx/WSClient_test.cpp similarity index 96% rename from src/test/support/WSClient_test.cpp rename to src/test/jtx/WSClient_test.cpp index eeb4e9533..910166968 100644 --- a/src/test/support/WSClient_test.cpp +++ b/src/test/jtx/WSClient_test.cpp @@ -18,8 +18,8 @@ //============================================================================== #include -#include -#include +#include +#include #include #include diff --git a/src/test/support/jtx/amount.h b/src/test/jtx/amount.h similarity index 98% rename from src/test/support/jtx/amount.h rename to src/test/jtx/amount.h index 11802a852..1e2d99d90 100644 --- a/src/test/support/jtx/amount.h +++ b/src/test/jtx/amount.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_TEST_JTX_AMOUNT_H_INCLUDED #define RIPPLE_TEST_JTX_AMOUNT_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/test/support/jtx/balance.h b/src/test/jtx/balance.h similarity index 96% rename from src/test/support/jtx/balance.h rename to src/test/jtx/balance.h index be21299c6..954ad9955 100644 --- a/src/test/support/jtx/balance.h +++ b/src/test/jtx/balance.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_JTX_BALANCE_H_INCLUDED #define RIPPLE_TEST_JTX_BALANCE_H_INCLUDED -#include -#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/support/jtx/basic_prop.h b/src/test/jtx/basic_prop.h similarity index 100% rename from src/test/support/jtx/basic_prop.h rename to src/test/jtx/basic_prop.h diff --git a/src/test/support/jtx/delivermin.h b/src/test/jtx/delivermin.h similarity index 97% rename from src/test/support/jtx/delivermin.h rename to src/test/jtx/delivermin.h index 7abdd7d4c..7a04d5344 100644 --- a/src/test/support/jtx/delivermin.h +++ b/src/test/jtx/delivermin.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_JTX_DELIVERMIN_H_INCLUDED #define RIPPLE_TEST_JTX_DELIVERMIN_H_INCLUDED -#include +#include #include namespace ripple { diff --git a/src/test/support/jtx/fee.h b/src/test/jtx/fee.h similarity index 96% rename from src/test/support/jtx/fee.h rename to src/test/jtx/fee.h index c07f8898b..46792cf6d 100644 --- a/src/test/support/jtx/fee.h +++ b/src/test/jtx/fee.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_JTX_FEE_H_INCLUDED #define RIPPLE_TEST_JTX_FEE_H_INCLUDED -#include -#include +#include +#include #include #include #include diff --git a/src/test/support/jtx/flags.h b/src/test/jtx/flags.h similarity index 99% rename from src/test/support/jtx/flags.h rename to src/test/jtx/flags.h index b91570a16..4d2a82663 100644 --- a/src/test/support/jtx/flags.h +++ b/src/test/jtx/flags.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_JTX_FLAGS_H_INCLUDED #define RIPPLE_TEST_JTX_FLAGS_H_INCLUDED -#include +#include #include #include #include diff --git a/src/test/support/jtx/impl/Account.cpp b/src/test/jtx/impl/Account.cpp similarity index 97% rename from src/test/support/jtx/impl/Account.cpp rename to src/test/jtx/impl/Account.cpp index 8ec9efec1..a0ee21508 100644 --- a/src/test/support/jtx/impl/Account.cpp +++ b/src/test/jtx/impl/Account.cpp @@ -18,8 +18,8 @@ //============================================================================== #include -#include -#include +#include +#include #include namespace ripple { diff --git a/src/test/support/jtx/impl/Env.cpp b/src/test/jtx/impl/Env.cpp similarity index 97% rename from src/test/support/jtx/impl/Env.cpp rename to src/test/jtx/impl/Env.cpp index 5a87be6d5..9b76f3cfe 100644 --- a/src/test/support/jtx/impl/Env.cpp +++ b/src/test/jtx/impl/Env.cpp @@ -18,17 +18,17 @@ //============================================================================== #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/test/support/impl/JSONRPCClient.cpp b/src/test/jtx/impl/JSONRPCClient.cpp similarity index 99% rename from src/test/support/impl/JSONRPCClient.cpp rename to src/test/jtx/impl/JSONRPCClient.cpp index 9448b99f8..72ad45e4d 100644 --- a/src/test/support/impl/JSONRPCClient.cpp +++ b/src/test/jtx/impl/JSONRPCClient.cpp @@ -17,7 +17,7 @@ */ //============================================================================== #include -#include +#include #include #include #include diff --git a/src/test/support/impl/ManualTimeKeeper.cpp b/src/test/jtx/impl/ManualTimeKeeper.cpp similarity index 98% rename from src/test/support/impl/ManualTimeKeeper.cpp rename to src/test/jtx/impl/ManualTimeKeeper.cpp index 0a2e888a5..48c81f4cf 100644 --- a/src/test/support/impl/ManualTimeKeeper.cpp +++ b/src/test/jtx/impl/ManualTimeKeeper.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include namespace ripple { namespace test { diff --git a/src/test/support/impl/WSClient.cpp b/src/test/jtx/impl/WSClient.cpp similarity index 99% rename from src/test/support/impl/WSClient.cpp rename to src/test/jtx/impl/WSClient.cpp index 34d771f49..d37733b42 100644 --- a/src/test/support/impl/WSClient.cpp +++ b/src/test/jtx/impl/WSClient.cpp @@ -18,8 +18,8 @@ //============================================================================== #include -#include -#include +#include +#include #include #include #include diff --git a/src/test/support/jtx/impl/amount.cpp b/src/test/jtx/impl/amount.cpp similarity index 97% rename from src/test/support/jtx/impl/amount.cpp rename to src/test/jtx/impl/amount.cpp index 51768e401..fefa1a8c3 100644 --- a/src/test/support/jtx/impl/amount.cpp +++ b/src/test/jtx/impl/amount.cpp @@ -18,8 +18,8 @@ //============================================================================== #include -#include -#include +#include +#include #include #include #include diff --git a/src/test/support/jtx/impl/balance.cpp b/src/test/jtx/impl/balance.cpp similarity index 98% rename from src/test/support/jtx/impl/balance.cpp rename to src/test/jtx/impl/balance.cpp index 783d22923..c0e4f502d 100644 --- a/src/test/support/jtx/impl/balance.cpp +++ b/src/test/jtx/impl/balance.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include namespace ripple { namespace test { diff --git a/src/test/support/jtx/impl/delivermin.cpp b/src/test/jtx/impl/delivermin.cpp similarity index 96% rename from src/test/support/jtx/impl/delivermin.cpp rename to src/test/jtx/impl/delivermin.cpp index 31ddb0062..8589a5a7a 100644 --- a/src/test/support/jtx/impl/delivermin.cpp +++ b/src/test/jtx/impl/delivermin.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/test/support/jtx/impl/fee.cpp b/src/test/jtx/impl/fee.cpp similarity index 97% rename from src/test/support/jtx/impl/fee.cpp rename to src/test/jtx/impl/fee.cpp index 1aae18be6..7b31539d4 100644 --- a/src/test/support/jtx/impl/fee.cpp +++ b/src/test/jtx/impl/fee.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/test/support/jtx/impl/flags.cpp b/src/test/jtx/impl/flags.cpp similarity index 98% rename from src/test/support/jtx/impl/flags.cpp rename to src/test/jtx/impl/flags.cpp index 0e028ec5c..c292233bc 100644 --- a/src/test/support/jtx/impl/flags.cpp +++ b/src/test/jtx/impl/flags.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/test/support/jtx/impl/jtx_json.cpp b/src/test/jtx/impl/jtx_json.cpp similarity index 95% rename from src/test/support/jtx/impl/jtx_json.cpp rename to src/test/jtx/impl/jtx_json.cpp index 7848fd58e..9e1a16b43 100644 --- a/src/test/support/jtx/impl/jtx_json.cpp +++ b/src/test/jtx/impl/jtx_json.cpp @@ -18,8 +18,8 @@ //============================================================================== #include -#include -#include +#include +#include #include #include diff --git a/src/test/support/jtx/impl/memo.cpp b/src/test/jtx/impl/memo.cpp similarity index 98% rename from src/test/support/jtx/impl/memo.cpp rename to src/test/jtx/impl/memo.cpp index 617c65199..bf8f4a747 100644 --- a/src/test/support/jtx/impl/memo.cpp +++ b/src/test/jtx/impl/memo.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include diff --git a/src/test/support/jtx/impl/multisign.cpp b/src/test/jtx/impl/multisign.cpp similarity index 97% rename from src/test/support/jtx/impl/multisign.cpp rename to src/test/jtx/impl/multisign.cpp index 4cc478d9d..a637c2d98 100644 --- a/src/test/support/jtx/impl/multisign.cpp +++ b/src/test/jtx/impl/multisign.cpp @@ -18,8 +18,8 @@ //============================================================================== #include -#include -#include +#include +#include #include #include #include diff --git a/src/test/support/jtx/impl/offer.cpp b/src/test/jtx/impl/offer.cpp similarity index 97% rename from src/test/support/jtx/impl/offer.cpp rename to src/test/jtx/impl/offer.cpp index 8f8a6a4f4..3f724b98f 100644 --- a/src/test/support/jtx/impl/offer.cpp +++ b/src/test/jtx/impl/offer.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/test/support/jtx/impl/owners.cpp b/src/test/jtx/impl/owners.cpp similarity index 98% rename from src/test/support/jtx/impl/owners.cpp rename to src/test/jtx/impl/owners.cpp index 83a7bfaef..87348b1be 100644 --- a/src/test/support/jtx/impl/owners.cpp +++ b/src/test/jtx/impl/owners.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include namespace ripple { namespace test { diff --git a/src/test/support/jtx/impl/paths.cpp b/src/test/jtx/impl/paths.cpp similarity index 98% rename from src/test/support/jtx/impl/paths.cpp rename to src/test/jtx/impl/paths.cpp index 888054dc2..9a0aa33f7 100644 --- a/src/test/support/jtx/impl/paths.cpp +++ b/src/test/jtx/impl/paths.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include namespace ripple { diff --git a/src/test/support/jtx/impl/pay.cpp b/src/test/jtx/impl/pay.cpp similarity index 97% rename from src/test/support/jtx/impl/pay.cpp rename to src/test/jtx/impl/pay.cpp index 396aab7b4..23b8a54b7 100644 --- a/src/test/support/jtx/impl/pay.cpp +++ b/src/test/jtx/impl/pay.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include diff --git a/src/test/support/jtx/impl/quality2.cpp b/src/test/jtx/impl/quality2.cpp similarity index 98% rename from src/test/support/jtx/impl/quality2.cpp rename to src/test/jtx/impl/quality2.cpp index 97fd979fd..5b0ab49f4 100644 --- a/src/test/support/jtx/impl/quality2.cpp +++ b/src/test/jtx/impl/quality2.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include diff --git a/src/test/support/jtx/impl/rate.cpp b/src/test/jtx/impl/rate.cpp similarity index 97% rename from src/test/support/jtx/impl/rate.cpp rename to src/test/jtx/impl/rate.cpp index f00c7e739..534bba3f9 100644 --- a/src/test/support/jtx/impl/rate.cpp +++ b/src/test/jtx/impl/rate.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include #include diff --git a/src/test/support/jtx/impl/regkey.cpp b/src/test/jtx/impl/regkey.cpp similarity index 97% rename from src/test/support/jtx/impl/regkey.cpp rename to src/test/jtx/impl/regkey.cpp index 306eb1cf9..3e96f1921 100644 --- a/src/test/support/jtx/impl/regkey.cpp +++ b/src/test/jtx/impl/regkey.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/test/support/jtx/impl/sendmax.cpp b/src/test/jtx/impl/sendmax.cpp similarity index 97% rename from src/test/support/jtx/impl/sendmax.cpp rename to src/test/jtx/impl/sendmax.cpp index f2cd22f65..82f32a89e 100644 --- a/src/test/support/jtx/impl/sendmax.cpp +++ b/src/test/jtx/impl/sendmax.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/test/support/jtx/impl/seq.cpp b/src/test/jtx/impl/seq.cpp similarity index 97% rename from src/test/support/jtx/impl/seq.cpp rename to src/test/jtx/impl/seq.cpp index 4722c4e07..08b994767 100644 --- a/src/test/support/jtx/impl/seq.cpp +++ b/src/test/jtx/impl/seq.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/test/support/jtx/impl/sig.cpp b/src/test/jtx/impl/sig.cpp similarity index 95% rename from src/test/support/jtx/impl/sig.cpp rename to src/test/jtx/impl/sig.cpp index b1a16569e..a3dd797af 100644 --- a/src/test/support/jtx/impl/sig.cpp +++ b/src/test/jtx/impl/sig.cpp @@ -18,8 +18,8 @@ //============================================================================== #include -#include -#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/support/jtx/impl/tag.cpp b/src/test/jtx/impl/tag.cpp similarity index 97% rename from src/test/support/jtx/impl/tag.cpp rename to src/test/jtx/impl/tag.cpp index 238e80439..a8d0bc451 100644 --- a/src/test/support/jtx/impl/tag.cpp +++ b/src/test/jtx/impl/tag.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/test/support/jtx/impl/ticket.cpp b/src/test/jtx/impl/ticket.cpp similarity index 98% rename from src/test/support/jtx/impl/ticket.cpp rename to src/test/jtx/impl/ticket.cpp index a1b1fe5d3..68e8213ec 100644 --- a/src/test/support/jtx/impl/ticket.cpp +++ b/src/test/jtx/impl/ticket.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/test/support/jtx/impl/trust.cpp b/src/test/jtx/impl/trust.cpp similarity index 98% rename from src/test/support/jtx/impl/trust.cpp rename to src/test/jtx/impl/trust.cpp index e72167bf8..508fa21b6 100644 --- a/src/test/support/jtx/impl/trust.cpp +++ b/src/test/jtx/impl/trust.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include #include diff --git a/src/test/support/jtx/impl/txflags.cpp b/src/test/jtx/impl/txflags.cpp similarity index 97% rename from src/test/support/jtx/impl/txflags.cpp rename to src/test/jtx/impl/txflags.cpp index 531d77571..7a2faa579 100644 --- a/src/test/support/jtx/impl/txflags.cpp +++ b/src/test/jtx/impl/txflags.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/test/support/jtx/impl/utility.cpp b/src/test/jtx/impl/utility.cpp similarity index 98% rename from src/test/support/jtx/impl/utility.cpp rename to src/test/jtx/impl/utility.cpp index 0c2108b2d..26b233a4c 100644 --- a/src/test/support/jtx/impl/utility.cpp +++ b/src/test/jtx/impl/utility.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include #include diff --git a/src/test/support/jtx/jtx_json.h b/src/test/jtx/jtx_json.h similarity index 98% rename from src/test/support/jtx/jtx_json.h rename to src/test/jtx/jtx_json.h index c9c0e6928..143feea27 100644 --- a/src/test/support/jtx/jtx_json.h +++ b/src/test/jtx/jtx_json.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_JTX_JSON_H_INCLUDED #define RIPPLE_TEST_JTX_JSON_H_INCLUDED -#include +#include #include namespace ripple { diff --git a/src/test/support/jtx/memo.h b/src/test/jtx/memo.h similarity index 98% rename from src/test/support/jtx/memo.h rename to src/test/jtx/memo.h index 08d006ce8..63b0216b5 100644 --- a/src/test/support/jtx/memo.h +++ b/src/test/jtx/memo.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_JTX_MEMO_H_INCLUDED #define RIPPLE_TEST_JTX_MEMO_H_INCLUDED -#include +#include #include namespace ripple { diff --git a/src/test/support/jtx/multisign.h b/src/test/jtx/multisign.h similarity index 96% rename from src/test/support/jtx/multisign.h rename to src/test/jtx/multisign.h index 6971882d2..5d06f8868 100644 --- a/src/test/support/jtx/multisign.h +++ b/src/test/jtx/multisign.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_TEST_JTX_MULTISIGN_H_INCLUDED #define RIPPLE_TEST_JTX_MULTISIGN_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/test/support/jtx/noop.h b/src/test/jtx/noop.h similarity index 97% rename from src/test/support/jtx/noop.h rename to src/test/jtx/noop.h index 9921bdb4a..a60eda1ab 100644 --- a/src/test/support/jtx/noop.h +++ b/src/test/jtx/noop.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_JTX_NOOP_H_INCLUDED #define RIPPLE_TEST_JTX_NOOP_H_INCLUDED -#include +#include namespace ripple { namespace test { diff --git a/src/test/support/jtx/offer.h b/src/test/jtx/offer.h similarity index 97% rename from src/test/support/jtx/offer.h rename to src/test/jtx/offer.h index dc1909913..029e9d9ff 100644 --- a/src/test/support/jtx/offer.h +++ b/src/test/jtx/offer.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_JTX_OFFER_H_INCLUDED #define RIPPLE_TEST_JTX_OFFER_H_INCLUDED -#include +#include #include #include diff --git a/src/test/support/jtx/owners.h b/src/test/jtx/owners.h similarity index 98% rename from src/test/support/jtx/owners.h rename to src/test/jtx/owners.h index 6409b7589..32e6ed3c2 100644 --- a/src/test/support/jtx/owners.h +++ b/src/test/jtx/owners.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_JTX_OWNERS_H_INCLUDED #define RIPPLE_TEST_JTX_OWNERS_H_INCLUDED -#include +#include #include #include #include diff --git a/src/test/support/jtx/paths.h b/src/test/jtx/paths.h similarity index 98% rename from src/test/support/jtx/paths.h rename to src/test/jtx/paths.h index 1ad8f80e7..9f438d467 100644 --- a/src/test/support/jtx/paths.h +++ b/src/test/jtx/paths.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_JTX_PATHS_H_INCLUDED #define RIPPLE_TEST_JTX_PATHS_H_INCLUDED -#include +#include #include #include diff --git a/src/test/support/jtx/pay.h b/src/test/jtx/pay.h similarity index 94% rename from src/test/support/jtx/pay.h rename to src/test/jtx/pay.h index e023983b4..055c51b25 100644 --- a/src/test/support/jtx/pay.h +++ b/src/test/jtx/pay.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_JTX_PAY_H_INCLUDED #define RIPPLE_TEST_JTX_PAY_H_INCLUDED -#include -#include +#include +#include #include namespace ripple { diff --git a/src/test/support/jtx/prop.h b/src/test/jtx/prop.h similarity index 97% rename from src/test/support/jtx/prop.h rename to src/test/jtx/prop.h index 5600c99d6..e547476d2 100644 --- a/src/test/support/jtx/prop.h +++ b/src/test/jtx/prop.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_JTX_PROP_H_INCLUDED #define RIPPLE_TEST_JTX_PROP_H_INCLUDED -#include +#include #include namespace ripple { diff --git a/src/test/support/jtx/quality.h b/src/test/jtx/quality.h similarity index 98% rename from src/test/support/jtx/quality.h rename to src/test/jtx/quality.h index 6e1b03898..942d2dd0f 100644 --- a/src/test/support/jtx/quality.h +++ b/src/test/jtx/quality.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_JTX_QUALITY_H_INCLUDED #define RIPPLE_TEST_JTX_QUALITY_H_INCLUDED -#include +#include namespace ripple { namespace test { diff --git a/src/test/support/jtx/rate.h b/src/test/jtx/rate.h similarity index 97% rename from src/test/support/jtx/rate.h rename to src/test/jtx/rate.h index c240b7b8c..3297c87c6 100644 --- a/src/test/support/jtx/rate.h +++ b/src/test/jtx/rate.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_JTX_RATE_H_INCLUDED #define RIPPLE_TEST_JTX_RATE_H_INCLUDED -#include +#include #include namespace ripple { diff --git a/src/test/support/jtx/regkey.h b/src/test/jtx/regkey.h similarity index 95% rename from src/test/support/jtx/regkey.h rename to src/test/jtx/regkey.h index dff40e1f3..b3aa8814f 100644 --- a/src/test/support/jtx/regkey.h +++ b/src/test/jtx/regkey.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_JTX_REGKEY_H_INCLUDED #define RIPPLE_TEST_JTX_REGKEY_H_INCLUDED -#include -#include +#include +#include #include namespace ripple { diff --git a/src/test/support/jtx/require.h b/src/test/jtx/require.h similarity index 98% rename from src/test/support/jtx/require.h rename to src/test/jtx/require.h index bdebd5051..8894b83d4 100644 --- a/src/test/support/jtx/require.h +++ b/src/test/jtx/require.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_JTX_REQUIRE_H_INCLUDED #define RIPPLE_TEST_JTX_REQUIRE_H_INCLUDED -#include +#include #include #include diff --git a/src/test/support/jtx/requires.h b/src/test/jtx/requires.h similarity index 100% rename from src/test/support/jtx/requires.h rename to src/test/jtx/requires.h diff --git a/src/test/support/jtx/sendmax.h b/src/test/jtx/sendmax.h similarity index 97% rename from src/test/support/jtx/sendmax.h rename to src/test/jtx/sendmax.h index daf7d4fea..b7b5a3c47 100644 --- a/src/test/support/jtx/sendmax.h +++ b/src/test/jtx/sendmax.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_JTX_SENDMAX_H_INCLUDED #define RIPPLE_TEST_JTX_SENDMAX_H_INCLUDED -#include +#include #include namespace ripple { diff --git a/src/test/support/jtx/seq.h b/src/test/jtx/seq.h similarity index 95% rename from src/test/support/jtx/seq.h rename to src/test/jtx/seq.h index d6b1fe8e9..40b632c73 100644 --- a/src/test/support/jtx/seq.h +++ b/src/test/jtx/seq.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_JTX_SEQ_H_INCLUDED #define RIPPLE_TEST_JTX_SEQ_H_INCLUDED -#include -#include +#include +#include #include namespace ripple { diff --git a/src/test/support/jtx/sig.h b/src/test/jtx/sig.h similarity index 98% rename from src/test/support/jtx/sig.h rename to src/test/jtx/sig.h index 8a3328552..c7b3c10c2 100644 --- a/src/test/support/jtx/sig.h +++ b/src/test/jtx/sig.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_JTX_SIG_H_INCLUDED #define RIPPLE_TEST_JTX_SIG_H_INCLUDED -#include +#include #include namespace ripple { diff --git a/src/test/support/jtx/tag.h b/src/test/jtx/tag.h similarity index 98% rename from src/test/support/jtx/tag.h rename to src/test/jtx/tag.h index 6373d0ad4..abeaf9d6a 100644 --- a/src/test/support/jtx/tag.h +++ b/src/test/jtx/tag.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_JTX_TAG_H_INCLUDED #define RIPPLE_TEST_JTX_TAG_H_INCLUDED -#include +#include namespace ripple { namespace test { diff --git a/src/test/support/jtx/tags.h b/src/test/jtx/tags.h similarity index 100% rename from src/test/support/jtx/tags.h rename to src/test/jtx/tags.h diff --git a/src/test/support/jtx/ter.h b/src/test/jtx/ter.h similarity index 97% rename from src/test/support/jtx/ter.h rename to src/test/jtx/ter.h index 0e5d1ff09..d5ff05599 100644 --- a/src/test/support/jtx/ter.h +++ b/src/test/jtx/ter.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_JTX_TER_H_INCLUDED #define RIPPLE_TEST_JTX_TER_H_INCLUDED -#include +#include #include namespace ripple { diff --git a/src/test/support/jtx/ticket.h b/src/test/jtx/ticket.h similarity index 96% rename from src/test/support/jtx/ticket.h rename to src/test/jtx/ticket.h index b38fa5bda..d46b7ce55 100644 --- a/src/test/support/jtx/ticket.h +++ b/src/test/jtx/ticket.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_TEST_JTX_TICKET_H_INCLUDED #define RIPPLE_TEST_JTX_TICKET_H_INCLUDED -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/test/support/jtx/trust.h b/src/test/jtx/trust.h similarity index 97% rename from src/test/support/jtx/trust.h rename to src/test/jtx/trust.h index 9e0c9cfe5..27e06246a 100644 --- a/src/test/support/jtx/trust.h +++ b/src/test/jtx/trust.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_JTX_TRUST_H_INCLUDED #define RIPPLE_TEST_JTX_TRUST_H_INCLUDED -#include +#include #include #include diff --git a/src/test/support/jtx/txflags.h b/src/test/jtx/txflags.h similarity index 97% rename from src/test/support/jtx/txflags.h rename to src/test/jtx/txflags.h index 63992da3f..f3f80a912 100644 --- a/src/test/support/jtx/txflags.h +++ b/src/test/jtx/txflags.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_JTX_TXFLAGS_H_INCLUDED #define RIPPLE_TEST_JTX_TXFLAGS_H_INCLUDED -#include +#include namespace ripple { namespace test { diff --git a/src/test/support/jtx/utility.h b/src/test/jtx/utility.h similarity index 98% rename from src/test/support/jtx/utility.h rename to src/test/jtx/utility.h index a01aace43..8fc6f45c0 100644 --- a/src/test/support/jtx/utility.h +++ b/src/test/jtx/utility.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TEST_JTX_UTILITY_H_INCLUDED #define RIPPLE_TEST_JTX_UTILITY_H_INCLUDED -#include +#include #include #include #include diff --git a/src/test/ledger/BookDirs_test.cpp b/src/test/ledger/BookDirs_test.cpp index d00af360a..e841401a9 100644 --- a/src/test/ledger/BookDirs_test.cpp +++ b/src/test/ledger/BookDirs_test.cpp @@ -16,7 +16,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/test/ledger/Directory_test.cpp b/src/test/ledger/Directory_test.cpp index 2511a5cc0..b4045c5e1 100644 --- a/src/test/ledger/Directory_test.cpp +++ b/src/test/ledger/Directory_test.cpp @@ -16,7 +16,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/test/ledger/PaymentSandbox_test.cpp b/src/test/ledger/PaymentSandbox_test.cpp index 13171c747..35c3d383b 100644 --- a/src/test/ledger/PaymentSandbox_test.cpp +++ b/src/test/ledger/PaymentSandbox_test.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/test/ledger/SHAMapV2_test.cpp b/src/test/ledger/SHAMapV2_test.cpp index 1ebab7b5c..64228694c 100644 --- a/src/test/ledger/SHAMapV2_test.cpp +++ b/src/test/ledger/SHAMapV2_test.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include namespace ripple { diff --git a/src/test/ledger/SkipList_test.cpp b/src/test/ledger/SkipList_test.cpp index a45ed7ece..90972adfa 100644 --- a/src/test/ledger/SkipList_test.cpp +++ b/src/test/ledger/SkipList_test.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include namespace ripple { diff --git a/src/test/ledger/View_test.cpp b/src/test/ledger/View_test.cpp index 24891dc8f..3f7672d58 100644 --- a/src/test/ledger/View_test.cpp +++ b/src/test/ledger/View_test.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include #include diff --git a/src/test/overlay/cluster_test.cpp b/src/test/overlay/cluster_test.cpp index 43a0cd662..9383710a2 100644 --- a/src/test/overlay/cluster_test.cpp +++ b/src/test/overlay/cluster_test.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/src/test/overlay/manifest_test.cpp b/src/test/overlay/manifest_test.cpp index 9230e3f59..e6d121f30 100644 --- a/src/test/overlay/manifest_test.cpp +++ b/src/test/overlay/manifest_test.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/test/rpc/AccountInfo_test.cpp b/src/test/rpc/AccountInfo_test.cpp index e456b7fda..31904ef9f 100644 --- a/src/test/rpc/AccountInfo_test.cpp +++ b/src/test/rpc/AccountInfo_test.cpp @@ -19,7 +19,7 @@ #include // jss:: definitions #include -#include +#include namespace ripple { namespace test { diff --git a/src/test/rpc/AccountLinesRPC_test.cpp b/src/test/rpc/AccountLinesRPC_test.cpp index 8120d47a0..477eb6b7c 100644 --- a/src/test/rpc/AccountLinesRPC_test.cpp +++ b/src/test/rpc/AccountLinesRPC_test.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include namespace ripple { diff --git a/src/test/rpc/AccountObjects_test.cpp b/src/test/rpc/AccountObjects_test.cpp index 7778fc053..909161bc1 100644 --- a/src/test/rpc/AccountObjects_test.cpp +++ b/src/test/rpc/AccountObjects_test.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include diff --git a/src/test/rpc/AccountOffers_test.cpp b/src/test/rpc/AccountOffers_test.cpp index ec82d1617..aafaaf9fa 100644 --- a/src/test/rpc/AccountOffers_test.cpp +++ b/src/test/rpc/AccountOffers_test.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include namespace ripple { namespace test { diff --git a/src/test/rpc/AccountSet_test.cpp b/src/test/rpc/AccountSet_test.cpp index f84e7eecc..248fb0568 100644 --- a/src/test/rpc/AccountSet_test.cpp +++ b/src/test/rpc/AccountSet_test.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include namespace ripple { diff --git a/src/test/rpc/Book_test.cpp b/src/test/rpc/Book_test.cpp index 9caa2f33f..802203bb6 100644 --- a/src/test/rpc/Book_test.cpp +++ b/src/test/rpc/Book_test.cpp @@ -18,8 +18,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/src/test/rpc/GatewayBalances_test.cpp b/src/test/rpc/GatewayBalances_test.cpp index b739d233b..8931715bc 100644 --- a/src/test/rpc/GatewayBalances_test.cpp +++ b/src/test/rpc/GatewayBalances_test.cpp @@ -17,8 +17,8 @@ #include #include -#include -#include +#include +#include #include namespace ripple { diff --git a/src/test/rpc/JSONRPC_test.cpp b/src/test/rpc/JSONRPC_test.cpp index 8f1f025d6..a464518b0 100644 --- a/src/test/rpc/JSONRPC_test.cpp +++ b/src/test/rpc/JSONRPC_test.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include namespace ripple { diff --git a/src/test/rpc/KeyGeneration_test.cpp b/src/test/rpc/KeyGeneration_test.cpp index 75a9d2bdd..e9d3624e5 100644 --- a/src/test/rpc/KeyGeneration_test.cpp +++ b/src/test/rpc/KeyGeneration_test.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/test/rpc/LedgerClosed_test.cpp b/src/test/rpc/LedgerClosed_test.cpp index 581b74d85..f987658f4 100644 --- a/src/test/rpc/LedgerClosed_test.cpp +++ b/src/test/rpc/LedgerClosed_test.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include namespace ripple { diff --git a/src/test/rpc/LedgerData_test.cpp b/src/test/rpc/LedgerData_test.cpp index 73958f349..48c0a5145 100644 --- a/src/test/rpc/LedgerData_test.cpp +++ b/src/test/rpc/LedgerData_test.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include namespace ripple { diff --git a/src/test/rpc/LedgerRPC_test.cpp b/src/test/rpc/LedgerRPC_test.cpp index ca780a7cf..d0e398b1f 100644 --- a/src/test/rpc/LedgerRPC_test.cpp +++ b/src/test/rpc/LedgerRPC_test.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include namespace ripple { diff --git a/src/test/rpc/LedgerRequestRPC_test.cpp b/src/test/rpc/LedgerRequestRPC_test.cpp index 48b86f3ec..af7b00f32 100644 --- a/src/test/rpc/LedgerRequestRPC_test.cpp +++ b/src/test/rpc/LedgerRequestRPC_test.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/test/rpc/NoRipple_test.cpp b/src/test/rpc/NoRipple_test.cpp index 9f2e2839c..afabd778e 100644 --- a/src/test/rpc/NoRipple_test.cpp +++ b/src/test/rpc/NoRipple_test.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include namespace ripple { diff --git a/src/test/rpc/RPCOverload_test.cpp b/src/test/rpc/RPCOverload_test.cpp index 967ecfac3..93975e4b6 100644 --- a/src/test/rpc/RPCOverload_test.cpp +++ b/src/test/rpc/RPCOverload_test.cpp @@ -17,9 +17,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include namespace ripple { diff --git a/src/test/rpc/RobustTransaction_test.cpp b/src/test/rpc/RobustTransaction_test.cpp index 7942d1c77..7c2f9c1bd 100644 --- a/src/test/rpc/RobustTransaction_test.cpp +++ b/src/test/rpc/RobustTransaction_test.cpp @@ -18,8 +18,8 @@ #include #include #include -#include -#include +#include +#include #include namespace ripple { diff --git a/src/test/rpc/ServerInfo_test.cpp b/src/test/rpc/ServerInfo_test.cpp index f1489c2d7..fc750290d 100644 --- a/src/test/rpc/ServerInfo_test.cpp +++ b/src/test/rpc/ServerInfo_test.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/src/test/rpc/Subscribe_test.cpp b/src/test/rpc/Subscribe_test.cpp index e2ba3370e..80bf12338 100644 --- a/src/test/rpc/Subscribe_test.cpp +++ b/src/test/rpc/Subscribe_test.cpp @@ -19,8 +19,8 @@ #include #include #include -#include -#include +#include +#include #include namespace ripple { diff --git a/src/test/server/ServerStatus_test.cpp b/src/test/server/ServerStatus_test.cpp index 5f52b6cfd..6ca72f107 100644 --- a/src/test/server/ServerStatus_test.cpp +++ b/src/test/server/ServerStatus_test.cpp @@ -20,9 +20,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/test/support/jtx.h b/src/test/support/jtx.h deleted file mode 100644 index 05bae57aa..000000000 --- a/src/test/support/jtx.h +++ /dev/null @@ -1,60 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of rippled: https://github.com/ripple/rippled - Copyright (c) 2012, 2013 Ripple Labs Inc. - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ -//============================================================================== - -#ifndef RIPPLE_TEST_JTX_H_INCLUDED -#define RIPPLE_TEST_JTX_H_INCLUDED - -// Convenience header that includes everything - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#endif diff --git a/src/test/support/mao/Net.h b/src/test/support/mao/Net.h deleted file mode 100644 index d1406679a..000000000 --- a/src/test/support/mao/Net.h +++ /dev/null @@ -1,39 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of rippled: https://github.com/ripple/rippled - Copyright (c) 2012, 2013 Ripple Labs Inc. - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ -//============================================================================== - -#ifndef RIPPLE_TEST_MAO_H_INCLUDED -#define RIPPLE_TEST_MAO_H_INCLUDED - -#include - -namespace ripple { -namespace test { -namespace mao { - -class Net -{ -private: -public: -}; - -} // mao -} // test -} // ripple - -#endif diff --git a/src/test/support/mao/impl/Net.cpp b/src/test/support/mao/impl/Net.cpp deleted file mode 100644 index 6c2ed7286..000000000 --- a/src/test/support/mao/impl/Net.cpp +++ /dev/null @@ -1,31 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of rippled: https://github.com/ripple/rippled - Copyright (c) 2012, 2013 Ripple Labs Inc. - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ -//============================================================================== - -#include -#include - -namespace ripple { -namespace test { -namespace mao { - - - -} // mao -} // test -} // ripple diff --git a/src/test/unity/support_unity.cpp b/src/test/unity/support_unity.cpp index 63433a7ee..f836da53e 100644 --- a/src/test/unity/support_unity.cpp +++ b/src/test/unity/support_unity.cpp @@ -19,37 +19,36 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include -#include -#include -#include +#include +#include +#include