clean up test linking (#4)

- Improvement: Add zenhttp-test and zenutil-test
- Improvement: Moved cachepolicy test to cachepolicy.cpp
- Improvement: Renamed cachestore tests from z$ to cachestore
- Improvement: Moved test linking so test for a lib is linked by <lib>-test
- Improvement: Removed HttpRequestParseRelativeUri in httpstructuredcache.cpp and use the one in cacherequests.h instead

2 files changed, 49 insertions, 0 deletions

diff --git a/src/zenhttp-test/xmake.lua b/src/zenhttp-test/xmake.lua
new file mode 100644
index 000000000..a6163e506
--- /dev/null
+++ b/src/zenhttp-test/xmake.lua
@@ -0,0 +1,15 @@
+-- Copyright Epic Games, Inc. All Rights Reserved.
+
+target("zenhttp-test")
+    set_kind("binary")
+    set_group("tests")
+    add_headerfiles("**.h")
+    add_files("*.cpp")
+    add_deps("zenhttp", "zencore")
+    add_packages("vcpkg::doctest")
+
+    if is_plat("macosx") then
+        add_ldflags("-framework CoreFoundation")
+        add_ldflags("-framework Security")
+        add_ldflags("-framework SystemConfiguration")
+    end
diff --git a/src/zenhttp-test/zenhttp-test.cpp b/src/zenhttp-test/zenhttp-test.cpp
new file mode 100644
index 000000000..440e85a9f
--- /dev/null
+++ b/src/zenhttp-test/zenhttp-test.cpp
@@ -0,0 +1,34 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#include <zencore/filesystem.h>
+#include <zencore/logging.h>
+#include <zenhttp/zenhttp.h>
+
+#if ZEN_USE_MIMALLOC
+ZEN_THIRD_PARTY_INCLUDES_START
+#	include <mimalloc-new-delete.h>
+ZEN_THIRD_PARTY_INCLUDES_END
+#endif
+
+#if ZEN_WITH_TESTS
+#	define ZEN_TEST_WITH_RUNNER 1
+#	include <zencore/testing.h>
+#endif
+
+int
+main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[])
+{
+#if ZEN_USE_MIMALLOC
+	mi_version();
+#endif
+#if ZEN_WITH_TESTS
+	zen::zenhttp_forcelinktests();
+
+	zen::logging::InitializeLogging();
+	zen::MaximizeOpenFileCount();
+
+	return ZEN_RUN_TESTS(argc, argv);
+#else
+	return 0;
+#endif
+}