Added option to use Catch2 framework for tests

1 files changed, 38 insertions, 38 deletions

diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index 5260eaa65..2c5d1d11b 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 <zencore/testing.h>
-#	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 {
@@ -2490,41 +2490,41 @@ private:
 	zen::BinaryWriter	  m_MemOut;
 };
 
-TEST_CASE("exec.basic" * doctest::skip(true))
-{
-#		if ZEN_WITH_EXEC_SERVICES
-	using namespace std::literals;
-
-	std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
-
-	const uint16_t PortNumber = 13337;
-
-	ZenServerInstance Zen1(TestEnv);
-	Zen1.SetTestDir(TestDir);
-	Zen1.SpawnServer(PortNumber);
-	Zen1.WaitUntilReady();
-
-	std::filesystem::path TreePath = TestEnv.GetTestRootDir("test/remote1");
-
-	{
-		RemoteExecutionRequest RemoteRequest("localhost", PortNumber, TreePath);
-		RemoteRequest.Build("zentest-appstub.exe", "");
-		RemoteRequest.Prep();
-		zen::CbObject Result = RemoteRequest.Exec();
-
-		CHECK(Result["exitcode"sv].AsInt32(-1) == 0);
-	}
-
-	{
-		RemoteExecutionRequest RemoteRequest("localhost", PortNumber, TreePath);
-		RemoteRequest.Build("zentest-appstub.exe", "-f=1");
-		RemoteRequest.Prep();
-		zen::CbObject Result = RemoteRequest.Exec();
-
-		CHECK(Result["exitcode"sv].AsInt32(-1) == 1);
-	}
-#		endif	// ZEN_WITH_EXEC_SERVICES
-}
+//TEST_CASE(".exec.basic" /* * doctest::skip(true) */)
+//{
+//#		if ZEN_WITH_EXEC_SERVICES
+//	using namespace std::literals;
+//
+//	std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
+//
+//	const uint16_t PortNumber = 13337;
+//
+//	ZenServerInstance Zen1(TestEnv);
+//	Zen1.SetTestDir(TestDir);
+//	Zen1.SpawnServer(PortNumber);
+//	Zen1.WaitUntilReady();
+//
+//	std::filesystem::path TreePath = TestEnv.GetTestRootDir("test/remote1");
+//
+//	{
+//		RemoteExecutionRequest RemoteRequest("localhost", PortNumber, TreePath);
+//		RemoteRequest.Build("zentest-appstub.exe", "");
+//		RemoteRequest.Prep();
+//		zen::CbObject Result = RemoteRequest.Exec();
+//
+//		CHECK(Result["exitcode"sv].AsInt32(-1) == 0);
+//	}
+//
+//	{
+//		RemoteExecutionRequest RemoteRequest("localhost", PortNumber, TreePath);
+//		RemoteRequest.Build("zentest-appstub.exe", "-f=1");
+//		RemoteRequest.Prep();
+//		zen::CbObject Result = RemoteRequest.Exec();
+//
+//		CHECK(Result["exitcode"sv].AsInt32(-1) == 1);
+//	}
+//#		endif	// ZEN_WITH_EXEC_SERVICES
+//}
 
 TEST_CASE("mesh.basic")
 {