From f0d389a4430b62bfa8ea0852905fcf84065b08c2 Mon Sep 17 00:00:00 2001 From: Stefan Boberg Date: Fri, 20 May 2022 18:45:35 +0200 Subject: Add catch2 support (#101) Added option to use catch2 for unit tests Currently both doctest and catch2 are supported via some compatibility macros. doctest is the default, and ZEN_USE_CATCH2 needs to be defined to switch to catch2. Our goal is to evaluate how well catch2 works and switch to catch2 if everything pans out since UE5 now supports using catch2 for unit tests. --- zenserver-test/zenserver-test.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'zenserver-test/zenserver-test.cpp') diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp index a6e89e702..21837fc0a 100644 --- a/zenserver-test/zenserver-test.cpp +++ b/zenserver-test/zenserver-test.cpp @@ -65,9 +65,8 @@ ZEN_THIRD_PARTY_INCLUDES_END ////////////////////////////////////////////////////////////////////////// #if ZEN_WITH_TESTS -# define DOCTEST_CONFIG_IMPLEMENT +# define ZEN_TEST_WITH_RUNNER 1 # include -# undef DOCTEST_CONFIG_IMPLEMENT #endif using namespace std::literals; @@ -331,7 +330,8 @@ main(int argc, char** argv) TestEnv.InitializeForTest(ProgramBaseDir, TestBaseDir); ZEN_INFO("Running tests...(base dir: '{}')", TestBaseDir); - return doctest::Context(argc, argv).run(); + + return ZEN_RUN_TESTS(argc, argv); } namespace zen::tests { @@ -2504,8 +2504,12 @@ private: zen::BinaryWriter m_MemOut; }; -TEST_CASE("exec.basic" * doctest::skip(true)) +TEST_CASE(".exec.basic" /* * doctest::skip(true) */) { + if (true) + { + return; + } # if ZEN_WITH_EXEC_SERVICES using namespace std::literals; @@ -2733,8 +2737,13 @@ TEST_CASE("http.package") CHECK_EQ(ResponsePackage, TestPackage); } -TEST_CASE("websocket.basic" * doctest::skip(true)) +TEST_CASE("websocket.basic") { + if (true) + { + return; + } + std::filesystem::path TestDir = TestEnv.CreateNewTestDir(); const uint16_t PortNumber = 13337; const auto MaxWaitTime = std::chrono::seconds(5); -- cgit v1.2.3