Move support test code to src/test/support (RIPD-1313)

XRPLF · Dec 24, 2016 · b6a01ea · b6a01ea
1 parent 8425e45
commit b6a01ea
Show file tree

Hide file tree

Showing 175 changed files with 851 additions and 921 deletions.
diff --git a/Builds/VisualStudio2015/RippleD.vcxproj b/Builds/VisualStudio2015/RippleD.vcxproj
diff --git a/Builds/VisualStudio2015/RippleD.vcxproj.filters b/Builds/VisualStudio2015/RippleD.vcxproj.filters
diff --git 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
@@ -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
@@ -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
@@ -48,7 +48,6 @@
 #include <ripple/protocol/HashPrefix.h>
 #include <ripple/protocol/types.h>
 #include <ripple/beast/core/LexicalCast.h>
-#include <ripple/beast/unit_test.h>
 #include <boost/optional.hpp>
 #include <cassert>
 #include <utility>

diff --git a/src/ripple/app/main/Main.cpp b/src/ripple/app/main/Main.cpp
@@ -38,9 +38,11 @@
 #include <ripple/protocol/BuildInfo.h>
 #include <ripple/beast/clock/basic_seconds_clock.h>
 #include <ripple/beast/core/Time.h>
-#include <ripple/beast/unit_test.h>
 #include <ripple/beast/utility/Debug.h>
 #include <beast/unit_test/dstream.hpp>
+#include <beast/unit_test/global_suites.hpp>
+#include <beast/unit_test/match.hpp>
+#include <beast/unit_test/reporter.hpp>
 #include <google/protobuf/stubs/common.h>
 #include <boost/program_options.hpp>
 #include <cstdlib>

diff --git a/src/ripple/basics/impl/CheckLibraryVersions.cpp b/src/ripple/basics/impl/CheckLibraryVersions.cpp
@@ -20,7 +20,6 @@
 #include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/basics/impl/CheckLibraryVersionsImpl.h>
-#include <ripple/beast/unit_test.h>
 #include <ripple/beast/core/SemanticVersion.h>
 #include <boost/version.hpp>
 #include <openssl/opensslv.h>

diff --git a/src/ripple/basics/impl/RangeSet.cpp b/src/ripple/basics/impl/RangeSet.cpp
@@ -20,7 +20,6 @@
 #include <BeastConfig.h>
 #include <ripple/basics/Log.h>
 #include <ripple/basics/RangeSet.h>
-#include <ripple/beast/unit_test.h>
 #include <ripple/beast/core/LexicalCast.h>
 #include <boost/foreach.hpp>
 #include <cassert>

diff --git a/src/ripple/basics/impl/StringUtilities.cpp b/src/ripple/basics/impl/StringUtilities.cpp
@@ -23,7 +23,6 @@
 #include <ripple/basics/StringUtilities.h>
 #include <ripple/basics/ToString.h>
 #include <ripple/beast/core/LexicalCast.h>
-#include <ripple/beast/unit_test.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/asio/ip/address.hpp>
 #include <boost/regex.hpp>

diff --git a/src/ripple/basics/impl/TestSuite.test.cpp b/src/ripple/basics/impl/TestSuite.test.cpp
diff --git a/src/ripple/json/impl/Writer.cpp b/src/ripple/json/impl/Writer.cpp
@@ -20,8 +20,8 @@
 #include <BeastConfig.h>
 #include <ripple/json/Output.h>
 #include <ripple/json/Writer.h>
-#include <ripple/beast/unit_test.h>
 #include <stack>
+#include <set>
 
 namespace Json {
 

diff --git a/src/ripple/protocol/impl/BuildInfo.cpp b/src/ripple/protocol/impl/BuildInfo.cpp
@@ -19,7 +19,6 @@
 
 #include <BeastConfig.h>
 #include <ripple/basics/contract.h>
-#include <ripple/beast/unit_test.h>
 #include <ripple/beast/core/SemanticVersion.h>
 #include <ripple/protocol/BuildInfo.h>
 

diff --git a/src/ripple/protocol/impl/STTx.cpp b/src/ripple/protocol/impl/STTx.cpp
@@ -32,7 +32,6 @@
 #include <ripple/basics/Log.h>
 #include <ripple/basics/StringUtilities.h>
 #include <ripple/json/to_string.h>
-#include <ripple/beast/unit_test.h>
 #include <boost/format.hpp>
 #include <array>
 #include <memory>

diff --git a/src/ripple/shamap/impl/SHAMap.cpp b/src/ripple/shamap/impl/SHAMap.cpp
@@ -20,7 +20,6 @@
 #include <BeastConfig.h>
 #include <ripple/basics/contract.h>
 #include <ripple/shamap/SHAMap.h>
-#include <ripple/beast/unit_test.h>
 
 namespace ripple {
 

diff --git a/src/ripple/shamap/impl/SHAMapSync.cpp b/src/ripple/shamap/impl/SHAMapSync.cpp
@@ -21,7 +21,6 @@
 #include <ripple/basics/random.h>
 #include <ripple/shamap/SHAMap.h>
 #include <ripple/nodestore/Database.h>
-#include <ripple/beast/unit_test.h>
 
 namespace ripple {
 

diff --git a/src/ripple/unity/basics.cpp b/src/ripple/unity/basics.cpp
@@ -31,7 +31,6 @@
 #include <ripple/basics/impl/strHex.cpp>
 #include <ripple/basics/impl/StringUtilities.cpp>
 #include <ripple/basics/impl/Sustain.cpp>
-#include <ripple/basics/impl/TestSuite.test.cpp>
 #include <ripple/basics/impl/ThreadName.cpp>
 #include <ripple/basics/impl/Time.cpp>
 #include <ripple/basics/impl/UptimeTimer.cpp>

diff --git a/src/ripple/unity/test.cpp b/src/ripple/unity/test.cpp
diff --git a/src/test/app/AccountTxPaging_test.cpp b/src/test/app/AccountTxPaging_test.cpp
@@ -19,7 +19,7 @@
 #include <ripple/core/DatabaseCon.h>
 #include <ripple/app/misc/impl/AccountTxPaging.h>
 #include <ripple/protocol/types.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/beast/unit_test.h>
 #include <cstdlib>
 #include <memory>

diff --git a/src/test/app/CrossingLimits_test.cpp b/src/test/app/CrossingLimits_test.cpp
@@ -16,7 +16,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/beast/unit_test.h>
 
 namespace ripple {

diff --git a/src/test/app/DeliverMin_test.cpp b/src/test/app/DeliverMin_test.cpp
@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx.h>
+#include <test/support/jtx.h>
 #include <ripple/beast/unit_test.h>
 
 namespace ripple {

diff --git a/src/test/app/Discrepancy_test.cpp b/src/test/app/Discrepancy_test.cpp
@@ -18,8 +18,8 @@
 //==============================================================================
 
 #include <BeastConfig.h>
-#include <ripple/test/jtx.h>
-#include <ripple/test/jtx/Env.h>
+#include <test/support/jtx.h>
+#include <test/support/jtx/Env.h>
 #include <ripple/beast/unit_test.h>
 #include <ripple/beast/core/LexicalCast.h>
 #include <ripple/protocol/JsonFields.h>