From 64d015d1ed283ae3d6252d8d91c429357da466d8 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 8 Nov 2024 16:14:15 +0000 Subject: [PATCH] build: Move lib_spark tests into separate exe So we don't have to run them through sparkd --- src/lib_spark/CMakeLists.txt | 28 ++++++++++++++++++- .../cmake/GetLinuxServerSources.cmake | 19 +++++++++++-- .../algo/algo_orders/RegisterDorman.cpp | 3 +- .../tests => tests/config}/HTTPServer.cpp | 0 .../tests => tests/config}/HTTPServer.h | 0 .../config}/config_ref_tests.cpp | 2 +- .../tests => tests/config}/config_tests.cpp | 2 +- .../datastreams}/stream_tests.cpp | 0 .../domain_model}/domain_tests.cpp | 0 .../jetfix}/async_reader_tests.cpp | 2 +- .../{jetfix/tests => tests/jetfix}/conv.py | 0 .../tests => tests/jetfix}/decoding_tests.cpp | 0 .../jetfix}/fix_encoding_stream_tests.cpp | 0 .../jetfix}/fix_fragment_tests.cpp | 0 .../jetfix}/jetfix_performance_tests.cpp | 0 .../tests => tests/jetfix}/sample_fix.cpp | 0 .../tests => tests/jetfix}/sample_fix.dat | 0 .../tests => tests/jetfix}/sample_fix.h | 0 .../tests => tests/jetfix}/store_tests.cpp | 0 .../md}/Co2ManagedTestHelper.cpp | 0 .../test => tests/md}/Co2TestInstrument.cpp | 0 .../{md/test => tests/md}/Co2TestInstrument.h | 2 +- .../spark/{md/test => tests/md}/mbo_tests.cpp | 6 ++-- .../spark/{md/test => tests/md}/md2_tests.cpp | 17 ++++++----- .../{md/test => tests/md}/md_test_utils.cpp | 4 +-- .../{md/test => tests/md}/md_test_utils.h | 4 +-- .../md}/synthetic_book_merge_tests.cpp | 8 ++++-- .../orderman}/CCApiExecutionTests.cpp | 0 .../orderman/algos}/AlgoTestDriver.cpp | 0 .../orderman/algos}/AlgoTestDriver.h | 0 .../orderman/algos}/ExecutionTesterAlgo.h | 0 .../orderman/algos}/ExecutiontTesterAlgo.cpp | 0 .../orderman/algos}/LimitCoverTests.cpp | 9 +++--- .../orderman/algos}/dorman_tests.cpp | 4 +-- .../algos}/limit_cover/LimitCoverState.cpp | 4 +-- .../algos}/limit_cover/LimitCoverState.h | 5 ++-- .../algos}/limit_cover/LimitCoverTestUtils.h | 0 .../orderman/algos}/limit_cover/TestSteps.cpp | 4 +-- .../orderman/algos}/limit_cover/TestSteps.h | 2 +- .../orderman/algos}/splitter_tests.cpp | 4 +-- .../orderman}/fat_wrapper_tests.cpp | 0 .../tests => tests/orderman}/limit_tests.cpp | 0 .../persistence}/PersistenceServiceTests.cpp | 2 +- .../quickbus}/qb_pubsub_tests.cpp | 0 .../tests => tests/quickbus}/qb_rpc_tests.cpp | 0 .../quickbus}/quickbus_tests.cpp | 0 .../websocket}/WebsocketClientTests.cpp | 0 .../websocket}/WebsocketSyncClientTests.cpp | 0 48 files changed, 87 insertions(+), 44 deletions(-) rename src/lib_spark/spark/{config/tests => tests/config}/HTTPServer.cpp (100%) rename src/lib_spark/spark/{config/tests => tests/config}/HTTPServer.h (100%) rename src/lib_spark/spark/{config/tests => tests/config}/config_ref_tests.cpp (99%) rename src/lib_spark/spark/{config/tests => tests/config}/config_tests.cpp (99%) rename src/lib_spark/spark/{datastreams/Tables/tests => tests/datastreams}/stream_tests.cpp (100%) rename src/lib_spark/spark/{domain_model/tests => tests/domain_model}/domain_tests.cpp (100%) rename src/lib_spark/spark/{jetfix/tests => tests/jetfix}/async_reader_tests.cpp (99%) rename src/lib_spark/spark/{jetfix/tests => tests/jetfix}/conv.py (100%) rename src/lib_spark/spark/{jetfix/tests => tests/jetfix}/decoding_tests.cpp (100%) rename src/lib_spark/spark/{jetfix/tests => tests/jetfix}/fix_encoding_stream_tests.cpp (100%) rename src/lib_spark/spark/{jetfix/tests => tests/jetfix}/fix_fragment_tests.cpp (100%) rename src/lib_spark/spark/{jetfix/tests => tests/jetfix}/jetfix_performance_tests.cpp (100%) rename src/lib_spark/spark/{jetfix/tests => tests/jetfix}/sample_fix.cpp (100%) rename src/lib_spark/spark/{jetfix/tests => tests/jetfix}/sample_fix.dat (100%) rename src/lib_spark/spark/{jetfix/tests => tests/jetfix}/sample_fix.h (100%) rename src/lib_spark/spark/{jetfix/tests => tests/jetfix}/store_tests.cpp (100%) rename src/lib_spark/spark/{md/test => tests/md}/Co2ManagedTestHelper.cpp (100%) rename src/lib_spark/spark/{md/test => tests/md}/Co2TestInstrument.cpp (100%) rename src/lib_spark/spark/{md/test => tests/md}/Co2TestInstrument.h (95%) rename src/lib_spark/spark/{md/test => tests/md}/mbo_tests.cpp (96%) rename src/lib_spark/spark/{md/test => tests/md}/md2_tests.cpp (99%) rename src/lib_spark/spark/{md/test => tests/md}/md_test_utils.cpp (93%) rename src/lib_spark/spark/{md/test => tests/md}/md_test_utils.h (89%) rename src/lib_spark/spark/{md/test => tests/md}/synthetic_book_merge_tests.cpp (96%) rename src/lib_spark/spark/{orderman/tests => tests/orderman}/CCApiExecutionTests.cpp (100%) rename src/lib_spark/spark/{orderman/orders/algo/algo_orders/tests => tests/orderman/algos}/AlgoTestDriver.cpp (100%) rename src/lib_spark/spark/{orderman/orders/algo/algo_orders/tests => tests/orderman/algos}/AlgoTestDriver.h (100%) rename src/lib_spark/spark/{orderman/orders/algo/algo_orders/tests => tests/orderman/algos}/ExecutionTesterAlgo.h (100%) rename src/lib_spark/spark/{orderman/orders/algo/algo_orders/tests => tests/orderman/algos}/ExecutiontTesterAlgo.cpp (100%) rename src/lib_spark/spark/{orderman/orders/algo/algo_orders/tests => tests/orderman/algos}/LimitCoverTests.cpp (94%) rename src/lib_spark/spark/{orderman/orders/algo/algo_orders/tests => tests/orderman/algos}/dorman_tests.cpp (96%) rename src/lib_spark/spark/{orderman/orders/algo/algo_orders/tests => tests/orderman/algos}/limit_cover/LimitCoverState.cpp (94%) rename src/lib_spark/spark/{orderman/orders/algo/algo_orders/tests => tests/orderman/algos}/limit_cover/LimitCoverState.h (94%) rename src/lib_spark/spark/{orderman/orders/algo/algo_orders/tests => tests/orderman/algos}/limit_cover/LimitCoverTestUtils.h (100%) rename src/lib_spark/spark/{orderman/orders/algo/algo_orders/tests => tests/orderman/algos}/limit_cover/TestSteps.cpp (94%) rename src/lib_spark/spark/{orderman/orders/algo/algo_orders/tests => tests/orderman/algos}/limit_cover/TestSteps.h (94%) rename src/lib_spark/spark/{orderman/orders/algo/algo_orders/tests => tests/orderman/algos}/splitter_tests.cpp (96%) rename src/lib_spark/spark/{orderman/tests => tests/orderman}/fat_wrapper_tests.cpp (100%) rename src/lib_spark/spark/{orderman/limiter/tests => tests/orderman}/limit_tests.cpp (100%) rename src/lib_spark/spark/{persistence/tests => tests/persistence}/PersistenceServiceTests.cpp (99%) rename src/lib_spark/spark/{quickbus/pubsub/tests => tests/quickbus}/qb_pubsub_tests.cpp (100%) rename src/lib_spark/spark/{quickbus/rpc/tests => tests/quickbus}/qb_rpc_tests.cpp (100%) rename src/lib_spark/spark/{quickbus/tests => tests/quickbus}/quickbus_tests.cpp (100%) rename src/lib_spark/spark/{io/websocket/tests => tests/websocket}/WebsocketClientTests.cpp (100%) rename src/lib_spark/spark/{communincation/websockets/tests => tests/websocket}/WebsocketSyncClientTests.cpp (100%) diff --git a/src/lib_spark/CMakeLists.txt b/src/lib_spark/CMakeLists.txt index a59c1b263..3e20e75f5 100644 --- a/src/lib_spark/CMakeLists.txt +++ b/src/lib_spark/CMakeLists.txt @@ -33,7 +33,7 @@ get_proto_sources( ${PROJECT_NAME}_PROTO_SOURCES ${PROJECT_NAME}_PROTO_SERVICES ) -get_cpp_sources(${PROJECT_NAME}_SOURCES) +get_cpp_sources(${PROJECT_NAME}_SOURCES ${PROJECT_NAME}_TEST_SOURCES) protobuf_generate_cpp( CXX_SOURCES ${PROJECT_NAME}_CXX_PROTO_SOURCES CXX_HEADERS ${PROJECT_NAME}_CXX_PROTO_HEADERS @@ -131,3 +131,29 @@ foreach(_hdr ${${PROJECT_NAME}_CXX_PROTO_SERVICE_HEADERS}) endforeach() install_basic() + +# Add tests executable (if there are any) +if (${PROJECT_NAME}_TEST_SOURCES) + add_executable(${PROJECT_NAME}-tests ${${PROJECT_NAME}_TEST_SOURCES}) + + # Set RPATH so the tests exe knows where to find the shared lib. + set_target_properties( + ${PROJECT_NAME}-tests + PROPERTIES + BUILD_RPATH "$ORIGIN" + INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}" + ) + + # Link main lib + target_link_directories( + ${PROJECT_NAME}-tests + PRIVATE + $ + $ + ) + target_link_libraries(${PROJECT_NAME}-tests PRIVATE ${PROJECT_NAME}) + + # Catch2 + find_package(Catch2 CONFIG REQUIRED COMPONENTS Catch2WithMain) + target_link_libraries(${PROJECT_NAME}-tests PRIVATE Catch2::Catch2WithMain) +endif() diff --git a/src/lib_spark/cmake/GetLinuxServerSources.cmake b/src/lib_spark/cmake/GetLinuxServerSources.cmake index 557f712ce..18d9e9a79 100644 --- a/src/lib_spark/cmake/GetLinuxServerSources.cmake +++ b/src/lib_spark/cmake/GetLinuxServerSources.cmake @@ -25,10 +25,23 @@ function(get_proto_sources cfg_srcs non_cfg_srcs service_srcs) set(${service_srcs} ${_service_srcs} PARENT_SCOPE) endfunction() -function(get_cpp_sources dest) +function(get_cpp_sources srcs test_srcs) file( - GLOB_RECURSE _dest + GLOB_RECURSE _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_NAME}/*.cpp) - set(${dest} ${_dest} PARENT_SCOPE) + + # Note: cpp files inside 'tests' dir(s) are considered tests. + # Remove tests from main sources, and add them to test sources + foreach(item ${_srcs}) + if(${item} MATCHES "tests/.*\.cpp$") + list(APPEND _test_srcs ${item}) + endif() + endforeach() + foreach(item ${_test_srcs}) + list(REMOVE_ITEM ${_srcs} ${item}) + endforeach() + + set(${srcs} ${_srcs} PARENT_SCOPE) + set(${test_srcs} ${_test_srcs} PARENT_SCOPE) endfunction() diff --git a/src/lib_spark/spark/orderman/orders/algo/algo_orders/RegisterDorman.cpp b/src/lib_spark/spark/orderman/orders/algo/algo_orders/RegisterDorman.cpp index aac21a811..1d34ff4a2 100644 --- a/src/lib_spark/spark/orderman/orders/algo/algo_orders/RegisterDorman.cpp +++ b/src/lib_spark/spark/orderman/orders/algo/algo_orders/RegisterDorman.cpp @@ -14,8 +14,9 @@ #include "spark/orderman/orders/algo/algo_orders/TaskingEyeAlgo.h" #include "spark/orderman/orders/algo/algo_orders/VolAlgo.h" #include "spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.h" -#include "spark/orderman/orders/algo/algo_orders/tests/ExecutionTesterAlgo.h" #include "spark/plugin/SparkServices.h" +#include "spark/tests/orderman/algos/ExecutionTesterAlgo.h" + #include using namespace bts; diff --git a/src/lib_spark/spark/config/tests/HTTPServer.cpp b/src/lib_spark/spark/tests/config/HTTPServer.cpp similarity index 100% rename from src/lib_spark/spark/config/tests/HTTPServer.cpp rename to src/lib_spark/spark/tests/config/HTTPServer.cpp diff --git a/src/lib_spark/spark/config/tests/HTTPServer.h b/src/lib_spark/spark/tests/config/HTTPServer.h similarity index 100% rename from src/lib_spark/spark/config/tests/HTTPServer.h rename to src/lib_spark/spark/tests/config/HTTPServer.h diff --git a/src/lib_spark/spark/config/tests/config_ref_tests.cpp b/src/lib_spark/spark/tests/config/config_ref_tests.cpp similarity index 99% rename from src/lib_spark/spark/config/tests/config_ref_tests.cpp rename to src/lib_spark/spark/tests/config/config_ref_tests.cpp index 9e09fc504..84d1562c4 100644 --- a/src/lib_spark/spark/config/tests/config_ref_tests.cpp +++ b/src/lib_spark/spark/tests/config/config_ref_tests.cpp @@ -1,7 +1,7 @@ #include "spark/utils/TempDir.h" #include "spark/utils/TempFile.h" -#include "../config.h" +#include "spark/config/config.h" #include "spark/config/invalid/invalid.pb.h" #include "spark/config/protos/testkeys.pb.h" #include "system/expression/parser_exceptions.h" diff --git a/src/lib_spark/spark/config/tests/config_tests.cpp b/src/lib_spark/spark/tests/config/config_tests.cpp similarity index 99% rename from src/lib_spark/spark/config/tests/config_tests.cpp rename to src/lib_spark/spark/tests/config/config_tests.cpp index f9ec509d9..67cbb823f 100644 --- a/src/lib_spark/spark/config/tests/config_tests.cpp +++ b/src/lib_spark/spark/tests/config/config_tests.cpp @@ -1,6 +1,6 @@ #include "spark/utils/TempFile.h" -#include "../config.h" +#include "spark/config/config.h" #include "spark/utils/bts_assert.h" #include "spark/utils/is_unittest_environment.h" #include "system/config/configuration_exception.h" diff --git a/src/lib_spark/spark/datastreams/Tables/tests/stream_tests.cpp b/src/lib_spark/spark/tests/datastreams/stream_tests.cpp similarity index 100% rename from src/lib_spark/spark/datastreams/Tables/tests/stream_tests.cpp rename to src/lib_spark/spark/tests/datastreams/stream_tests.cpp diff --git a/src/lib_spark/spark/domain_model/tests/domain_tests.cpp b/src/lib_spark/spark/tests/domain_model/domain_tests.cpp similarity index 100% rename from src/lib_spark/spark/domain_model/tests/domain_tests.cpp rename to src/lib_spark/spark/tests/domain_model/domain_tests.cpp diff --git a/src/lib_spark/spark/jetfix/tests/async_reader_tests.cpp b/src/lib_spark/spark/tests/jetfix/async_reader_tests.cpp similarity index 99% rename from src/lib_spark/spark/jetfix/tests/async_reader_tests.cpp rename to src/lib_spark/spark/tests/jetfix/async_reader_tests.cpp index c95129ef8..b27dac2e2 100644 --- a/src/lib_spark/spark/jetfix/tests/async_reader_tests.cpp +++ b/src/lib_spark/spark/tests/jetfix/async_reader_tests.cpp @@ -2,7 +2,7 @@ #include "spark/jetfix/connection/AsyncReader.h" #include "spark/jetfix/connection/IConnection.h" #include "spark/jetfix/gateway/ICoreGatewayEventSink.h" -#include "spark/jetfix/tests/sample_fix.h" +#include "spark/tests/jetfix/sample_fix.h" #include #include diff --git a/src/lib_spark/spark/jetfix/tests/conv.py b/src/lib_spark/spark/tests/jetfix/conv.py similarity index 100% rename from src/lib_spark/spark/jetfix/tests/conv.py rename to src/lib_spark/spark/tests/jetfix/conv.py diff --git a/src/lib_spark/spark/jetfix/tests/decoding_tests.cpp b/src/lib_spark/spark/tests/jetfix/decoding_tests.cpp similarity index 100% rename from src/lib_spark/spark/jetfix/tests/decoding_tests.cpp rename to src/lib_spark/spark/tests/jetfix/decoding_tests.cpp diff --git a/src/lib_spark/spark/jetfix/tests/fix_encoding_stream_tests.cpp b/src/lib_spark/spark/tests/jetfix/fix_encoding_stream_tests.cpp similarity index 100% rename from src/lib_spark/spark/jetfix/tests/fix_encoding_stream_tests.cpp rename to src/lib_spark/spark/tests/jetfix/fix_encoding_stream_tests.cpp diff --git a/src/lib_spark/spark/jetfix/tests/fix_fragment_tests.cpp b/src/lib_spark/spark/tests/jetfix/fix_fragment_tests.cpp similarity index 100% rename from src/lib_spark/spark/jetfix/tests/fix_fragment_tests.cpp rename to src/lib_spark/spark/tests/jetfix/fix_fragment_tests.cpp diff --git a/src/lib_spark/spark/jetfix/tests/jetfix_performance_tests.cpp b/src/lib_spark/spark/tests/jetfix/jetfix_performance_tests.cpp similarity index 100% rename from src/lib_spark/spark/jetfix/tests/jetfix_performance_tests.cpp rename to src/lib_spark/spark/tests/jetfix/jetfix_performance_tests.cpp diff --git a/src/lib_spark/spark/jetfix/tests/sample_fix.cpp b/src/lib_spark/spark/tests/jetfix/sample_fix.cpp similarity index 100% rename from src/lib_spark/spark/jetfix/tests/sample_fix.cpp rename to src/lib_spark/spark/tests/jetfix/sample_fix.cpp diff --git a/src/lib_spark/spark/jetfix/tests/sample_fix.dat b/src/lib_spark/spark/tests/jetfix/sample_fix.dat similarity index 100% rename from src/lib_spark/spark/jetfix/tests/sample_fix.dat rename to src/lib_spark/spark/tests/jetfix/sample_fix.dat diff --git a/src/lib_spark/spark/jetfix/tests/sample_fix.h b/src/lib_spark/spark/tests/jetfix/sample_fix.h similarity index 100% rename from src/lib_spark/spark/jetfix/tests/sample_fix.h rename to src/lib_spark/spark/tests/jetfix/sample_fix.h diff --git a/src/lib_spark/spark/jetfix/tests/store_tests.cpp b/src/lib_spark/spark/tests/jetfix/store_tests.cpp similarity index 100% rename from src/lib_spark/spark/jetfix/tests/store_tests.cpp rename to src/lib_spark/spark/tests/jetfix/store_tests.cpp diff --git a/src/lib_spark/spark/md/test/Co2ManagedTestHelper.cpp b/src/lib_spark/spark/tests/md/Co2ManagedTestHelper.cpp similarity index 100% rename from src/lib_spark/spark/md/test/Co2ManagedTestHelper.cpp rename to src/lib_spark/spark/tests/md/Co2ManagedTestHelper.cpp diff --git a/src/lib_spark/spark/md/test/Co2TestInstrument.cpp b/src/lib_spark/spark/tests/md/Co2TestInstrument.cpp similarity index 100% rename from src/lib_spark/spark/md/test/Co2TestInstrument.cpp rename to src/lib_spark/spark/tests/md/Co2TestInstrument.cpp diff --git a/src/lib_spark/spark/md/test/Co2TestInstrument.h b/src/lib_spark/spark/tests/md/Co2TestInstrument.h similarity index 95% rename from src/lib_spark/spark/md/test/Co2TestInstrument.h rename to src/lib_spark/spark/tests/md/Co2TestInstrument.h index 680a2c121..c1ae397bd 100644 --- a/src/lib_spark/spark/md/test/Co2TestInstrument.h +++ b/src/lib_spark/spark/tests/md/Co2TestInstrument.h @@ -1,6 +1,6 @@ #pragma once -#include "../coconut2.h" +#include "spark/md/coconut2.h" #include "spark/utils/bts_no_copy.h" #include diff --git a/src/lib_spark/spark/md/test/mbo_tests.cpp b/src/lib_spark/spark/tests/md/mbo_tests.cpp similarity index 96% rename from src/lib_spark/spark/md/test/mbo_tests.cpp rename to src/lib_spark/spark/tests/md/mbo_tests.cpp index e88e26d34..7a85c1af2 100644 --- a/src/lib_spark/spark/md/test/mbo_tests.cpp +++ b/src/lib_spark/spark/tests/md/mbo_tests.cpp @@ -1,7 +1,7 @@ #ifndef _WIN32 -#include "../IntPrice.h" -#include "../MBOProcessor.h" -#include "Co2TestInstrument.h" +#include "spark/md/IntPrice.h" +#include "spark/md/MBOProcessor.h" +#include "spark/tests/md/Co2TestInstrument.h" #include "spark/utils/Shuffle.h" #include diff --git a/src/lib_spark/spark/md/test/md2_tests.cpp b/src/lib_spark/spark/tests/md/md2_tests.cpp similarity index 99% rename from src/lib_spark/spark/md/test/md2_tests.cpp rename to src/lib_spark/spark/tests/md/md2_tests.cpp index d3b4a954d..bad388bd9 100644 --- a/src/lib_spark/spark/md/test/md2_tests.cpp +++ b/src/lib_spark/spark/tests/md/md2_tests.cpp @@ -1,25 +1,24 @@ #ifndef _WIN32 -#include "../MDClient.h" -#include "../SecurityCache.h" -#include "../SettlementRecorder.h" -#include "../coconut2.h" -#include "Co2TestInstrument.h" #include "spark/config/config.h" +#include "spark/config/protos/market_data.pb.h" +#include "spark/md/MDClient.h" #include "spark/md/PriceSize.h" +#include "spark/md/SecurityCache.h" +#include "spark/md/SettlementRecorder.h" +#include "spark/md/coconut2.h" #include "spark/md/relay/query_server.h" #include "spark/metrics/metrics.h" #include "spark/persistence/SqliteStore.h" +#include "spark/tests/md/Co2TestInstrument.h" +#include "spark/tests/md/md_test_utils.h" #include "spark/utils/Dispatcher.h" #include "spark/utils/Shuffle.h" +#include "spark/utils/Sqlite_utils.h" #include "spark/utils/bts_chrono.h" #include "spark/utils/defer.h" #include "spark/utils/warn_ctrl.h" #include "system/os.h" -#include "md_test_utils.h" -#include "spark/config/protos/market_data.pb.h" -#include "spark/utils/Sqlite_utils.h" - #include #include #include diff --git a/src/lib_spark/spark/md/test/md_test_utils.cpp b/src/lib_spark/spark/tests/md/md_test_utils.cpp similarity index 93% rename from src/lib_spark/spark/md/test/md_test_utils.cpp rename to src/lib_spark/spark/tests/md/md_test_utils.cpp index 42997837e..fb52e3a94 100644 --- a/src/lib_spark/spark/md/test/md_test_utils.cpp +++ b/src/lib_spark/spark/tests/md/md_test_utils.cpp @@ -1,5 +1,5 @@ #include "md_test_utils.h" -#include "../MDProducer.h" +#include "spark/md/MDProducer.h" #include #include @@ -45,4 +45,4 @@ void assign_ids( } // namespace test } // namespace md -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/lib_spark/spark/md/test/md_test_utils.h b/src/lib_spark/spark/tests/md/md_test_utils.h similarity index 89% rename from src/lib_spark/spark/md/test/md_test_utils.h rename to src/lib_spark/spark/tests/md/md_test_utils.h index 4aa04b06a..b76aa1885 100644 --- a/src/lib_spark/spark/md/test/md_test_utils.h +++ b/src/lib_spark/spark/tests/md/md_test_utils.h @@ -1,7 +1,7 @@ #pragma once -#include "../MDProducerHandle.h" #include "spark/md/IntPrice.h" +#include "spark/md/MDProducerHandle.h" #include "spark/md/PriceSize.h" #include @@ -37,4 +37,4 @@ void assign_ids( } // namespace test } // namespace md -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/lib_spark/spark/md/test/synthetic_book_merge_tests.cpp b/src/lib_spark/spark/tests/md/synthetic_book_merge_tests.cpp similarity index 96% rename from src/lib_spark/spark/md/test/synthetic_book_merge_tests.cpp rename to src/lib_spark/spark/tests/md/synthetic_book_merge_tests.cpp index a4c78b8e6..7c089ad0d 100644 --- a/src/lib_spark/spark/md/test/synthetic_book_merge_tests.cpp +++ b/src/lib_spark/spark/tests/md/synthetic_book_merge_tests.cpp @@ -1,9 +1,10 @@ #ifndef _WIN32 -#include "../MDConsumerHandle.h" -#include "Co2TestInstrument.h" +#include "spark/md/MDConsumerHandle.h" +#include "spark/tests/md/Co2TestInstrument.h" +#include "spark/tests/md/md_test_utils.h" #include "spark/utils/TimeStamp.h" #include "spark/utils/sane_algorithm.h" -#include "md_test_utils.h" + #include #include #include @@ -12,6 +13,7 @@ #include #include #include + #define ENABLE_BENCHMARK 0 #if ENABLE_BENCHMARK #include diff --git a/src/lib_spark/spark/orderman/tests/CCApiExecutionTests.cpp b/src/lib_spark/spark/tests/orderman/CCApiExecutionTests.cpp similarity index 100% rename from src/lib_spark/spark/orderman/tests/CCApiExecutionTests.cpp rename to src/lib_spark/spark/tests/orderman/CCApiExecutionTests.cpp diff --git a/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp b/src/lib_spark/spark/tests/orderman/algos/AlgoTestDriver.cpp similarity index 100% rename from src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp rename to src/lib_spark/spark/tests/orderman/algos/AlgoTestDriver.cpp diff --git a/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h b/src/lib_spark/spark/tests/orderman/algos/AlgoTestDriver.h similarity index 100% rename from src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h rename to src/lib_spark/spark/tests/orderman/algos/AlgoTestDriver.h diff --git a/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/ExecutionTesterAlgo.h b/src/lib_spark/spark/tests/orderman/algos/ExecutionTesterAlgo.h similarity index 100% rename from src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/ExecutionTesterAlgo.h rename to src/lib_spark/spark/tests/orderman/algos/ExecutionTesterAlgo.h diff --git a/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/ExecutiontTesterAlgo.cpp b/src/lib_spark/spark/tests/orderman/algos/ExecutiontTesterAlgo.cpp similarity index 100% rename from src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/ExecutiontTesterAlgo.cpp rename to src/lib_spark/spark/tests/orderman/algos/ExecutiontTesterAlgo.cpp diff --git a/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp b/src/lib_spark/spark/tests/orderman/algos/LimitCoverTests.cpp similarity index 94% rename from src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp rename to src/lib_spark/spark/tests/orderman/algos/LimitCoverTests.cpp index 2888db52d..3b5cc0afd 100644 --- a/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp +++ b/src/lib_spark/spark/tests/orderman/algos/LimitCoverTests.cpp @@ -7,12 +7,13 @@ #include "spark/orderman/orderman_utils/orderman_utils.h" #include "spark/orderman/orders/algo/algo_orders/LimitCoverAlgo.h" #include "spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.h" -#include "spark/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h" -#include "spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.h" -#include "spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverTestUtils.h" -#include "spark/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.h" #include "spark/sparkproto/SparkProtos.pb.h" +#include "spark/tests/orderman/algos/AlgoTestDriver.h" +#include "spark/tests/orderman/algos/limit_cover/LimitCoverState.h" +#include "spark/tests/orderman/algos/limit_cover/LimitCoverTestUtils.h" +#include "spark/tests/orderman/algos/limit_cover/TestSteps.h" #include "spark/utils/PBUtils.h" + #include #include #include diff --git a/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp b/src/lib_spark/spark/tests/orderman/algos/dorman_tests.cpp similarity index 96% rename from src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp rename to src/lib_spark/spark/tests/orderman/algos/dorman_tests.cpp index fb2fe5c77..65f34d6bb 100644 --- a/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp +++ b/src/lib_spark/spark/tests/orderman/algos/dorman_tests.cpp @@ -1,8 +1,8 @@ -#include "../DormanAlgo.h" -#include "AlgoTestDriver.h" #include "spark/domain_model/Security.h" #include "spark/orderman/orderman_utils/Book.h" #include "spark/orderman/orderman_utils/orderman_utils.h" +#include "spark/orderman/orders/algo/algo_orders/DormanAlgo.h" +#include "spark/tests/orderman/algos/AlgoTestDriver.h" #include #include diff --git a/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp b/src/lib_spark/spark/tests/orderman/algos/limit_cover/LimitCoverState.cpp similarity index 94% rename from src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp rename to src/lib_spark/spark/tests/orderman/algos/limit_cover/LimitCoverState.cpp index cfc0a7d2f..05ec3898d 100644 --- a/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp +++ b/src/lib_spark/spark/tests/orderman/algos/limit_cover/LimitCoverState.cpp @@ -1,11 +1,11 @@ -#include "spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.h" +#include "LimitCoverState.h" #include "spark/domain_model/Security.h" #include "spark/md/IntPrice.h" #include "spark/orderman/order_factory/IOrderFactory.h" #include "spark/orderman/orderman_utils/BookUtils.h" #include "spark/orderman/orderman_utils/Formatter.h" #include "spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverAdapter.h" -#include "spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverTestUtils.h" +#include "spark/tests/orderman/algos/limit_cover/LimitCoverTestUtils.h" #include diff --git a/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.h b/src/lib_spark/spark/tests/orderman/algos/limit_cover/LimitCoverState.h similarity index 94% rename from src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.h rename to src/lib_spark/spark/tests/orderman/algos/limit_cover/LimitCoverState.h index 3a86c6fc2..d87f550b7 100644 --- a/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.h +++ b/src/lib_spark/spark/tests/orderman/algos/limit_cover/LimitCoverState.h @@ -4,8 +4,9 @@ #include "spark/orderman/orderman_utils/Book.h" #include "spark/orderman/orders/algo/algo_orders/LimitCoverAlgo.h" #include "spark/orderman/orders/algo/algo_orders/limit_cover/LimitCoverDefinition.h" -#include "spark/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.h" #include "spark/sparkproto/SparkProtos.pb.h" +#include "spark/tests/orderman/algos/AlgoTestDriver.h" + #include #include #include @@ -124,4 +125,4 @@ operator<<(std::ostream &ostr, const LimitCoverState &lcs) { } // namespace limit_cover } // namespace test } // namespace orderman -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverTestUtils.h b/src/lib_spark/spark/tests/orderman/algos/limit_cover/LimitCoverTestUtils.h similarity index 100% rename from src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverTestUtils.h rename to src/lib_spark/spark/tests/orderman/algos/limit_cover/LimitCoverTestUtils.h diff --git a/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp b/src/lib_spark/spark/tests/orderman/algos/limit_cover/TestSteps.cpp similarity index 94% rename from src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp rename to src/lib_spark/spark/tests/orderman/algos/limit_cover/TestSteps.cpp index 2ee487926..dfdea3533 100644 --- a/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp +++ b/src/lib_spark/spark/tests/orderman/algos/limit_cover/TestSteps.cpp @@ -1,7 +1,7 @@ -#include "spark/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.h" +#include "TestSteps.h" #include "spark/api/services/OrderService.pb.h" #include "spark/orderman/order_factory/IOrderFactory.h" -#include "spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverTestUtils.h" +#include "spark/tests/orderman/algos/limit_cover/LimitCoverTestUtils.h" #include #include diff --git a/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.h b/src/lib_spark/spark/tests/orderman/algos/limit_cover/TestSteps.h similarity index 94% rename from src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.h rename to src/lib_spark/spark/tests/orderman/algos/limit_cover/TestSteps.h index 3d8de1845..697ed5822 100644 --- a/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.h +++ b/src/lib_spark/spark/tests/orderman/algos/limit_cover/TestSteps.h @@ -1,6 +1,6 @@ #pragma once #include "spark/api/services/OrderService.pb.h" -#include "spark/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.h" +#include "spark/tests/orderman/algos/limit_cover/LimitCoverState.h" #include #include diff --git a/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp b/src/lib_spark/spark/tests/orderman/algos/splitter_tests.cpp similarity index 96% rename from src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp rename to src/lib_spark/spark/tests/orderman/algos/splitter_tests.cpp index 25fa0ff7e..1fa8919a3 100644 --- a/src/lib_spark/spark/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp +++ b/src/lib_spark/spark/tests/orderman/algos/splitter_tests.cpp @@ -1,7 +1,7 @@ -#include "../SplitterAlgo.h" -#include "AlgoTestDriver.h" #include "spark/orderman/orderman_utils/Book.h" +#include "spark/orderman/orders/algo/algo_orders/SplitterAlgo.h" +#include "spark/tests/orderman/algos/AlgoTestDriver.h" #include "spark/utils/bts_chrono.h" #include diff --git a/src/lib_spark/spark/orderman/tests/fat_wrapper_tests.cpp b/src/lib_spark/spark/tests/orderman/fat_wrapper_tests.cpp similarity index 100% rename from src/lib_spark/spark/orderman/tests/fat_wrapper_tests.cpp rename to src/lib_spark/spark/tests/orderman/fat_wrapper_tests.cpp diff --git a/src/lib_spark/spark/orderman/limiter/tests/limit_tests.cpp b/src/lib_spark/spark/tests/orderman/limit_tests.cpp similarity index 100% rename from src/lib_spark/spark/orderman/limiter/tests/limit_tests.cpp rename to src/lib_spark/spark/tests/orderman/limit_tests.cpp diff --git a/src/lib_spark/spark/persistence/tests/PersistenceServiceTests.cpp b/src/lib_spark/spark/tests/persistence/PersistenceServiceTests.cpp similarity index 99% rename from src/lib_spark/spark/persistence/tests/PersistenceServiceTests.cpp rename to src/lib_spark/spark/tests/persistence/PersistenceServiceTests.cpp index 4fd94d3e3..dc517b8d7 100644 --- a/src/lib_spark/spark/persistence/tests/PersistenceServiceTests.cpp +++ b/src/lib_spark/spark/tests/persistence/PersistenceServiceTests.cpp @@ -1,6 +1,6 @@ -#include "../PersistenceServiceServer.h" #include "spark/api/public/ServiceContext.h" #include "spark/api/services/PersistenceService.client.pb.h" +#include "spark/persistence/PersistenceServiceServer.h" #include "spark/persistence/SqliteStore.h" #include "spark/utils/TempDir.h" #include "spark/utils/Uuid.h" diff --git a/src/lib_spark/spark/quickbus/pubsub/tests/qb_pubsub_tests.cpp b/src/lib_spark/spark/tests/quickbus/qb_pubsub_tests.cpp similarity index 100% rename from src/lib_spark/spark/quickbus/pubsub/tests/qb_pubsub_tests.cpp rename to src/lib_spark/spark/tests/quickbus/qb_pubsub_tests.cpp diff --git a/src/lib_spark/spark/quickbus/rpc/tests/qb_rpc_tests.cpp b/src/lib_spark/spark/tests/quickbus/qb_rpc_tests.cpp similarity index 100% rename from src/lib_spark/spark/quickbus/rpc/tests/qb_rpc_tests.cpp rename to src/lib_spark/spark/tests/quickbus/qb_rpc_tests.cpp diff --git a/src/lib_spark/spark/quickbus/tests/quickbus_tests.cpp b/src/lib_spark/spark/tests/quickbus/quickbus_tests.cpp similarity index 100% rename from src/lib_spark/spark/quickbus/tests/quickbus_tests.cpp rename to src/lib_spark/spark/tests/quickbus/quickbus_tests.cpp diff --git a/src/lib_spark/spark/io/websocket/tests/WebsocketClientTests.cpp b/src/lib_spark/spark/tests/websocket/WebsocketClientTests.cpp similarity index 100% rename from src/lib_spark/spark/io/websocket/tests/WebsocketClientTests.cpp rename to src/lib_spark/spark/tests/websocket/WebsocketClientTests.cpp diff --git a/src/lib_spark/spark/communincation/websockets/tests/WebsocketSyncClientTests.cpp b/src/lib_spark/spark/tests/websocket/WebsocketSyncClientTests.cpp similarity index 100% rename from src/lib_spark/spark/communincation/websockets/tests/WebsocketSyncClientTests.cpp rename to src/lib_spark/spark/tests/websocket/WebsocketSyncClientTests.cpp