diff --git a/Builds/VisualStudio2015/RippleD.vcxproj b/Builds/VisualStudio2015/RippleD.vcxproj index 4cb7ceeb51..105ad17915 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 df307fb763..564d37882c 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 e479017069..b6735f5219 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 724ec2b471..e7ac3bd309 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 934ec97846..6919e7a23b 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 5b1590886d..547882d749 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 c38bef053a..c9173c5512 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 83a391d24f..0a8e5573e8 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 0f42a6d4c9..3b573524ac 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 6c4b0ad333..db7fe38de6 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 28c092f5ee..ef3649cbe8 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 53b24b9ffd..22ac5cd561 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 f3b5e0e3a0..7e921856eb 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 9682f77543..fd6be84cb9 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 69b3ba4211..23f4444f10 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 c06769eb42..9c80c10240 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 6db40a4dc3..0d6c3318e4 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 4374b0638c..0eb67d1a8a 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 1538b33121..4ee75c3114 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 c1137a14fc..89c505c37c 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 9415904532..fd8055fa15 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 6c8b157c5a..0b4104236f 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 99c45f802c..3108ce7cde 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 4e32c55ce3..7d10715da7 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 5ad9e7959f..a4600ce451 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 83589f3e0d..777d6a7eea 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 ce627b0402..e91417422c 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 89858bfae5..27ef08ef35 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 d8d4661c50..66033c4ef6 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 3efa9a8d50..db92b6d5e5 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 7d719af20e..3a2b72c7f2 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 569a80d878..7ad4896fab 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 ea682642bd..4080a1e209 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 b98bc219f0..63fd080166 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 ad7a5414f4..18a4419cf8 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 b9165a6b45..8c0c5b65cb 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 490d78a8ad..da82be28a5 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 399c5cb073..c2ab7f2578 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 a870a5ce23..a6a823f671 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 eeb4e95331..910166968c 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 11802a852f..1e2d99d90f 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 be21299c64..954ad99553 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 7abdd7d4c3..7a04d5344b 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 c07f8898b4..46792cf6d3 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 b91570a16b..4d2a826632 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 8ec9efec1f..a0ee215088 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 5a87be6d5c..9b76f3cfec 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 9448b99f8a..72ad45e4d5 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 0a2e888a5c..48c81f4cf5 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 34d771f49c..d37733b427 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 51768e4013..fefa1a8c3d 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 783d229231..c0e4f502d6 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 31ddb0062d..8589a5a7a8 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 1aae18be62..7b31539d4e 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 0e028ec5c2..c292233bcf 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 7848fd58ee..9e1a16b43d 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 617c651991..bf8f4a7475 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 4cc478d9d3..a637c2d989 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 8f8a6a4f48..3f724b98f5 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 83a7bfaef2..87348b1be7 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 888054dc2f..9a0aa33f7e 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 396aab7b46..23b8a54b7e 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 97fd979fdb..5b0ab49f46 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 f00c7e7398..534bba3f93 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 306eb1cf90..3e96f19219 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 f2cd22f656..82f32a89e4 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 4722c4e07f..08b9947673 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 b1a16569e2..a3dd797af8 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 238e804396..a8d0bc4511 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 a1b1fe5d30..68e8213ecf 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 e72167bf87..508fa21b63 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 531d77571a..7a2faa579a 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 0c2108b2d5..26b233a4c2 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 c9c0e6928c..143feea274 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 08d006ce8c..63b0216b5e 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 6971882d2e..5d06f88680 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 9921bdb4a9..a60eda1ab2 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 dc1909913f..029e9d9ff2 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 6409b75899..32e6ed3c21 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 1ad8f80e75..9f438d4678 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 e023983b43..055c51b258 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 5600c99d6a..e547476d2f 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 6e1b038985..942d2dd0f5 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 c240b7b8c3..3297c87c64 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 dff40e1f30..b3aa8814f9 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 bdebd50519..8894b83d40 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 daf7d4fea5..b7b5a3c47f 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 d6b1fe8e95..40b632c73b 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 8a33285527..c7b3c10c2f 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 6373d0ad4b..abeaf9d6ac 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 0e5d1ff095..d5ff05599e 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 b38fa5bda7..d46b7ce55a 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 9e0c9cfe5f..27e06246ae 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 63992da3fb..f3f80a912a 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 a01aace430..8fc6f45c0c 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 d00af360a4..e841401a91 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 2511a5cc06..b4045c5e19 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 13171c747e..35c3d383bf 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 1ebab7b5cd..64228694cd 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 a45ed7ecec..90972adfa3 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 24891dc8f1..3f7672d58a 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 43a0cd6622..9383710a28 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 9230e3f598..e6d121f30b 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 e456b7fdaa..31904ef9fe 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 8120d47a05..477eb6b7c3 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 7778fc053d..909161bc13 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 ec82d1617b..aafaaf9faf 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 f84e7eecca..248fb05680 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 9caa2f33fa..802203bb69 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 b739d233b9..8931715bcf 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 8f1f025d69..a464518b06 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 75a9d2bdd9..e9d3624e5a 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 581b74d855..f987658f4c 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 73958f3495..48c0a5145a 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 ca780a7cf3..d0e398b1ff 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 48b86f3ec4..af7b00f329 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 9f2e2839ca..afabd778eb 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 967ecfac31..93975e4b65 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 7942d1c77f..7c2f9c1bdb 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 f1489c2d7f..fc750290dc 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 e2ba3370e0..80bf12338a 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 5f52b6cfd6..6ca72f107e 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 05bae57aa9..0000000000 --- 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 d1406679a3..0000000000 --- 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 6c2ed72861..0000000000 --- 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 63433a7ee6..f836da53e8 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