diff --git a/Builds/VisualStudio2015/RippleD.vcxproj b/Builds/VisualStudio2015/RippleD.vcxproj index 97fe36854..a2df62585 100644 --- a/Builds/VisualStudio2015/RippleD.vcxproj +++ b/Builds/VisualStudio2015/RippleD.vcxproj @@ -1411,10 +1411,6 @@ True True - - True - True - True True @@ -1463,8 +1459,6 @@ - - @@ -2114,8 +2108,6 @@ - - @@ -2258,8 +2250,6 @@ - - @@ -3040,8 +3030,6 @@ - - @@ -3132,208 +3120,8 @@ - - - - - - - - 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 @@ -3460,10 +3248,6 @@ ..\..\src\soci\include\private;..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) ..\..\src\soci\include\private;..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories) - - True - True - @@ -4448,10 +4232,6 @@ True True - - True - True - True True @@ -4557,16 +4337,20 @@ True - True + True + True - True + True + True - True + True + True - True + True + True True @@ -4592,10 +4376,6 @@ True True - - True - True - True True @@ -4608,6 +4388,8 @@ True True + + True True @@ -4664,6 +4446,8 @@ ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + + True True @@ -4844,6 +4628,8 @@ True True + + True True @@ -4856,73 +4642,283 @@ 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 - + True True - + True True - + True True - + True True - + True True - + True True - + True True ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) ..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - + 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 f7bf7fa95..831951294 100644 --- a/Builds/VisualStudio2015/RippleD.vcxproj.filters +++ b/Builds/VisualStudio2015/RippleD.vcxproj.filters @@ -229,9 +229,6 @@ {EA35E0D0-6876-9DC8-10FA-1E6A0486C574} - - {D5A85FA6-148D-DA25-5DAA-C59504C18F26} - {6649BD29-BE86-723F-501A-045E39310112} @@ -247,9 +244,6 @@ {9D691DE1-17A1-5989-3E2E-F69B3E43152F} - - {3FDC73B9-A9C7-3533-FD40-E4032B9FA9FB} - {51E817F6-DC2E-045A-9009-37E3D16D0990} @@ -289,9 +283,6 @@ {93AC3675-D183-4DB4-021E-8F4CA1586866} - - {84FF17C5-6A81-FF13-548E-59940FE0060E} - {8A61DBF7-69CB-9043-8312-D44C40EC6AE9} @@ -304,27 +295,6 @@ {92AC870A-6B4B-9CD5-4F7F-648C72CFA0D3} - - {F0AEA72D-7030-C8C7-1E34-1029BBD56886} - - - {B25F5854-84AE-1CBD-DFFC-6515DD055652} - - - {CF7F0C3F-3D61-7764-BA8B-5FF38018425C} - - - {A21A3B94-5C44-3746-4F10-6FF8FF990CE3} - - - {27D70888-7145-691C-0E0A-E511EB3A80A2} - - - {94B5035A-6D4A-E4FC-DB50-E7E804DC9F13} - - - {23DE6C05-81D2-7471-D9BB-3AA1D49DE429} - {5DB3CD0B-B361-B301-9562-697CA8A52B68} @@ -493,8 +463,26 @@ {2E37F2EA-49FC-1F02-C3EA-D7EB608603A1} - - {82E1AA93-0E6B-39FA-4212-EB820AD49028} + + {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} @@ -1911,9 +1899,6 @@ ripple\basics\impl - - ripple\basics\impl - ripple\basics\impl @@ -1977,9 +1962,6 @@ ripple\basics - - ripple\basics - ripple\basics @@ -2703,9 +2685,6 @@ ripple\ledger - - ripple\ledger\tests - ripple\ledger @@ -2832,9 +2811,6 @@ ripple\nodestore - - ripple\nodestore\tests - ripple\nodestore @@ -3603,9 +3579,6 @@ ripple\rpc - - ripple\rpc\tests - ripple\server @@ -3714,222 +3687,9 @@ ripple\shamap - - ripple\shamap\tests - ripple\shamap - - ripple\test - - - ripple\test - - - ripple\test\impl - - - ripple\test\impl - - - ripple\test\impl - - - ripple\test - - - ripple\test - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx\impl - - - ripple\test\jtx\impl - - - ripple\test\jtx\impl - - - ripple\test\jtx\impl - - - ripple\test\jtx\impl - - - ripple\test\jtx\impl - - - ripple\test\jtx\impl - - - ripple\test\jtx\impl - - - ripple\test\jtx\impl - - - ripple\test\jtx\impl - - - ripple\test\jtx\impl - - - ripple\test\jtx\impl - - - ripple\test\jtx\impl - - - ripple\test\jtx\impl - - - ripple\test\jtx\impl - - - ripple\test\jtx\impl - - - ripple\test\jtx\impl - - - ripple\test\jtx\impl - - - ripple\test\jtx\impl - - - ripple\test\jtx\impl - - - ripple\test\jtx\impl - - - ripple\test\jtx\impl - - - ripple\test\jtx\impl - - - ripple\test\jtx\impl - - - ripple\test\jtx\impl - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test\jtx - - - ripple\test - - - ripple\test\mao\impl - - - ripple\test\mao - - - ripple\test - ripple\unity @@ -4023,9 +3783,6 @@ ripple\unity - - ripple\unity - ripple\websocket @@ -5214,9 +4971,6 @@ test\app - - test - test\basics @@ -5325,9 +5079,6 @@ test\core - - test - test\json @@ -5337,6 +5088,9 @@ test\json + + test\json + test\json @@ -5373,6 +5127,9 @@ test\nodestore + + test\nodestore + test\nodestore @@ -5505,6 +5262,9 @@ test\server + + test\shamap + test\shamap @@ -5514,56 +5274,278 @@ test\shamap - - test + + test\support + + + test\support + + + test\support - - unity + + test\support - - unity + + test\support\impl - - unity + + test\support\impl - - unity + + test\support\impl - - unity + + 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 - - unity + + test\support\jtx\impl - - unity + + test\support\jtx\impl - - unity + + test\support\jtx\impl - - unity + + test\support\jtx\impl - - unity + + test\support\jtx\impl - - unity + + test\support\jtx\impl - - unity + + test\support\jtx\impl - - unity + + test\support\jtx\impl - - unity + + test\support\jtx\impl - - unity + + test\support\jtx\impl - - unity + + 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 + + + test\unity + + + test\unity + + + test\unity + + + test\unity + + + test\unity + + + test\unity + + + test\unity + + + test\unity + + + test\unity + + + test\unity + + + test\unity + + + test\unity + + + test\unity + + + test\unity + + + test\unity diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a48d69e9..89780725d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -195,11 +195,10 @@ json.cpp protocol.cpp rpcx.cpp shamap.cpp -server.cpp -test.cpp) +server.cpp) prepend(test_unity_srcs -src/unity/ +src/test/unity/ app_test_unity.cpp basics_test_unity.cpp beast_test_unity.cpp @@ -214,11 +213,11 @@ resource_test_unity.cpp rpc_test_unity.cpp server_test_unity.cpp shamap_test_unity.cpp -test_unity.cpp) +support_unity.cpp) list(APPEND rippled_src_unity ${beast_unity_srcs} ${ripple_unity_srcs} ${test_unity_srcs}) -add_with_props(rippled_src_unity src/unity/nodestore_test_unity.cpp +add_with_props(rippled_src_unity src/test/unity/nodestore_test_unity.cpp -I"${CMAKE_SOURCE_DIR}/"src/rocksdb2/include -I"${CMAKE_SOURCE_DIR}/"src/snappy/snappy -I"${CMAKE_SOURCE_DIR}/"src/snappy/config @@ -235,7 +234,7 @@ add_with_props(rippled_src_unity src/ripple/unity/soci_ripple.cpp ${soci_extra_i list(APPEND ripple_unity_srcs ${beast_unity_srcs} ${test_unity_srcs} src/ripple/unity/nodestore.cpp src/ripple/unity/soci_ripple.cpp -src/unity/nodestore_test_unity.cpp) +src/test/unity/nodestore_test_unity.cpp) ############################################################ @@ -266,8 +265,7 @@ foreach(curdir protocol rpc server - shamap - test) + shamap) file(GLOB_RECURSE cursrcs src/ripple/${curdir}/*.cpp) list(APPEND rippled_src_nonunity "${cursrcs}") list(APPEND non_unity_srcs "${cursrcs}") @@ -284,7 +282,28 @@ add_with_props(rippled_src_nonunity "${nodestore_srcs}" list(APPEND non_unity_srcs "${nodestore_srcs}") -file(GLOB_RECURSE test_srcs src/test/*.cpp) +# unit test sources +foreach(curdir + app + basics + beast + conditions + core + json + ledger + nodestore + overlay + peerfinder + protocol + resource + rpc + server + shamap + support) + file(GLOB_RECURSE cursrcs src/test/${curdir}/*.cpp) + list(APPEND test_srcs "${cursrcs}") +endforeach() + add_with_props(rippled_src_nonunity "${test_srcs}" -I"${CMAKE_SOURCE_DIR}/"src/rocksdb2/include -I"${CMAKE_SOURCE_DIR}/"src/snappy/snappy diff --git a/SConstruct b/SConstruct index c45fe3dc0..724ec2b47 100644 --- a/SConstruct +++ b/SConstruct @@ -949,14 +949,10 @@ def get_classic_sources(toolchain): append_sources(result, *list_sources('src/ripple/rpc', '.cpp')) append_sources(result, *list_sources('src/ripple/shamap', '.cpp')) append_sources(result, *list_sources('src/ripple/server', '.cpp')) - append_sources(result, *list_sources('src/ripple/test', '.cpp')) - append_sources(result, - 'src/test/BasicNetwork_test.cpp', - 'src/test/Env_test.cpp', - 'src/test/WSClient_test.cpp') append_sources(result, *list_sources('src/test/app', '.cpp')) append_sources(result, *list_sources('src/test/basics', '.cpp')) append_sources(result, *list_sources('src/test/beast', '.cpp')) + append_sources(result, *list_sources('src/test/conditions', '.cpp')) append_sources(result, *list_sources('src/test/core', '.cpp')) append_sources(result, *list_sources('src/test/json', '.cpp')) append_sources(result, *list_sources('src/test/ledger', '.cpp')) @@ -967,6 +963,8 @@ 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')) + if use_shp(toolchain): cc_flags = {'CCFLAGS': ['--system-header-prefix=rocksdb2']} @@ -1013,22 +1011,21 @@ def get_unity_sources(toolchain): 'src/ripple/unity/rpcx.cpp', 'src/ripple/unity/shamap.cpp', 'src/ripple/unity/server.cpp', - 'src/ripple/unity/test.cpp', - 'src/unity/app_test_unity.cpp', - 'src/unity/basics_test_unity.cpp', - 'src/unity/beast_test_unity.cpp', - 'src/unity/core_test_unity.cpp', - 'src/unity/conditions_test_unity.cpp', - 'src/unity/json_test_unity.cpp', - 'src/unity/ledger_test_unity.cpp', - 'src/unity/overlay_test_unity.cpp', - 'src/unity/peerfinder_test_unity.cpp', - 'src/unity/protocol_test_unity.cpp', - 'src/unity/resource_test_unity.cpp', - 'src/unity/rpc_test_unity.cpp', - 'src/unity/server_test_unity.cpp', - 'src/unity/shamap_test_unity.cpp', - 'src/unity/test_unity.cpp' + 'src/test/unity/app_test_unity.cpp', + 'src/test/unity/basics_test_unity.cpp', + 'src/test/unity/beast_test_unity.cpp', + 'src/test/unity/core_test_unity.cpp', + 'src/test/unity/conditions_test_unity.cpp', + 'src/test/unity/json_test_unity.cpp', + 'src/test/unity/ledger_test_unity.cpp', + 'src/test/unity/overlay_test_unity.cpp', + 'src/test/unity/peerfinder_test_unity.cpp', + 'src/test/unity/protocol_test_unity.cpp', + 'src/test/unity/resource_test_unity.cpp', + 'src/test/unity/rpc_test_unity.cpp', + 'src/test/unity/server_test_unity.cpp', + 'src/test/unity/shamap_test_unity.cpp', + 'src/test/unity/support_unity.cpp' ) if use_shp(toolchain): @@ -1039,7 +1036,7 @@ def get_unity_sources(toolchain): append_sources( result, 'src/ripple/unity/nodestore.cpp', - 'src/unity/nodestore_test_unity.cpp', + 'src/test/unity/nodestore_test_unity.cpp', CPPPATH=[ 'src/rocksdb2/include', 'src/snappy/snappy', @@ -1274,10 +1271,10 @@ def do_count(target, source, env): path = os.path.join(parent, path) r = os.path.splitext(path) if r[1] in suffixes: - if r[0].endswith('.test'): + if r[0].endswith('_test'): yield os.path.normpath(path) return list(_iter(base)) - testfiles = list_testfiles(os.path.join('src', 'ripple'), env.get('CPPSUFFIXES')) + testfiles = list_testfiles(os.path.join('src', 'test'), env.get('CPPSUFFIXES')) lines = 0 for f in testfiles: lines = lines + sum(1 for line in open(f)) diff --git a/bin/ci/ubuntu/build-and-test.sh b/bin/ci/ubuntu/build-and-test.sh index ab101260d..09e69bed6 100755 --- a/bin/ci/ubuntu/build-and-test.sh +++ b/bin/ci/ubuntu/build-and-test.sh @@ -46,8 +46,8 @@ if [[ ${APP} == "rippled" ]]; then export APP_ARGS="--unittest" # Only report on src/ripple files export LCOV_FILES="*/src/ripple/*" - # Exclude */src/ripple/test directory - export LCOV_EXCLUDE_FILES="*/src/ripple/test/*" + # Nothing to explicitly exclude + export LCOV_EXCLUDE_FILES="LCOV_NO_EXCLUDE" else : ${APP_ARGS:=} : ${LCOV_FILES:="*/src/*"} diff --git a/src/ripple/app/ledger/Ledger.cpp b/src/ripple/app/ledger/Ledger.cpp index f97a7da6f..ba921ecea 100644 --- a/src/ripple/app/ledger/Ledger.cpp +++ b/src/ripple/app/ledger/Ledger.cpp @@ -48,7 +48,6 @@ #include #include #include -#include #include #include #include diff --git a/src/ripple/app/main/Main.cpp b/src/ripple/app/main/Main.cpp index 647dad504..6ad534b40 100644 --- a/src/ripple/app/main/Main.cpp +++ b/src/ripple/app/main/Main.cpp @@ -38,9 +38,11 @@ #include #include #include -#include #include #include +#include +#include +#include #include #include #include diff --git a/src/ripple/basics/impl/CheckLibraryVersions.cpp b/src/ripple/basics/impl/CheckLibraryVersions.cpp index 5009ccdfd..b4268ba78 100644 --- a/src/ripple/basics/impl/CheckLibraryVersions.cpp +++ b/src/ripple/basics/impl/CheckLibraryVersions.cpp @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/src/ripple/basics/impl/RangeSet.cpp b/src/ripple/basics/impl/RangeSet.cpp index ffd3bdd85..ed13d5349 100644 --- a/src/ripple/basics/impl/RangeSet.cpp +++ b/src/ripple/basics/impl/RangeSet.cpp @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/src/ripple/basics/impl/StringUtilities.cpp b/src/ripple/basics/impl/StringUtilities.cpp index 44f115fdb..6de1bb03d 100644 --- a/src/ripple/basics/impl/StringUtilities.cpp +++ b/src/ripple/basics/impl/StringUtilities.cpp @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/src/ripple/basics/impl/TestSuite.test.cpp b/src/ripple/basics/impl/TestSuite.test.cpp deleted file mode 100644 index 741680b53..000000000 --- a/src/ripple/basics/impl/TestSuite.test.cpp +++ /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. -*/ -//============================================================================== - -#include -#include - -namespace ripple { - -struct TestSuite_test : TestSuite -{ - void run() override - { - expectEquals (2, 2, "this won't get printed."); - using Vec = std::vector; - Vec v1{"hello", "world"}; - Vec v2{"hello", "world"}; - expectCollectionEquals (v1, v2, "this won't get printed."); - - // TODO(tom): how to test failure? - } -}; - -} // ripple diff --git a/src/ripple/json/impl/Writer.cpp b/src/ripple/json/impl/Writer.cpp index 9a8a47d83..5b2f1f610 100644 --- a/src/ripple/json/impl/Writer.cpp +++ b/src/ripple/json/impl/Writer.cpp @@ -20,8 +20,8 @@ #include #include #include -#include #include +#include namespace Json { diff --git a/src/ripple/protocol/impl/BuildInfo.cpp b/src/ripple/protocol/impl/BuildInfo.cpp index 23ae1f394..d5a5a8095 100644 --- a/src/ripple/protocol/impl/BuildInfo.cpp +++ b/src/ripple/protocol/impl/BuildInfo.cpp @@ -19,7 +19,6 @@ #include #include -#include #include #include diff --git a/src/ripple/protocol/impl/STTx.cpp b/src/ripple/protocol/impl/STTx.cpp index 4aea634eb..3a92127e1 100644 --- a/src/ripple/protocol/impl/STTx.cpp +++ b/src/ripple/protocol/impl/STTx.cpp @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include diff --git a/src/ripple/shamap/impl/SHAMap.cpp b/src/ripple/shamap/impl/SHAMap.cpp index c329b78d6..4a28da611 100644 --- a/src/ripple/shamap/impl/SHAMap.cpp +++ b/src/ripple/shamap/impl/SHAMap.cpp @@ -20,7 +20,6 @@ #include #include #include -#include namespace ripple { diff --git a/src/ripple/shamap/impl/SHAMapSync.cpp b/src/ripple/shamap/impl/SHAMapSync.cpp index 669d868a2..313ed9057 100644 --- a/src/ripple/shamap/impl/SHAMapSync.cpp +++ b/src/ripple/shamap/impl/SHAMapSync.cpp @@ -21,7 +21,6 @@ #include #include #include -#include namespace ripple { diff --git a/src/ripple/unity/basics.cpp b/src/ripple/unity/basics.cpp index 561a4c390..8903eb5b4 100644 --- a/src/ripple/unity/basics.cpp +++ b/src/ripple/unity/basics.cpp @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include diff --git a/src/ripple/unity/test.cpp b/src/ripple/unity/test.cpp deleted file mode 100644 index 8168d5b9c..000000000 --- a/src/ripple/unity/test.cpp +++ /dev/null @@ -1,51 +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 -#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 diff --git a/src/test/app/AccountTxPaging_test.cpp b/src/test/app/AccountTxPaging_test.cpp index 0a744deab..dc1662223 100644 --- a/src/test/app/AccountTxPaging_test.cpp +++ b/src/test/app/AccountTxPaging_test.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/test/app/CrossingLimits_test.cpp b/src/test/app/CrossingLimits_test.cpp index e33f520ad..5b1590886 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 bb74ea290..c38bef053 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 cff6c5952..470334ee2 100644 --- a/src/test/app/Discrepancy_test.cpp +++ b/src/test/app/Discrepancy_test.cpp @@ -18,8 +18,8 @@ //============================================================================== #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 0b5e49291..0f42a6d4c 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 b80ad2852..6c4b0ad33 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 8ef4c3b6b..28c092f5e 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 bed353087..53b24b9ff 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 7a5998e79..f3b5e0e3a 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 a39120390..9682f7754 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 d9b667c3c..69b3ba421 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 116783a88..c06769eb4 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 fb9b485fd..6db40a4dc 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 57ef5aba4..4374b0638 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 691037bb9..1538b3312 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 9eb3667c9..c1137a14f 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 efb348839..941590453 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 fcacba35a..6c8b157c5 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 0d40afc9a..99c45f802 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 7d0071d85..4e32c55ce 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 b5e5d46ec..01cc5bf7f 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 70f8d5930..83589f3e0 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 7b32e88bd..ce627b040 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 05f3cb504..89858bfae 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 fe44b46b5..d8d4661c5 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/Object_test.cpp b/src/test/json/Object_test.cpp index c9b5845e2..729224731 100644 --- a/src/test/json/Object_test.cpp +++ b/src/test/json/Object_test.cpp @@ -19,12 +19,12 @@ #include #include -#include +#include #include namespace Json { -class JsonObject_test : public ripple::RPC::TestOutputSuite +class JsonObject_test : public ripple::test::TestOutputSuite { void setup (std::string const& testName) { diff --git a/src/test/json/Output_test.cpp b/src/test/json/Output_test.cpp index 6d22472f1..6adf2fb24 100644 --- a/src/test/json/Output_test.cpp +++ b/src/test/json/Output_test.cpp @@ -20,11 +20,11 @@ #include #include #include -#include +#include namespace Json { -struct Output_test : ripple::RPC::TestOutputSuite +struct Output_test : ripple::test::TestOutputSuite { void runTest (std::string const& name, std::string const& valueDesc) { diff --git a/src/ripple/rpc/tests/TestOutputSuite.test.h b/src/test/json/TestOutputSuite.h similarity index 96% rename from src/ripple/rpc/tests/TestOutputSuite.test.h rename to src/test/json/TestOutputSuite.h index ef4c561ff..3efa9a8d5 100644 --- a/src/ripple/rpc/tests/TestOutputSuite.test.h +++ b/src/test/json/TestOutputSuite.h @@ -22,10 +22,10 @@ #include #include -#include +#include namespace ripple { -namespace RPC { +namespace test { class TestOutputSuite : public TestSuite { @@ -51,7 +51,7 @@ protected: } }; -} // RPC +} // test } // ripple #endif diff --git a/src/test/json/Writer_test.cpp b/src/test/json/Writer_test.cpp index 6f6f77220..80159208a 100644 --- a/src/test/json/Writer_test.cpp +++ b/src/test/json/Writer_test.cpp @@ -20,12 +20,12 @@ #include #include #include -#include +#include #include namespace Json { -class JsonWriter_test : public ripple::RPC::TestOutputSuite +class JsonWriter_test : public ripple::test::TestOutputSuite { public: void testTrivial () diff --git a/src/test/ledger/BookDirs_test.cpp b/src/test/ledger/BookDirs_test.cpp index 4decba8bc..d00af360a 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 75da640a6..2511a5cc0 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 6e1e6bc91..13171c747 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 e3e383fea..1ebab7b5c 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 b225deaef..a45ed7ece 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 78171f30d..24891dc8f 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/nodestore/Backend_test.cpp b/src/test/nodestore/Backend_test.cpp index 45f88ebf4..81fa54964 100644 --- a/src/test/nodestore/Backend_test.cpp +++ b/src/test/nodestore/Backend_test.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/test/nodestore/Basics_test.cpp b/src/test/nodestore/Basics_test.cpp index 0cdc83a3a..d361c42a3 100644 --- a/src/test/nodestore/Basics_test.cpp +++ b/src/test/nodestore/Basics_test.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include #include diff --git a/src/test/nodestore/Database_test.cpp b/src/test/nodestore/Database_test.cpp index 8c4519080..01fc86855 100644 --- a/src/test/nodestore/Database_test.cpp +++ b/src/test/nodestore/Database_test.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include #include diff --git a/src/ripple/nodestore/tests/Base.test.h b/src/test/nodestore/TestBase.h similarity index 100% rename from src/ripple/nodestore/tests/Base.test.h rename to src/test/nodestore/TestBase.h diff --git a/src/test/nodestore/Timing_test.cpp b/src/test/nodestore/Timing_test.cpp index 0b6bc02f7..d90d84707 100644 --- a/src/test/nodestore/Timing_test.cpp +++ b/src/test/nodestore/Timing_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 a7e68785e..43a0cd662 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 cd6dd8010..9230e3f59 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 7ab924529..e456b7fda 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 eb58a94a1..8120d47a0 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 2a492e2cb..7778fc053 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 40bc49254..ec82d1617 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 5dc9b4a73..f84e7eecc 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 da9890ade..9caa2f33f 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 6f9f4ccc7..b739d233b 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 763212ee5..8f1f025d6 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 e170d05a8..75a9d2bdd 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 aaad8f32b..581b74d85 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 8753321fa..73958f349 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 29b05ebc3..ca780a7cf 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 d7a725a79..fbc3b910e 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 437ad4bce..9f2e2839c 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/RobustTransaction_test.cpp b/src/test/rpc/RobustTransaction_test.cpp index b6e6c1210..7942d1c77 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 febab8e31..f1489c2d7 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 e566082cb..e2ba3370e 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 c6e1d3b1c..ebc81d14d 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/shamap/FetchPack_test.cpp b/src/test/shamap/FetchPack_test.cpp index 76f0d3099..1ae630cda 100644 --- a/src/test/shamap/FetchPack_test.cpp +++ b/src/test/shamap/FetchPack_test.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/test/shamap/SHAMapSync_test.cpp b/src/test/shamap/SHAMapSync_test.cpp index 5692b0e86..ced902fcd 100644 --- a/src/test/shamap/SHAMapSync_test.cpp +++ b/src/test/shamap/SHAMapSync_test.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/test/shamap/SHAMap_test.cpp b/src/test/shamap/SHAMap_test.cpp index 0dedd6575..bade39e3a 100644 --- a/src/test/shamap/SHAMap_test.cpp +++ b/src/test/shamap/SHAMap_test.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/ripple/shamap/tests/common.h b/src/test/shamap/common.h similarity index 100% rename from src/ripple/shamap/tests/common.h rename to src/test/shamap/common.h diff --git a/src/ripple/test/AbstractClient.h b/src/test/support/AbstractClient.h similarity index 100% rename from src/ripple/test/AbstractClient.h rename to src/test/support/AbstractClient.h diff --git a/src/ripple/test/BasicNetwork.h b/src/test/support/BasicNetwork.h similarity index 100% rename from src/ripple/test/BasicNetwork.h rename to src/test/support/BasicNetwork.h diff --git a/src/test/BasicNetwork_test.cpp b/src/test/support/BasicNetwork_test.cpp similarity index 99% rename from src/test/BasicNetwork_test.cpp rename to src/test/support/BasicNetwork_test.cpp index 823eccf14..569a80d87 100644 --- a/src/test/BasicNetwork_test.cpp +++ b/src/test/support/BasicNetwork_test.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include #include diff --git a/src/test/Env_test.cpp b/src/test/support/Env_test.cpp similarity index 99% rename from src/test/Env_test.cpp rename to src/test/support/Env_test.cpp index 6d15ff1dc..ad7a5414f 100644 --- a/src/test/Env_test.cpp +++ b/src/test/support/Env_test.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/ripple/test/JSONRPCClient.h b/src/test/support/JSONRPCClient.h similarity index 97% rename from src/ripple/test/JSONRPCClient.h rename to src/test/support/JSONRPCClient.h index e937c159c..b9165a6b4 100644 --- a/src/ripple/test/JSONRPCClient.h +++ b/src/test/support/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/ripple/test/ManualTimeKeeper.h b/src/test/support/ManualTimeKeeper.h similarity index 100% rename from src/ripple/test/ManualTimeKeeper.h rename to src/test/support/ManualTimeKeeper.h diff --git a/src/ripple/ledger/tests/PathSet.h b/src/test/support/PathSet.h similarity index 99% rename from src/ripple/ledger/tests/PathSet.h rename to src/test/support/PathSet.h index 8a9b06c02..399c5cb07 100644 --- a/src/ripple/ledger/tests/PathSet.h +++ b/src/test/support/PathSet.h @@ -22,7 +22,7 @@ #include #include -#include +#include namespace ripple { namespace test { diff --git a/src/ripple/basics/TestSuite.h b/src/test/support/TestSuite.h similarity index 100% rename from src/ripple/basics/TestSuite.h rename to src/test/support/TestSuite.h diff --git a/src/ripple/test/WSClient.h b/src/test/support/WSClient.h similarity index 97% rename from src/ripple/test/WSClient.h rename to src/test/support/WSClient.h index c00de5fd8..a870a5ce2 100644 --- a/src/ripple/test/WSClient.h +++ b/src/test/support/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/WSClient_test.cpp b/src/test/support/WSClient_test.cpp similarity index 96% rename from src/test/WSClient_test.cpp rename to src/test/support/WSClient_test.cpp index 5c8fdc057..eeb4e9533 100644 --- a/src/test/WSClient_test.cpp +++ b/src/test/support/WSClient_test.cpp @@ -18,8 +18,8 @@ //============================================================================== #include -#include -#include +#include +#include #include #include diff --git a/src/ripple/test/impl/JSONRPCClient.cpp b/src/test/support/impl/JSONRPCClient.cpp similarity index 99% rename from src/ripple/test/impl/JSONRPCClient.cpp rename to src/test/support/impl/JSONRPCClient.cpp index fefc30b58..ad39587ea 100644 --- a/src/ripple/test/impl/JSONRPCClient.cpp +++ b/src/test/support/impl/JSONRPCClient.cpp @@ -17,7 +17,7 @@ */ //============================================================================== #include -#include +#include #include #include #include diff --git a/src/ripple/test/impl/ManualTimeKeeper.cpp b/src/test/support/impl/ManualTimeKeeper.cpp similarity index 98% rename from src/ripple/test/impl/ManualTimeKeeper.cpp rename to src/test/support/impl/ManualTimeKeeper.cpp index 01430c775..0a2e888a5 100644 --- a/src/ripple/test/impl/ManualTimeKeeper.cpp +++ b/src/test/support/impl/ManualTimeKeeper.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include namespace ripple { namespace test { diff --git a/src/ripple/test/impl/WSClient.cpp b/src/test/support/impl/WSClient.cpp similarity index 99% rename from src/ripple/test/impl/WSClient.cpp rename to src/test/support/impl/WSClient.cpp index e0375096f..45592c560 100644 --- a/src/ripple/test/impl/WSClient.cpp +++ b/src/test/support/impl/WSClient.cpp @@ -18,8 +18,8 @@ //============================================================================== #include -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/test/jtx.h b/src/test/support/jtx.h similarity index 50% rename from src/ripple/test/jtx.h rename to src/test/support/jtx.h index 24766929c..05bae57aa 100644 --- a/src/ripple/test/jtx.h +++ b/src/test/support/jtx.h @@ -23,38 +23,38 @@ // 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 +#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/ripple/test/jtx/Account.h b/src/test/support/jtx/Account.h similarity index 100% rename from src/ripple/test/jtx/Account.h rename to src/test/support/jtx/Account.h diff --git a/src/ripple/test/jtx/Env.h b/src/test/support/jtx/Env.h similarity index 98% rename from src/ripple/test/jtx/Env.h rename to src/test/support/jtx/Env.h index 68072ae61..ea682642b 100644 --- a/src/ripple/test/jtx/Env.h +++ b/src/test/support/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/ripple/test/jtx/Env_ss.h b/src/test/support/jtx/Env_ss.h similarity index 98% rename from src/ripple/test/jtx/Env_ss.h rename to src/test/support/jtx/Env_ss.h index 80ede0daf..b98bc219f 100644 --- a/src/ripple/test/jtx/Env_ss.h +++ b/src/test/support/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/ripple/test/jtx/JTx.h b/src/test/support/jtx/JTx.h similarity index 98% rename from src/ripple/test/jtx/JTx.h rename to src/test/support/jtx/JTx.h index ea1dde02e..490d78a8a 100644 --- a/src/ripple/test/jtx/JTx.h +++ b/src/test/support/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/ripple/test/jtx/amount.h b/src/test/support/jtx/amount.h similarity index 98% rename from src/ripple/test/jtx/amount.h rename to src/test/support/jtx/amount.h index 807dc415d..11802a852 100644 --- a/src/ripple/test/jtx/amount.h +++ b/src/test/support/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/ripple/test/jtx/balance.h b/src/test/support/jtx/balance.h similarity index 96% rename from src/ripple/test/jtx/balance.h rename to src/test/support/jtx/balance.h index 37457b98a..be21299c6 100644 --- a/src/ripple/test/jtx/balance.h +++ b/src/test/support/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/ripple/test/jtx/basic_prop.h b/src/test/support/jtx/basic_prop.h similarity index 100% rename from src/ripple/test/jtx/basic_prop.h rename to src/test/support/jtx/basic_prop.h diff --git a/src/ripple/test/jtx/delivermin.h b/src/test/support/jtx/delivermin.h similarity index 97% rename from src/ripple/test/jtx/delivermin.h rename to src/test/support/jtx/delivermin.h index 7b2d609a2..7abdd7d4c 100644 --- a/src/ripple/test/jtx/delivermin.h +++ b/src/test/support/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/ripple/test/jtx/fee.h b/src/test/support/jtx/fee.h similarity index 96% rename from src/ripple/test/jtx/fee.h rename to src/test/support/jtx/fee.h index 5a6a09e36..c07f8898b 100644 --- a/src/ripple/test/jtx/fee.h +++ b/src/test/support/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/ripple/test/jtx/flags.h b/src/test/support/jtx/flags.h similarity index 99% rename from src/ripple/test/jtx/flags.h rename to src/test/support/jtx/flags.h index 2bf5b8e44..b91570a16 100644 --- a/src/ripple/test/jtx/flags.h +++ b/src/test/support/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/ripple/test/jtx/impl/Account.cpp b/src/test/support/jtx/impl/Account.cpp similarity index 97% rename from src/ripple/test/jtx/impl/Account.cpp rename to src/test/support/jtx/impl/Account.cpp index c315d98fc..8ec9efec1 100644 --- a/src/ripple/test/jtx/impl/Account.cpp +++ b/src/test/support/jtx/impl/Account.cpp @@ -18,8 +18,8 @@ //============================================================================== #include -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/test/jtx/impl/Env.cpp b/src/test/support/jtx/impl/Env.cpp similarity index 97% rename from src/ripple/test/jtx/impl/Env.cpp rename to src/test/support/jtx/impl/Env.cpp index 8a11969a2..5a87be6d5 100644 --- a/src/ripple/test/jtx/impl/Env.cpp +++ b/src/test/support/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/ripple/test/jtx/impl/amount.cpp b/src/test/support/jtx/impl/amount.cpp similarity index 97% rename from src/ripple/test/jtx/impl/amount.cpp rename to src/test/support/jtx/impl/amount.cpp index a18eb652f..51768e401 100644 --- a/src/ripple/test/jtx/impl/amount.cpp +++ b/src/test/support/jtx/impl/amount.cpp @@ -18,8 +18,8 @@ //============================================================================== #include -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/test/jtx/impl/balance.cpp b/src/test/support/jtx/impl/balance.cpp similarity index 98% rename from src/ripple/test/jtx/impl/balance.cpp rename to src/test/support/jtx/impl/balance.cpp index b4c06a476..783d22923 100644 --- a/src/ripple/test/jtx/impl/balance.cpp +++ b/src/test/support/jtx/impl/balance.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include namespace ripple { namespace test { diff --git a/src/ripple/test/jtx/impl/delivermin.cpp b/src/test/support/jtx/impl/delivermin.cpp similarity index 96% rename from src/ripple/test/jtx/impl/delivermin.cpp rename to src/test/support/jtx/impl/delivermin.cpp index bbcb46cb5..31ddb0062 100644 --- a/src/ripple/test/jtx/impl/delivermin.cpp +++ b/src/test/support/jtx/impl/delivermin.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/ripple/test/jtx/impl/fee.cpp b/src/test/support/jtx/impl/fee.cpp similarity index 97% rename from src/ripple/test/jtx/impl/fee.cpp rename to src/test/support/jtx/impl/fee.cpp index f83da0072..1aae18be6 100644 --- a/src/ripple/test/jtx/impl/fee.cpp +++ b/src/test/support/jtx/impl/fee.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/ripple/test/jtx/impl/flags.cpp b/src/test/support/jtx/impl/flags.cpp similarity index 98% rename from src/ripple/test/jtx/impl/flags.cpp rename to src/test/support/jtx/impl/flags.cpp index 941ec6db0..0e028ec5c 100644 --- a/src/ripple/test/jtx/impl/flags.cpp +++ b/src/test/support/jtx/impl/flags.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/ripple/test/jtx/impl/jtx_json.cpp b/src/test/support/jtx/impl/jtx_json.cpp similarity index 95% rename from src/ripple/test/jtx/impl/jtx_json.cpp rename to src/test/support/jtx/impl/jtx_json.cpp index 26ea0e33a..7848fd58e 100644 --- a/src/ripple/test/jtx/impl/jtx_json.cpp +++ b/src/test/support/jtx/impl/jtx_json.cpp @@ -18,8 +18,8 @@ //============================================================================== #include -#include -#include +#include +#include #include #include diff --git a/src/ripple/test/jtx/impl/memo.cpp b/src/test/support/jtx/impl/memo.cpp similarity index 98% rename from src/ripple/test/jtx/impl/memo.cpp rename to src/test/support/jtx/impl/memo.cpp index 74e6c93b8..617c65199 100644 --- a/src/ripple/test/jtx/impl/memo.cpp +++ b/src/test/support/jtx/impl/memo.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include diff --git a/src/ripple/test/jtx/impl/multisign.cpp b/src/test/support/jtx/impl/multisign.cpp similarity index 97% rename from src/ripple/test/jtx/impl/multisign.cpp rename to src/test/support/jtx/impl/multisign.cpp index a63a9ee19..4cc478d9d 100644 --- a/src/ripple/test/jtx/impl/multisign.cpp +++ b/src/test/support/jtx/impl/multisign.cpp @@ -18,8 +18,8 @@ //============================================================================== #include -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/test/jtx/impl/offer.cpp b/src/test/support/jtx/impl/offer.cpp similarity index 97% rename from src/ripple/test/jtx/impl/offer.cpp rename to src/test/support/jtx/impl/offer.cpp index d9cab03a9..8f8a6a4f4 100644 --- a/src/ripple/test/jtx/impl/offer.cpp +++ b/src/test/support/jtx/impl/offer.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/ripple/test/jtx/impl/owners.cpp b/src/test/support/jtx/impl/owners.cpp similarity index 98% rename from src/ripple/test/jtx/impl/owners.cpp rename to src/test/support/jtx/impl/owners.cpp index 6bb4a899f..83a7bfaef 100644 --- a/src/ripple/test/jtx/impl/owners.cpp +++ b/src/test/support/jtx/impl/owners.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include namespace ripple { namespace test { diff --git a/src/ripple/test/jtx/impl/paths.cpp b/src/test/support/jtx/impl/paths.cpp similarity index 98% rename from src/ripple/test/jtx/impl/paths.cpp rename to src/test/support/jtx/impl/paths.cpp index 90efdc028..888054dc2 100644 --- a/src/ripple/test/jtx/impl/paths.cpp +++ b/src/test/support/jtx/impl/paths.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include namespace ripple { diff --git a/src/ripple/test/jtx/impl/pay.cpp b/src/test/support/jtx/impl/pay.cpp similarity index 97% rename from src/ripple/test/jtx/impl/pay.cpp rename to src/test/support/jtx/impl/pay.cpp index f4689f3b6..396aab7b4 100644 --- a/src/ripple/test/jtx/impl/pay.cpp +++ b/src/test/support/jtx/impl/pay.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include diff --git a/src/ripple/test/jtx/impl/quality2.cpp b/src/test/support/jtx/impl/quality2.cpp similarity index 98% rename from src/ripple/test/jtx/impl/quality2.cpp rename to src/test/support/jtx/impl/quality2.cpp index 3d0e634a2..97fd979fd 100644 --- a/src/ripple/test/jtx/impl/quality2.cpp +++ b/src/test/support/jtx/impl/quality2.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include diff --git a/src/ripple/test/jtx/impl/rate.cpp b/src/test/support/jtx/impl/rate.cpp similarity index 97% rename from src/ripple/test/jtx/impl/rate.cpp rename to src/test/support/jtx/impl/rate.cpp index d931772ee..f00c7e739 100644 --- a/src/ripple/test/jtx/impl/rate.cpp +++ b/src/test/support/jtx/impl/rate.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include #include diff --git a/src/ripple/test/jtx/impl/regkey.cpp b/src/test/support/jtx/impl/regkey.cpp similarity index 97% rename from src/ripple/test/jtx/impl/regkey.cpp rename to src/test/support/jtx/impl/regkey.cpp index 9ccffea3c..306eb1cf9 100644 --- a/src/ripple/test/jtx/impl/regkey.cpp +++ b/src/test/support/jtx/impl/regkey.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/ripple/test/jtx/impl/sendmax.cpp b/src/test/support/jtx/impl/sendmax.cpp similarity index 97% rename from src/ripple/test/jtx/impl/sendmax.cpp rename to src/test/support/jtx/impl/sendmax.cpp index c680dcaa1..f2cd22f65 100644 --- a/src/ripple/test/jtx/impl/sendmax.cpp +++ b/src/test/support/jtx/impl/sendmax.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/ripple/test/jtx/impl/seq.cpp b/src/test/support/jtx/impl/seq.cpp similarity index 97% rename from src/ripple/test/jtx/impl/seq.cpp rename to src/test/support/jtx/impl/seq.cpp index f5a4f0ec1..4722c4e07 100644 --- a/src/ripple/test/jtx/impl/seq.cpp +++ b/src/test/support/jtx/impl/seq.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/ripple/test/jtx/impl/sig.cpp b/src/test/support/jtx/impl/sig.cpp similarity index 95% rename from src/ripple/test/jtx/impl/sig.cpp rename to src/test/support/jtx/impl/sig.cpp index c0e5a088f..b1a16569e 100644 --- a/src/ripple/test/jtx/impl/sig.cpp +++ b/src/test/support/jtx/impl/sig.cpp @@ -18,8 +18,8 @@ //============================================================================== #include -#include -#include +#include +#include namespace ripple { namespace test { diff --git a/src/ripple/test/jtx/impl/tag.cpp b/src/test/support/jtx/impl/tag.cpp similarity index 97% rename from src/ripple/test/jtx/impl/tag.cpp rename to src/test/support/jtx/impl/tag.cpp index d7260db8e..238e80439 100644 --- a/src/ripple/test/jtx/impl/tag.cpp +++ b/src/test/support/jtx/impl/tag.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/ripple/test/jtx/impl/ticket.cpp b/src/test/support/jtx/impl/ticket.cpp similarity index 98% rename from src/ripple/test/jtx/impl/ticket.cpp rename to src/test/support/jtx/impl/ticket.cpp index d080bd695..a1b1fe5d3 100644 --- a/src/ripple/test/jtx/impl/ticket.cpp +++ b/src/test/support/jtx/impl/ticket.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/ripple/test/jtx/impl/trust.cpp b/src/test/support/jtx/impl/trust.cpp similarity index 98% rename from src/ripple/test/jtx/impl/trust.cpp rename to src/test/support/jtx/impl/trust.cpp index 81c173ab7..e72167bf8 100644 --- a/src/ripple/test/jtx/impl/trust.cpp +++ b/src/test/support/jtx/impl/trust.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include #include diff --git a/src/ripple/test/jtx/impl/txflags.cpp b/src/test/support/jtx/impl/txflags.cpp similarity index 97% rename from src/ripple/test/jtx/impl/txflags.cpp rename to src/test/support/jtx/impl/txflags.cpp index 260fd1a47..531d77571 100644 --- a/src/ripple/test/jtx/impl/txflags.cpp +++ b/src/test/support/jtx/impl/txflags.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/ripple/test/jtx/impl/utility.cpp b/src/test/support/jtx/impl/utility.cpp similarity index 98% rename from src/ripple/test/jtx/impl/utility.cpp rename to src/test/support/jtx/impl/utility.cpp index 784a5d173..0c2108b2d 100644 --- a/src/ripple/test/jtx/impl/utility.cpp +++ b/src/test/support/jtx/impl/utility.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include #include #include diff --git a/src/ripple/test/jtx/jtx_json.h b/src/test/support/jtx/jtx_json.h similarity index 98% rename from src/ripple/test/jtx/jtx_json.h rename to src/test/support/jtx/jtx_json.h index df246a085..c9c0e6928 100644 --- a/src/ripple/test/jtx/jtx_json.h +++ b/src/test/support/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/ripple/test/jtx/memo.h b/src/test/support/jtx/memo.h similarity index 98% rename from src/ripple/test/jtx/memo.h rename to src/test/support/jtx/memo.h index 21360c41a..08d006ce8 100644 --- a/src/ripple/test/jtx/memo.h +++ b/src/test/support/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/ripple/test/jtx/multisign.h b/src/test/support/jtx/multisign.h similarity index 96% rename from src/ripple/test/jtx/multisign.h rename to src/test/support/jtx/multisign.h index 5eee558c6..6971882d2 100644 --- a/src/ripple/test/jtx/multisign.h +++ b/src/test/support/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/ripple/test/jtx/noop.h b/src/test/support/jtx/noop.h similarity index 97% rename from src/ripple/test/jtx/noop.h rename to src/test/support/jtx/noop.h index 0819ce5f3..9921bdb4a 100644 --- a/src/ripple/test/jtx/noop.h +++ b/src/test/support/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/ripple/test/jtx/offer.h b/src/test/support/jtx/offer.h similarity index 97% rename from src/ripple/test/jtx/offer.h rename to src/test/support/jtx/offer.h index a0faac1c9..dc1909913 100644 --- a/src/ripple/test/jtx/offer.h +++ b/src/test/support/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/ripple/test/jtx/owners.h b/src/test/support/jtx/owners.h similarity index 98% rename from src/ripple/test/jtx/owners.h rename to src/test/support/jtx/owners.h index a6ec061f0..6409b7589 100644 --- a/src/ripple/test/jtx/owners.h +++ b/src/test/support/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/ripple/test/jtx/paths.h b/src/test/support/jtx/paths.h similarity index 98% rename from src/ripple/test/jtx/paths.h rename to src/test/support/jtx/paths.h index d4873f5a9..1ad8f80e7 100644 --- a/src/ripple/test/jtx/paths.h +++ b/src/test/support/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/ripple/test/jtx/pay.h b/src/test/support/jtx/pay.h similarity index 94% rename from src/ripple/test/jtx/pay.h rename to src/test/support/jtx/pay.h index 467c0a547..e023983b4 100644 --- a/src/ripple/test/jtx/pay.h +++ b/src/test/support/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/ripple/test/jtx/prop.h b/src/test/support/jtx/prop.h similarity index 97% rename from src/ripple/test/jtx/prop.h rename to src/test/support/jtx/prop.h index f3b4f6cf4..5600c99d6 100644 --- a/src/ripple/test/jtx/prop.h +++ b/src/test/support/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/ripple/test/jtx/quality.h b/src/test/support/jtx/quality.h similarity index 98% rename from src/ripple/test/jtx/quality.h rename to src/test/support/jtx/quality.h index 562e5933c..6e1b03898 100644 --- a/src/ripple/test/jtx/quality.h +++ b/src/test/support/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/ripple/test/jtx/rate.h b/src/test/support/jtx/rate.h similarity index 97% rename from src/ripple/test/jtx/rate.h rename to src/test/support/jtx/rate.h index 62a9c08d8..c240b7b8c 100644 --- a/src/ripple/test/jtx/rate.h +++ b/src/test/support/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/ripple/test/jtx/regkey.h b/src/test/support/jtx/regkey.h similarity index 95% rename from src/ripple/test/jtx/regkey.h rename to src/test/support/jtx/regkey.h index d281bf75a..dff40e1f3 100644 --- a/src/ripple/test/jtx/regkey.h +++ b/src/test/support/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/ripple/test/jtx/require.h b/src/test/support/jtx/require.h similarity index 98% rename from src/ripple/test/jtx/require.h rename to src/test/support/jtx/require.h index c20a88b74..bdebd5051 100644 --- a/src/ripple/test/jtx/require.h +++ b/src/test/support/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/ripple/test/jtx/requires.h b/src/test/support/jtx/requires.h similarity index 100% rename from src/ripple/test/jtx/requires.h rename to src/test/support/jtx/requires.h diff --git a/src/ripple/test/jtx/sendmax.h b/src/test/support/jtx/sendmax.h similarity index 97% rename from src/ripple/test/jtx/sendmax.h rename to src/test/support/jtx/sendmax.h index 083e9f8b6..daf7d4fea 100644 --- a/src/ripple/test/jtx/sendmax.h +++ b/src/test/support/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/ripple/test/jtx/seq.h b/src/test/support/jtx/seq.h similarity index 95% rename from src/ripple/test/jtx/seq.h rename to src/test/support/jtx/seq.h index 034cf071d..d6b1fe8e9 100644 --- a/src/ripple/test/jtx/seq.h +++ b/src/test/support/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/ripple/test/jtx/sig.h b/src/test/support/jtx/sig.h similarity index 98% rename from src/ripple/test/jtx/sig.h rename to src/test/support/jtx/sig.h index 1465e3b78..8a3328552 100644 --- a/src/ripple/test/jtx/sig.h +++ b/src/test/support/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/ripple/test/jtx/tag.h b/src/test/support/jtx/tag.h similarity index 98% rename from src/ripple/test/jtx/tag.h rename to src/test/support/jtx/tag.h index e8f2d93d3..6373d0ad4 100644 --- a/src/ripple/test/jtx/tag.h +++ b/src/test/support/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/ripple/test/jtx/tags.h b/src/test/support/jtx/tags.h similarity index 100% rename from src/ripple/test/jtx/tags.h rename to src/test/support/jtx/tags.h diff --git a/src/ripple/test/jtx/ter.h b/src/test/support/jtx/ter.h similarity index 97% rename from src/ripple/test/jtx/ter.h rename to src/test/support/jtx/ter.h index 07ed77384..0e5d1ff09 100644 --- a/src/ripple/test/jtx/ter.h +++ b/src/test/support/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/ripple/test/jtx/ticket.h b/src/test/support/jtx/ticket.h similarity index 96% rename from src/ripple/test/jtx/ticket.h rename to src/test/support/jtx/ticket.h index 1aea80dd6..b38fa5bda 100644 --- a/src/ripple/test/jtx/ticket.h +++ b/src/test/support/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/ripple/test/jtx/trust.h b/src/test/support/jtx/trust.h similarity index 97% rename from src/ripple/test/jtx/trust.h rename to src/test/support/jtx/trust.h index 7f7d69b3e..9e0c9cfe5 100644 --- a/src/ripple/test/jtx/trust.h +++ b/src/test/support/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/ripple/test/jtx/txflags.h b/src/test/support/jtx/txflags.h similarity index 97% rename from src/ripple/test/jtx/txflags.h rename to src/test/support/jtx/txflags.h index 5e56e42ab..63992da3f 100644 --- a/src/ripple/test/jtx/txflags.h +++ b/src/test/support/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/ripple/test/jtx/utility.h b/src/test/support/jtx/utility.h similarity index 98% rename from src/ripple/test/jtx/utility.h rename to src/test/support/jtx/utility.h index f97037c6d..a01aace43 100644 --- a/src/ripple/test/jtx/utility.h +++ b/src/test/support/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/ripple/test/mao.h b/src/test/support/mao.h similarity index 97% rename from src/ripple/test/mao.h rename to src/test/support/mao.h index c344baab1..7d719af20 100644 --- a/src/ripple/test/mao.h +++ b/src/test/support/mao.h @@ -22,6 +22,6 @@ // Convenience header that includes everything -#include +#include #endif diff --git a/src/ripple/test/mao/Net.h b/src/test/support/mao/Net.h similarity index 100% rename from src/ripple/test/mao/Net.h rename to src/test/support/mao/Net.h diff --git a/src/ripple/test/mao/impl/Net.cpp b/src/test/support/mao/impl/Net.cpp similarity index 97% rename from src/ripple/test/mao/impl/Net.cpp rename to src/test/support/mao/impl/Net.cpp index 957266ded..6c2ed7286 100644 --- a/src/ripple/test/mao/impl/Net.cpp +++ b/src/test/support/mao/impl/Net.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include namespace ripple { namespace test { diff --git a/src/unity/app_test_unity.cpp b/src/test/unity/app_test_unity.cpp similarity index 100% rename from src/unity/app_test_unity.cpp rename to src/test/unity/app_test_unity.cpp diff --git a/src/unity/basics_test_unity.cpp b/src/test/unity/basics_test_unity.cpp similarity index 100% rename from src/unity/basics_test_unity.cpp rename to src/test/unity/basics_test_unity.cpp diff --git a/src/unity/beast_test_unity.cpp b/src/test/unity/beast_test_unity.cpp similarity index 100% rename from src/unity/beast_test_unity.cpp rename to src/test/unity/beast_test_unity.cpp diff --git a/src/unity/conditions_test_unity.cpp b/src/test/unity/conditions_test_unity.cpp similarity index 100% rename from src/unity/conditions_test_unity.cpp rename to src/test/unity/conditions_test_unity.cpp diff --git a/src/unity/core_test_unity.cpp b/src/test/unity/core_test_unity.cpp similarity index 100% rename from src/unity/core_test_unity.cpp rename to src/test/unity/core_test_unity.cpp diff --git a/src/unity/json_test_unity.cpp b/src/test/unity/json_test_unity.cpp similarity index 100% rename from src/unity/json_test_unity.cpp rename to src/test/unity/json_test_unity.cpp diff --git a/src/unity/ledger_test_unity.cpp b/src/test/unity/ledger_test_unity.cpp similarity index 100% rename from src/unity/ledger_test_unity.cpp rename to src/test/unity/ledger_test_unity.cpp diff --git a/src/unity/nodestore_test_unity.cpp b/src/test/unity/nodestore_test_unity.cpp similarity index 100% rename from src/unity/nodestore_test_unity.cpp rename to src/test/unity/nodestore_test_unity.cpp diff --git a/src/unity/overlay_test_unity.cpp b/src/test/unity/overlay_test_unity.cpp similarity index 100% rename from src/unity/overlay_test_unity.cpp rename to src/test/unity/overlay_test_unity.cpp diff --git a/src/unity/peerfinder_test_unity.cpp b/src/test/unity/peerfinder_test_unity.cpp similarity index 100% rename from src/unity/peerfinder_test_unity.cpp rename to src/test/unity/peerfinder_test_unity.cpp diff --git a/src/unity/protocol_test_unity.cpp b/src/test/unity/protocol_test_unity.cpp similarity index 100% rename from src/unity/protocol_test_unity.cpp rename to src/test/unity/protocol_test_unity.cpp diff --git a/src/unity/resource_test_unity.cpp b/src/test/unity/resource_test_unity.cpp similarity index 100% rename from src/unity/resource_test_unity.cpp rename to src/test/unity/resource_test_unity.cpp diff --git a/src/unity/rpc_test_unity.cpp b/src/test/unity/rpc_test_unity.cpp similarity index 100% rename from src/unity/rpc_test_unity.cpp rename to src/test/unity/rpc_test_unity.cpp diff --git a/src/unity/server_test_unity.cpp b/src/test/unity/server_test_unity.cpp similarity index 100% rename from src/unity/server_test_unity.cpp rename to src/test/unity/server_test_unity.cpp diff --git a/src/unity/shamap_test_unity.cpp b/src/test/unity/shamap_test_unity.cpp similarity index 100% rename from src/unity/shamap_test_unity.cpp rename to src/test/unity/shamap_test_unity.cpp diff --git a/src/test/unity/support_unity.cpp b/src/test/unity/support_unity.cpp new file mode 100644 index 000000000..63433a7ee --- /dev/null +++ b/src/test/unity/support_unity.cpp @@ -0,0 +1,55 @@ +//------------------------------------------------------------------------------ +/* + 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 +#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 diff --git a/src/unity/test_unity.cpp b/src/unity/test_unity.cpp deleted file mode 100644 index a6ee71399..000000000 --- a/src/unity/test_unity.cpp +++ /dev/null @@ -1,22 +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 -#include