Replace Catch2 in externals w/ CPM pkg

This commit is contained in:
John Colvin committed 2022-10-11 23:19:47 -04:00
1 parent 09fc44c7fc
commit 62684fde2d
52 files changed
+83 -69

No files matched your search

+9
View File
@@ -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
+1
View File
@@ -137,6 +137,7 @@ else()
-pthread
-static-libgcc
-static-libstdc++
Catch2
Common++
Packet++
Pcap++
@@ -11,7 +11,7 @@
#include <boost/asio/ip/tcp.hpp>
#include <boost/asio/ssl/stream.hpp>
#include <catch/catch.hpp>
#include <catch2/catch.hpp>
#include <cstdlib>
#include <functional>
#include <iostream>
@@ -198,4 +198,4 @@ TEST_CASE("WebsocketSyncClientTest", "[ws_ssl]") {
}
}
}
}
}
+1 -1
View File
@@ -9,7 +9,7 @@
#include "lib/expression/ParserExceptions.h"
#include "HTTPServer.h"
#include "catch/catch.hpp"
#include <catch2/catch.hpp>
#include <iostream>
#include <memory>
+1 -1
View File
@@ -19,7 +19,7 @@
#define URDL_HEADER_ONLY 1
#define URDL_DISALE_SSL 1
#include <catch/catch.hpp>
#include <catch2/catch.hpp>
#include <urdl/test/http_server.hpp>
#include <urdl/url.hpp>
+1 -1
View File
@@ -1,4 +1,4 @@
#include "catch/catch.hpp"
#include <catch2/catch.hpp>
#include <iostream>
#include <regex>
+1 -1
View File
@@ -1,6 +1,6 @@
#include "../Security.h"
#include "catch/catch.hpp"
#include <catch2/catch.hpp>
#include "lib/domain_model/Security.h"
#include "lib/utils/PBUtils.h"
#include "lib/utils/datetime.h"
@@ -23,7 +23,7 @@
#include <boost/core/addressof.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/date_time/posix_time/posix_time_duration.hpp>
#include <catch/catch.hpp>
#include <catch2/catch.hpp>
#include <chrono>
#include <cstdint>
#include <cstdlib>
+2 -1
View File
@@ -1,4 +1,4 @@
#include "catch/catch.hpp"
#include <catch2/catch.hpp>
#include "lib/jetfix/common/InMsgBuffer.h"
#include "lib/jetfix/connection/AsyncReader.h"
@@ -7,6 +7,7 @@
#include "lib/jetfix/tests/sample_fix.h"
#include <fstream>
#include <sstream>
namespace bts {
namespace jetfix {
+1 -1
View File
@@ -1,4 +1,4 @@
#include "catch/catch.hpp"
#include <catch2/catch.hpp>
#include "lib/jetfix/codec/FIXFragment.h"
#include "lib/jetfix/codec/FIXMsg.h"
@@ -1,4 +1,4 @@
#include "catch/catch.hpp"
#include <catch2/catch.hpp>
#include "lib/jetfix/codec/FIXEncodingStream.h"
#include <fstream>
+1 -1
View File
@@ -1,4 +1,4 @@
#include "catch/catch.hpp"
#include <catch2/catch.hpp>
#include "lib/jetfix/codec/FIXFragment.h"
#include "lib/jetfix/codec/Fields.h"
@@ -1,4 +1,4 @@
#include "catch/catch.hpp"
#include <catch2/catch.hpp>
#include "lib/jetfix/codec/FIXFragment.h"
#include "lib/jetfix/codec/FIXMsg.h"
+1 -1
View File
@@ -1,4 +1,4 @@
#include "catch/catch.hpp"
#include <catch2/catch.hpp>
#include "lib/jetfix/codec/FIXEncodingStream.h"
#include "lib/jetfix/common/InMsgBuffer.h"
+1 -1
View File
@@ -1,4 +1,4 @@
#include "catch/catch.hpp"
#include <catch2/catch.hpp>
#include "lib/config/config.h"
#include "lib/config/protos/logging.pb.h"
#include "lib/utils/bts_chrono.h"
+1 -1
View File
@@ -2,7 +2,7 @@
#include "../IntPrice.h"
#include "../MBOProcessor.h"
#include "Co2TestInstrument.h"
#include "catch/catch.hpp"
#include <catch2/catch.hpp>
#include "lib/utils/Shuffle.h"
#include <algorithm>
+1 -1
View File
@@ -5,7 +5,7 @@
#include "../coconut2.h"
#include "../relay/QueryServer.h"
#include "Co2TestInstrument.h"
#include "catch/catch.hpp"
#include <catch2/catch.hpp>
#include "lib/config/config.h"
#include "lib/metrics/metrics.h"
#include "lib/os/os.h"
@@ -1,7 +1,7 @@
#ifndef _WIN32
#include "../MDConsumerHandle.h"
#include "Co2TestInstrument.h"
#include "catch/catch.hpp"
#include <catch2/catch.hpp>
#include "lib/utils/sane_algorithm.h"
#include "md_test_utils.h"
#include <algorithm>
@@ -1,6 +1,8 @@
#pragma once
#include "../IL3Dispatcher.h"
#include "../IL3ReceiveBuffer.h"
#include <catch2/catch.hpp>
#include <functional>
#include <queue>
#include <string>
@@ -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()};
@@ -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 <catch2/catch.hpp>
#include <optional>
#include <random>
#include <variant>
@@ -1,4 +1,4 @@
#include "catch/catch.hpp"
#include <catch2/catch.hpp>
#include "lib/api/service_helpers/AdminServiceUtils.h"
#include "lib/api/services/AdminService.server.pb.h"
#include "lib/config/config.h"
@@ -1,5 +1,5 @@
#include "AlgoTestDriver.h"
#include "catch/catch.hpp"
#include <catch2/catch.hpp>
#include "lib/api/services/OrderService.pb.h"
#include "lib/logging/logging.h"
#include "lib/md/relay/RelayRecorder.h"
@@ -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 <array>
#include <catch2/catch.hpp>
#include <cmath>
#include <functional>
#include <iostream>
@@ -241,4 +241,4 @@ TEST_CASE("test_activation_thresholds.", "[algo][limit_cover]") {
} // namespace limit_cover
} // namespace test
} // namespace orderman
} // namespace bts
} // namespace bts
@@ -1,6 +1,6 @@
#include "../DormanAlgo.h"
#include "AlgoTestDriver.h"
#include "catch/catch.hpp"
#include <catch2/catch.hpp>
#include "lib/domain_model/Security.h"
#include "lib/orderman/orderman_utils/Book.h"
#include "lib/orderman/orderman_utils/orderman_utils.h"
@@ -1,5 +1,5 @@
#include "lib/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.h"
#include "catch/catch.hpp"
#include <catch2/catch.hpp>
#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
} // namespace bts
@@ -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 <catch2/catch.hpp>
#include <functional>
#include <iostream>
#include <optional>
@@ -231,4 +232,4 @@ void CancelAlgo::execute_core(LimitCoverState &state) const {
} // namespace limit_cover
} // namespace test
} // namespace orderman
} // namespace bts
} // namespace bts
@@ -1,5 +1,5 @@
#pragma once
#include "catch/catch.hpp"
#include <catch2/catch.hpp>
#include "lib/api/services/OrderService.pb.h"
#include "lib/orderman/orders/algo/algo_orders/tests/limit_cover/LimitCoverState.h"
#include <functional>
@@ -134,4 +134,4 @@ struct Custom : public ITestStep {
} // namespace limit_cover
} // namespace test
} // namespace orderman
} // namespace bts
} // namespace bts
@@ -1,7 +1,7 @@
#include "../SplitterAlgo.h"
#include "AlgoTestDriver.h"
#include "catch/catch.hpp"
#include <catch2/catch.hpp>
#include "lib/orderman/orderman_utils/Book.h"
#include "lib/utils/bts_chrono.h"
#include <ctime>
@@ -1,7 +1,4 @@
#pragma once
#include <catch/catch.hpp>
#include <map>
#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 <algorithm>
#include <catch2/catch.hpp>
#include <google/protobuf/util/message_differencer.h>
#include <map>
namespace bts {
namespace orderman {
+1 -1
View File
@@ -1,5 +1,5 @@
#include "lib/mercury/common/FatWrapper.h"
#include <catch/catch.hpp>
#include <catch2/catch.hpp>
namespace bts {
namespace mercury {
@@ -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 <boost/filesystem.hpp>
#include <catch2/catch.hpp>
#include <future>
namespace bts {
@@ -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 <catch2/catch.hpp>
#include <chrono>
#include <future>
+1 -1
View File
@@ -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 <atomic>
#include <catch2/catch.hpp>
#include <chrono>
#include <future>
+1 -2
View File
@@ -1,9 +1,8 @@
#include "catch/catch.hpp"
#include "lib/quickbus/quickbus.h"
#include "lib/quickbus/routing/Router.h"
#include <boost/signals2.hpp>
#include <catch2/catch.hpp>
namespace bts {
int quickbus_tests = 0;
+2 -3
View File
@@ -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 <catch2/catch.hpp>
namespace bts {
int run_tests(int argc, char **argv) {
+1 -1
View File
@@ -1,6 +1,6 @@
#ifndef _WIN32
#include "../AuthToken.h"
#include "catch/catch.hpp"
#include <catch2/catch.hpp>
#include "lib/config/config.h"
namespace bts {
namespace test {
+1 -1
View File
@@ -1,6 +1,6 @@
#ifndef _WIN32
#include "../Puid.h"
#include "catch/catch.hpp"
#include <catch2/catch.hpp>
namespace bts {
+1 -1
View File
@@ -1,6 +1,6 @@
#ifndef _WIN32
#include "lib/utils/MathUtils.h"
#include <catch/catch.hpp>
#include <catch2/catch.hpp>
namespace bts::tests {
@@ -1,5 +1,5 @@
#include "../ConcurrentAppendCollection.h"
#include "catch/catch.hpp"
#include <catch2/catch.hpp>
#include <thread>
namespace bts {
@@ -95,4 +95,4 @@ TEST_CASE("ConcurrentAppendCollection", "[collection]") {
}
}
} // namespace bts
} // namespace bts
+1
View File
@@ -76,6 +76,7 @@ target_link_libraries(
-static-libgcc
-static-libstdc++
ACE
Catch2
Common++
CLI11
OnixS.IceImpactMulticastPriceFeedHandlerCpp
@@ -1,7 +1,8 @@
#include "../MatchingCommon.h"
#include "back_testing/matcher/FifoPriceLevelMatcher.h"
#include "back_testing/matcher/FifoSecurityMatcher.h"
#include <catch/catch.hpp>
#include <catch2/catch.hpp>
#include <google/protobuf/timestamp.pb.h>
#include <google/protobuf/util/time_util.h>
#include <optional>
@@ -1,5 +1,6 @@
#include "server/sparkd/cmds/spartan/back_testing/common/mdp3_common.h"
#include <catch/catch.hpp>
#include <catch2/catch.hpp>
namespace bts::spartan::mdp3::tests {
@@ -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 <catch/catch.hpp>
#include <catch2/catch.hpp>
#include <limits>
#include <math.h>
#include <range/v3/algorithm.hpp>
@@ -1,5 +1,6 @@
#include "domain/polygons/polygon_utils.h"
#include <catch/catch.hpp>
#include <catch2/catch.hpp>
namespace bts::spartan::mdp3 {
@@ -1,5 +1,3 @@
#include <catch/catch.hpp>
#include "back_testing/matcher/FifoPriceLevelMatcher.h"
#include "back_testing/matcher/FifoSecurityMatcher.h"
#include "domain/SecuritySnapshot.h"
@@ -20,6 +18,7 @@
#include <boost/date_time/posix_time/conversion.hpp>
#include <boost/date_time/posix_time/ptime.hpp>
#include <boost/process.hpp>
#include <catch2/catch.hpp>
#include <fmt/format.h>
namespace bts::spartan::mdp3::tests {
@@ -1,7 +1,8 @@
#include "lib/utils/MathUtils.h"
#include "lib/utils/bts_assert.h"
#include "server/sparkd/cmds/spartan/utils/Permutation.h"
#include <catch/catch.hpp>
#include <catch2/catch.hpp>
#include <iostream>
#include <limits>
#include <math.h>
@@ -1,5 +1,6 @@
#include "server/sparkd/exchange_sim/book/book_transform.h"
#include <catch/catch.hpp>
#include <catch2/catch.hpp>
#include <stdlib.h>
namespace bts {
@@ -1,6 +1,6 @@
#include "../MultipartFormDecoder.h"
#include "catch/catch.hpp"
#include <catch2/catch.hpp>
#include <string>
namespace bts {
@@ -49,4 +49,4 @@ TEST_CASE("MultiPart form decoder", "[http]") {
} // namespace test
} // namespace http
} // namespace bts
} // namespace bts
@@ -1,14 +1,13 @@
#include "catch/catch.hpp"
#include "lib/utils/datetime.h"
#include "server/sparkd/position/import/DownloadWindow.h"
#include <boost/date_time/gregorian/gregorian.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <catch2/catch.hpp>
#include <future>
#include <memory>
#include <stdlib.h>
#include "server/sparkd/position/import/DownloadWindow.h"
namespace bts {
namespace test {
@@ -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 <catch2/catch.hpp>
#include <memory>
#include <stdlib.h>
@@ -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 <catch2/catch.hpp>
#include <memory>
namespace bts {