diff --git a/CMakeLists.txt b/CMakeLists.txt index bd01e4ec5..e68432716 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,6 +36,15 @@ CPMAddPackage("gh:CLIUtils/CLI11@2.3.0") list(APPEND CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules) find_package(quickfix REQUIRED) +# Catch2 +CPMAddPackage( + NAME Catch2 + GITHUB_REPOSITORY catchorg/Catch2 + VERSION 2.13.9 + DOWNLOAD_ONLY True) +add_library(Catch2 INTERFACE) +target_include_directories(Catch2 SYSTEM INTERFACE ${Catch2_SOURCE_DIR}/single_include) + # curl CPMAddPackage( GITHUB_REPOSITORY curl/curl diff --git a/externals b/externals index ce0622f98..0d17c8554 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit ce0622f9893a4da3bba8b602445c8b445e3cfbb1 +Subproject commit 0d17c8554e2e88f03455f0cc40e957121902573b diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 1842672f5..83dcd6c56 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -137,6 +137,7 @@ else() -pthread -static-libgcc -static-libstdc++ + Catch2 Common++ Packet++ Pcap++ diff --git a/src/lib/communincation/websockets/tests/WebsocketSyncClientTests.cpp b/src/lib/communincation/websockets/tests/WebsocketSyncClientTests.cpp index 3b252bb6b..0590a11e7 100644 --- a/src/lib/communincation/websockets/tests/WebsocketSyncClientTests.cpp +++ b/src/lib/communincation/websockets/tests/WebsocketSyncClientTests.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include @@ -198,4 +198,4 @@ TEST_CASE("WebsocketSyncClientTest", "[ws_ssl]") { } } } -} \ No newline at end of file +} diff --git a/src/lib/config/tests/config_ref_tests.cpp b/src/lib/config/tests/config_ref_tests.cpp index f5338122e..b308c2559 100644 --- a/src/lib/config/tests/config_ref_tests.cpp +++ b/src/lib/config/tests/config_ref_tests.cpp @@ -9,7 +9,7 @@ #include "lib/expression/ParserExceptions.h" #include "HTTPServer.h" -#include "catch/catch.hpp" +#include #include #include diff --git a/src/lib/config/tests/config_tests.cpp b/src/lib/config/tests/config_tests.cpp index 18a5632f3..513057f8c 100644 --- a/src/lib/config/tests/config_tests.cpp +++ b/src/lib/config/tests/config_tests.cpp @@ -19,7 +19,7 @@ #define URDL_HEADER_ONLY 1 #define URDL_DISALE_SSL 1 -#include +#include #include #include diff --git a/src/lib/domain_model/SecurityTests.cpp b/src/lib/domain_model/SecurityTests.cpp index d5a42d892..ffcc04d98 100644 --- a/src/lib/domain_model/SecurityTests.cpp +++ b/src/lib/domain_model/SecurityTests.cpp @@ -1,4 +1,4 @@ -#include "catch/catch.hpp" +#include #include #include diff --git a/src/lib/domain_model/tests/domain_tests.cpp b/src/lib/domain_model/tests/domain_tests.cpp index 3fc8ed772..39df75749 100644 --- a/src/lib/domain_model/tests/domain_tests.cpp +++ b/src/lib/domain_model/tests/domain_tests.cpp @@ -1,6 +1,6 @@ #include "../Security.h" -#include "catch/catch.hpp" +#include #include "lib/domain_model/Security.h" #include "lib/utils/PBUtils.h" #include "lib/utils/datetime.h" diff --git a/src/lib/io/websocket/tests/WebsocketClientTests.cpp b/src/lib/io/websocket/tests/WebsocketClientTests.cpp index 3f21cc62e..86f243363 100644 --- a/src/lib/io/websocket/tests/WebsocketClientTests.cpp +++ b/src/lib/io/websocket/tests/WebsocketClientTests.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/lib/jetfix/tests/async_reader_tests.cpp b/src/lib/jetfix/tests/async_reader_tests.cpp index e7169dc04..24d81895e 100644 --- a/src/lib/jetfix/tests/async_reader_tests.cpp +++ b/src/lib/jetfix/tests/async_reader_tests.cpp @@ -1,4 +1,4 @@ -#include "catch/catch.hpp" +#include #include "lib/jetfix/common/InMsgBuffer.h" #include "lib/jetfix/connection/AsyncReader.h" @@ -7,6 +7,7 @@ #include "lib/jetfix/tests/sample_fix.h" #include +#include namespace bts { namespace jetfix { diff --git a/src/lib/jetfix/tests/decoding_tests.cpp b/src/lib/jetfix/tests/decoding_tests.cpp index 9a76e1a1f..c8a022b3d 100644 --- a/src/lib/jetfix/tests/decoding_tests.cpp +++ b/src/lib/jetfix/tests/decoding_tests.cpp @@ -1,4 +1,4 @@ -#include "catch/catch.hpp" +#include #include "lib/jetfix/codec/FIXFragment.h" #include "lib/jetfix/codec/FIXMsg.h" diff --git a/src/lib/jetfix/tests/fix_encoding_stream_tests.cpp b/src/lib/jetfix/tests/fix_encoding_stream_tests.cpp index eda41fe36..743a7a552 100644 --- a/src/lib/jetfix/tests/fix_encoding_stream_tests.cpp +++ b/src/lib/jetfix/tests/fix_encoding_stream_tests.cpp @@ -1,4 +1,4 @@ -#include "catch/catch.hpp" +#include #include "lib/jetfix/codec/FIXEncodingStream.h" #include diff --git a/src/lib/jetfix/tests/fix_fragment_tests.cpp b/src/lib/jetfix/tests/fix_fragment_tests.cpp index 919a7a1bf..9447158c1 100644 --- a/src/lib/jetfix/tests/fix_fragment_tests.cpp +++ b/src/lib/jetfix/tests/fix_fragment_tests.cpp @@ -1,4 +1,4 @@ -#include "catch/catch.hpp" +#include #include "lib/jetfix/codec/FIXFragment.h" #include "lib/jetfix/codec/Fields.h" diff --git a/src/lib/jetfix/tests/jetfix_performance_tests.cpp b/src/lib/jetfix/tests/jetfix_performance_tests.cpp index dbedf1abd..aaca443c8 100644 --- a/src/lib/jetfix/tests/jetfix_performance_tests.cpp +++ b/src/lib/jetfix/tests/jetfix_performance_tests.cpp @@ -1,4 +1,4 @@ -#include "catch/catch.hpp" +#include #include "lib/jetfix/codec/FIXFragment.h" #include "lib/jetfix/codec/FIXMsg.h" diff --git a/src/lib/jetfix/tests/store_tests.cpp b/src/lib/jetfix/tests/store_tests.cpp index 7d676ab0f..8940f5636 100644 --- a/src/lib/jetfix/tests/store_tests.cpp +++ b/src/lib/jetfix/tests/store_tests.cpp @@ -1,4 +1,4 @@ -#include "catch/catch.hpp" +#include #include "lib/jetfix/codec/FIXEncodingStream.h" #include "lib/jetfix/common/InMsgBuffer.h" diff --git a/src/lib/logging/tests/logging_tests.cpp b/src/lib/logging/tests/logging_tests.cpp index 6f3eb2536..85fe8c74b 100644 --- a/src/lib/logging/tests/logging_tests.cpp +++ b/src/lib/logging/tests/logging_tests.cpp @@ -1,4 +1,4 @@ -#include "catch/catch.hpp" +#include #include "lib/config/config.h" #include "lib/config/protos/logging.pb.h" #include "lib/utils/bts_chrono.h" diff --git a/src/lib/md/test/mbo_tests.cpp b/src/lib/md/test/mbo_tests.cpp index cd4e8a3c3..fb7c08f62 100644 --- a/src/lib/md/test/mbo_tests.cpp +++ b/src/lib/md/test/mbo_tests.cpp @@ -2,7 +2,7 @@ #include "../IntPrice.h" #include "../MBOProcessor.h" #include "Co2TestInstrument.h" -#include "catch/catch.hpp" +#include #include "lib/utils/Shuffle.h" #include diff --git a/src/lib/md/test/md2_tests.cpp b/src/lib/md/test/md2_tests.cpp index 22e050876..84678f8c2 100644 --- a/src/lib/md/test/md2_tests.cpp +++ b/src/lib/md/test/md2_tests.cpp @@ -5,7 +5,7 @@ #include "../coconut2.h" #include "../relay/QueryServer.h" #include "Co2TestInstrument.h" -#include "catch/catch.hpp" +#include #include "lib/config/config.h" #include "lib/metrics/metrics.h" #include "lib/os/os.h" diff --git a/src/lib/md/test/synthetic_book_merge_tests.cpp b/src/lib/md/test/synthetic_book_merge_tests.cpp index fe122423f..9dd66718e 100644 --- a/src/lib/md/test/synthetic_book_merge_tests.cpp +++ b/src/lib/md/test/synthetic_book_merge_tests.cpp @@ -1,7 +1,7 @@ #ifndef _WIN32 #include "../MDConsumerHandle.h" #include "Co2TestInstrument.h" -#include "catch/catch.hpp" +#include #include "lib/utils/sane_algorithm.h" #include "md_test_utils.h" #include diff --git a/src/lib/orderman/ilink3/test/IL3TestExchange.h b/src/lib/orderman/ilink3/test/IL3TestExchange.h index 1ba3c06fd..e481ee11d 100644 --- a/src/lib/orderman/ilink3/test/IL3TestExchange.h +++ b/src/lib/orderman/ilink3/test/IL3TestExchange.h @@ -1,6 +1,8 @@ #pragma once #include "../IL3Dispatcher.h" #include "../IL3ReceiveBuffer.h" + +#include #include #include #include @@ -217,7 +219,6 @@ struct IL3TestExchange { // todo: check sender seq # REQUIRE(msg.seqNum() == this->expected_seq); this->expected_seq += 1; - ExchangeOrder order; auto id = this->next_order_id += 1; this->orders[id] = ExchangeOrder{id, 0, msg.orderQty(), msg.securityID()}; diff --git a/src/lib/orderman/ilink3/test/ILinkGWTests.cpp b/src/lib/orderman/ilink3/test/ILinkGWTests.cpp index 1219c510d..a2939ec7c 100644 --- a/src/lib/orderman/ilink3/test/ILinkGWTests.cpp +++ b/src/lib/orderman/ilink3/test/ILinkGWTests.cpp @@ -1,5 +1,3 @@ -#include "catch/catch.hpp" - #include "../IL3GW.h" #include "../IL3MessageFramer.h" #include "../IL3ReceiveBuffer.h" @@ -11,6 +9,7 @@ #include "lib/domain_model/Security.h" #include "lib/utils/SecureLogon.h" +#include #include #include #include diff --git a/src/lib/orderman/limiter/tests/limit_tests.cpp b/src/lib/orderman/limiter/tests/limit_tests.cpp index 6fd2a7992..374bd3d76 100644 --- a/src/lib/orderman/limiter/tests/limit_tests.cpp +++ b/src/lib/orderman/limiter/tests/limit_tests.cpp @@ -1,4 +1,4 @@ -#include "catch/catch.hpp" +#include #include "lib/api/service_helpers/AdminServiceUtils.h" #include "lib/api/services/AdminService.server.pb.h" #include "lib/config/config.h" diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp index 388e3a04a..f8ca6ca37 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/AlgoTestDriver.cpp @@ -1,5 +1,5 @@ #include "AlgoTestDriver.h" -#include "catch/catch.hpp" +#include #include "lib/api/services/OrderService.pb.h" #include "lib/logging/logging.h" #include "lib/md/relay/RelayRecorder.h" diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp index e733a94de..6f4b4a85c 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/LimitCoverTests.cpp @@ -1,4 +1,3 @@ -#include "catch/catch.hpp" #include "lib/api/services/OrderService.pb.h" #include "lib/domain_model/Security.h" #include "lib/orderman/orderman_utils/Book.h" @@ -15,6 +14,7 @@ #include "lib/sparkproto/SparkProtos.pb.h" #include "lib/utils/PBUtils.h" #include +#include #include #include #include @@ -241,4 +241,4 @@ TEST_CASE("test_activation_thresholds.", "[algo][limit_cover]") { } // namespace limit_cover } // namespace test } // namespace orderman -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp index 91b0bd27b..6d8b55a38 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/dorman_tests.cpp @@ -1,6 +1,6 @@ #include "../DormanAlgo.h" #include "AlgoTestDriver.h" -#include "catch/catch.hpp" +#include #include "lib/domain_model/Security.h" #include "lib/orderman/orderman_utils/Book.h" #include "lib/orderman/orderman_utils/orderman_utils.h" diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp index 95f9385e0..53cf57d77 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.cpp @@ -1,5 +1,5 @@ #include "lib/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.h" -#include "catch/catch.hpp" +#include #include "lib/domain_model/Security.h" #include "lib/md/IntPrice.h" #include "lib/orderman/order_factory/IOrderFactory.h" @@ -197,4 +197,4 @@ LimitCoverState::ValidateDeployment::~ValidateDeployment() { } // namespace limit_cover } // namespace test } // namespace orderman -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp index 7d2b8d6e9..c6dff5fcb 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.cpp @@ -1,8 +1,9 @@ #include "lib/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.h" -#include "catch/catch.hpp" #include "lib/api/services/OrderService.pb.h" #include "lib/orderman/order_factory/IOrderFactory.h" #include "lib/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverTestUtils.h" + +#include #include #include #include @@ -231,4 +232,4 @@ void CancelAlgo::execute_core(LimitCoverState &state) const { } // namespace limit_cover } // namespace test } // namespace orderman -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.h b/src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.h index 9d664741c..7513877b7 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.h +++ b/src/lib/orderman/orders/algo/algo_orders/tests/limit_cover/TestSteps.h @@ -1,5 +1,5 @@ #pragma once -#include "catch/catch.hpp" +#include #include "lib/api/services/OrderService.pb.h" #include "lib/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.h" #include @@ -134,4 +134,4 @@ struct Custom : public ITestStep { } // namespace limit_cover } // namespace test } // namespace orderman -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp b/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp index 211aaec99..2982b6829 100644 --- a/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/tests/splitter_tests.cpp @@ -1,7 +1,7 @@ #include "../SplitterAlgo.h" #include "AlgoTestDriver.h" -#include "catch/catch.hpp" +#include #include "lib/orderman/orderman_utils/Book.h" #include "lib/utils/bts_chrono.h" #include diff --git a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h index 627c2c8be..33c70c472 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h +++ b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h @@ -1,7 +1,4 @@ #pragma once -#include -#include - #include "lib/domain_model/Security.h" #include "lib/orderman/securities/ISecurityDB.h" #include "lib/utils/bts_chrono.h" @@ -16,8 +13,11 @@ #include "lib/utils/PBUtils.h" #include "lib/utils/bts_chrono.h" #include "lib/utils/datetime.h" + #include +#include #include +#include namespace bts { namespace orderman { diff --git a/src/lib/orderman/tests/fat_wrapper_tests.cpp b/src/lib/orderman/tests/fat_wrapper_tests.cpp index b3a45dc12..d52036c96 100644 --- a/src/lib/orderman/tests/fat_wrapper_tests.cpp +++ b/src/lib/orderman/tests/fat_wrapper_tests.cpp @@ -1,5 +1,5 @@ #include "lib/mercury/common/FatWrapper.h" -#include +#include namespace bts { namespace mercury { diff --git a/src/lib/persistence/tests/PersistenceServiceTests.cpp b/src/lib/persistence/tests/PersistenceServiceTests.cpp index 6a8d646e1..5fa9fc0ce 100644 --- a/src/lib/persistence/tests/PersistenceServiceTests.cpp +++ b/src/lib/persistence/tests/PersistenceServiceTests.cpp @@ -1,5 +1,3 @@ -#include "catch/catch.hpp" - #include "../PersistenceServiceServer.h" #include "lib/api/public/ServiceContext.h" #include "lib/api/services/PersistenceService.client.pb.h" @@ -9,6 +7,7 @@ #include "lib/utils/bts_chrono.h" #include +#include #include namespace bts { diff --git a/src/lib/quickbus/pubsub/tests/qb_pubsub_tests.cpp b/src/lib/quickbus/pubsub/tests/qb_pubsub_tests.cpp index 1437cceaa..1253f648c 100644 --- a/src/lib/quickbus/pubsub/tests/qb_pubsub_tests.cpp +++ b/src/lib/quickbus/pubsub/tests/qb_pubsub_tests.cpp @@ -1,8 +1,8 @@ -#include "catch/catch.hpp" #include "lib/os/os.h" #include "lib/quickbus/quickbus.h" #include "lib/utils/bts_chrono.h" +#include #include #include diff --git a/src/lib/quickbus/rpc/tests/qb_rpc_tests.cpp b/src/lib/quickbus/rpc/tests/qb_rpc_tests.cpp index b48d04954..44e2935d6 100644 --- a/src/lib/quickbus/rpc/tests/qb_rpc_tests.cpp +++ b/src/lib/quickbus/rpc/tests/qb_rpc_tests.cpp @@ -1,10 +1,10 @@ -#include "catch/catch.hpp" #include "lib/os/os.h" #include "lib/quickbus/quickbus.h" #include "lib/utils/TimeStamp.h" #include "lib/utils/benchmarking_utils.h" #include +#include #include #include diff --git a/src/lib/quickbus/tests/quickbus_tests.cpp b/src/lib/quickbus/tests/quickbus_tests.cpp index c64d66a96..ff99f0870 100644 --- a/src/lib/quickbus/tests/quickbus_tests.cpp +++ b/src/lib/quickbus/tests/quickbus_tests.cpp @@ -1,9 +1,8 @@ -#include "catch/catch.hpp" - #include "lib/quickbus/quickbus.h" #include "lib/quickbus/routing/Router.h" #include +#include namespace bts { int quickbus_tests = 0; diff --git a/src/lib/testing/catch_test_runner.cpp b/src/lib/testing/catch_test_runner.cpp index 95b24f7c2..66c5a0087 100644 --- a/src/lib/testing/catch_test_runner.cpp +++ b/src/lib/testing/catch_test_runner.cpp @@ -1,14 +1,13 @@ #define CATCH_CONFIG_RUNNER #include "catch_test_runner.h" - -#include "catch/catch.hpp" - #include "lib/config/config.h" #include "lib/config/protos/logging.pb.h" #include "lib/logging/logging.h" #include "lib/utils/bts_assert.h" #include "lib/utils/is_unittest_environment.h" +#include + namespace bts { int run_tests(int argc, char **argv) { diff --git a/src/lib/utils/tests/AuthTokenTests.cpp b/src/lib/utils/tests/AuthTokenTests.cpp index 16ff1a1b6..fb86da7ad 100644 --- a/src/lib/utils/tests/AuthTokenTests.cpp +++ b/src/lib/utils/tests/AuthTokenTests.cpp @@ -1,6 +1,6 @@ #ifndef _WIN32 #include "../AuthToken.h" -#include "catch/catch.hpp" +#include #include "lib/config/config.h" namespace bts { namespace test { diff --git a/src/lib/utils/tests/IDGeneratorTests.cpp b/src/lib/utils/tests/IDGeneratorTests.cpp index a30ff6263..c246e1523 100644 --- a/src/lib/utils/tests/IDGeneratorTests.cpp +++ b/src/lib/utils/tests/IDGeneratorTests.cpp @@ -1,6 +1,6 @@ #ifndef _WIN32 #include "../Puid.h" -#include "catch/catch.hpp" +#include namespace bts { diff --git a/src/lib/utils/tests/MathUtilsTests.cpp b/src/lib/utils/tests/MathUtilsTests.cpp index 9f98674e4..78afa160a 100644 --- a/src/lib/utils/tests/MathUtilsTests.cpp +++ b/src/lib/utils/tests/MathUtilsTests.cpp @@ -1,6 +1,6 @@ #ifndef _WIN32 #include "lib/utils/MathUtils.h" -#include +#include namespace bts::tests { diff --git a/src/lib/utils/tests/SingleWriterConcurrentVectorTests.cpp b/src/lib/utils/tests/SingleWriterConcurrentVectorTests.cpp index a749bb929..ee41d0699 100644 --- a/src/lib/utils/tests/SingleWriterConcurrentVectorTests.cpp +++ b/src/lib/utils/tests/SingleWriterConcurrentVectorTests.cpp @@ -1,5 +1,5 @@ #include "../ConcurrentAppendCollection.h" -#include "catch/catch.hpp" +#include #include namespace bts { @@ -95,4 +95,4 @@ TEST_CASE("ConcurrentAppendCollection", "[collection]") { } } -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/server/sparkd/CMakeLists.txt b/src/server/sparkd/CMakeLists.txt index 14e2fe0e7..bc79a3eaf 100644 --- a/src/server/sparkd/CMakeLists.txt +++ b/src/server/sparkd/CMakeLists.txt @@ -76,6 +76,7 @@ target_link_libraries( -static-libgcc -static-libstdc++ ACE + Catch2 Common++ CLI11 OnixS.IceImpactMulticastPriceFeedHandlerCpp diff --git a/src/server/sparkd/cmds/spartan/back_testing/matcher/tests/matcher_tests.cpp b/src/server/sparkd/cmds/spartan/back_testing/matcher/tests/matcher_tests.cpp index 92f64323e..1464679b9 100644 --- a/src/server/sparkd/cmds/spartan/back_testing/matcher/tests/matcher_tests.cpp +++ b/src/server/sparkd/cmds/spartan/back_testing/matcher/tests/matcher_tests.cpp @@ -1,7 +1,8 @@ #include "../MatchingCommon.h" #include "back_testing/matcher/FifoPriceLevelMatcher.h" #include "back_testing/matcher/FifoSecurityMatcher.h" -#include + +#include #include #include #include diff --git a/src/server/sparkd/cmds/spartan/domain/book/tests/book_merging_tests.cpp b/src/server/sparkd/cmds/spartan/domain/book/tests/book_merging_tests.cpp index 9540be9e4..8bd572ef6 100644 --- a/src/server/sparkd/cmds/spartan/domain/book/tests/book_merging_tests.cpp +++ b/src/server/sparkd/cmds/spartan/domain/book/tests/book_merging_tests.cpp @@ -1,5 +1,6 @@ #include "server/sparkd/cmds/spartan/back_testing/common/mdp3_common.h" -#include + +#include namespace bts::spartan::mdp3::tests { diff --git a/src/server/sparkd/cmds/spartan/domain/book/tests/synthetic_book_tests.cpp b/src/server/sparkd/cmds/spartan/domain/book/tests/synthetic_book_tests.cpp index dab20a8f2..ebcf662c3 100644 --- a/src/server/sparkd/cmds/spartan/domain/book/tests/synthetic_book_tests.cpp +++ b/src/server/sparkd/cmds/spartan/domain/book/tests/synthetic_book_tests.cpp @@ -2,7 +2,8 @@ #include "domain/book/SyntheticBook.h" #include "server/sparkd/cmds/spartan/back_testing/common/mdp3_utils.h" #include "server/sparkd/cmds/spartan/utils/Permutation.h" -#include + +#include #include #include #include diff --git a/src/server/sparkd/cmds/spartan/domain/polygons/tests/test_polygon_finder.cpp b/src/server/sparkd/cmds/spartan/domain/polygons/tests/test_polygon_finder.cpp index 4a2d9c54e..10e9cc577 100644 --- a/src/server/sparkd/cmds/spartan/domain/polygons/tests/test_polygon_finder.cpp +++ b/src/server/sparkd/cmds/spartan/domain/polygons/tests/test_polygon_finder.cpp @@ -1,5 +1,6 @@ #include "domain/polygons/polygon_utils.h" -#include + +#include namespace bts::spartan::mdp3 { diff --git a/src/server/sparkd/cmds/spartan/feed_handler/test/spartan_md_tests.cpp b/src/server/sparkd/cmds/spartan/feed_handler/test/spartan_md_tests.cpp index 9b098bb1d..2b62cf607 100644 --- a/src/server/sparkd/cmds/spartan/feed_handler/test/spartan_md_tests.cpp +++ b/src/server/sparkd/cmds/spartan/feed_handler/test/spartan_md_tests.cpp @@ -1,5 +1,3 @@ -#include - #include "back_testing/matcher/FifoPriceLevelMatcher.h" #include "back_testing/matcher/FifoSecurityMatcher.h" #include "domain/SecuritySnapshot.h" @@ -20,6 +18,7 @@ #include #include #include +#include #include namespace bts::spartan::mdp3::tests { diff --git a/src/server/sparkd/cmds/spartan/utils/tests/PermutationTests.cpp b/src/server/sparkd/cmds/spartan/utils/tests/PermutationTests.cpp index b1d62d34d..80c2fcb20 100644 --- a/src/server/sparkd/cmds/spartan/utils/tests/PermutationTests.cpp +++ b/src/server/sparkd/cmds/spartan/utils/tests/PermutationTests.cpp @@ -1,7 +1,8 @@ #include "lib/utils/MathUtils.h" #include "lib/utils/bts_assert.h" #include "server/sparkd/cmds/spartan/utils/Permutation.h" -#include + +#include #include #include #include diff --git a/src/server/sparkd/exchange_sim/tests/test_book_transform.cpp b/src/server/sparkd/exchange_sim/tests/test_book_transform.cpp index 094c430d3..b397e8377 100644 --- a/src/server/sparkd/exchange_sim/tests/test_book_transform.cpp +++ b/src/server/sparkd/exchange_sim/tests/test_book_transform.cpp @@ -1,5 +1,6 @@ #include "server/sparkd/exchange_sim/book/book_transform.h" -#include + +#include #include namespace bts { diff --git a/src/server/sparkd/http/tests/MultiPartFormTests.cpp b/src/server/sparkd/http/tests/MultiPartFormTests.cpp index cc3aadbea..1ee27fe31 100644 --- a/src/server/sparkd/http/tests/MultiPartFormTests.cpp +++ b/src/server/sparkd/http/tests/MultiPartFormTests.cpp @@ -1,6 +1,6 @@ #include "../MultipartFormDecoder.h" -#include "catch/catch.hpp" +#include #include namespace bts { @@ -49,4 +49,4 @@ TEST_CASE("MultiPart form decoder", "[http]") { } // namespace test } // namespace http -} // namespace bts \ No newline at end of file +} // namespace bts diff --git a/src/server/sparkd/position/tests/PositionTests.cpp b/src/server/sparkd/position/tests/PositionTests.cpp index 0c003dd80..244f508f0 100644 --- a/src/server/sparkd/position/tests/PositionTests.cpp +++ b/src/server/sparkd/position/tests/PositionTests.cpp @@ -1,14 +1,13 @@ -#include "catch/catch.hpp" - #include "lib/utils/datetime.h" +#include "server/sparkd/position/import/DownloadWindow.h" + #include #include +#include #include #include #include -#include "server/sparkd/position/import/DownloadWindow.h" - namespace bts { namespace test { diff --git a/src/server/sparkd/position/tests/position_tests_internal.cpp b/src/server/sparkd/position/tests/position_tests_internal.cpp index d99ecfaa2..9a9b0b2b2 100644 --- a/src/server/sparkd/position/tests/position_tests_internal.cpp +++ b/src/server/sparkd/position/tests/position_tests_internal.cpp @@ -1,8 +1,8 @@ -#include "catch/catch.hpp" - #include "lib/orderman/actors/SODPosition.h" #include "lib/utils/datetime.h" #include "server/sparkd/position/PositionMap.h" + +#include #include #include diff --git a/src/server/sparkd/user/tests/admin_service_tests.cpp b/src/server/sparkd/user/tests/admin_service_tests.cpp index 42c687bd0..528e18fd2 100644 --- a/src/server/sparkd/user/tests/admin_service_tests.cpp +++ b/src/server/sparkd/user/tests/admin_service_tests.cpp @@ -1,10 +1,10 @@ - -#include "catch/catch.hpp" #include "lib/api/service_helpers/AdminServiceUtils.h" #include "lib/api/services/AdminService.server.pb.h" #include "lib/config/config.h" #include "lib/utils/bts_chrono.h" #include "lib/utils/helper_macros.h" + +#include #include namespace bts {