Merge main

1 files changed, 110 insertions, 0 deletions

diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index 455ab2495..efcbf5da8 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -5,6 +5,7 @@
 #include <zencore/compactbinary.h>
 #include <zencore/compactbinarybuilder.h>
 #include <zencore/compactbinarypackage.h>
+#include <zencore/compress.h>
 #include <zencore/except.h>
 #include <zencore/filesystem.h>
 #include <zencore/fmtutils.h>
@@ -12,6 +13,7 @@
 #include <zencore/string.h>
 #include <zencore/thread.h>
 #include <zencore/timer.h>
+#include <zenhttp/httpclient.h>
 #include <zenserverprocess.h>
 
 #include <mimalloc.h>
@@ -1380,4 +1382,112 @@ TEST_CASE("mesh.basic")
 	}
 }
 
+class ZenServerTestHelper
+{
+public:
+	ZenServerTestHelper(std::string_view HelperId, int ServerCount) : m_HelperId{HelperId}, m_ServerCount{ServerCount} {}
+	~ZenServerTestHelper() {}
+
+	void SpawnServers()
+	{
+		SpawnServers([](ZenServerInstance&) {});
+	}
+
+	void SpawnServers(auto&& Callback)
+	{
+		spdlog::info("{}: spawning {} server instances", m_HelperId, m_ServerCount);
+
+		m_Instances.resize(m_ServerCount);
+
+		for (int i = 0; i < m_ServerCount; ++i)
+		{
+			auto& Instance = m_Instances[i];
+
+			Instance = std::make_unique<ZenServerInstance>(TestEnv);
+			Instance->SetTestDir(TestEnv.CreateNewTestDir());
+
+			Callback(*Instance);
+
+			Instance->SpawnServer(13337 + i);
+		}
+
+		for (int i = 0; i < m_ServerCount; ++i)
+		{
+			auto& Instance = m_Instances[i];
+
+			Instance->WaitUntilReady();
+		}
+	}
+
+	ZenServerInstance& GetInstance(int Index) { return *m_Instances[Index]; }
+
+private:
+	std::string										 m_HelperId;
+	int												 m_ServerCount = 0;
+	std::vector<std::unique_ptr<ZenServerInstance> > m_Instances;
+};
+
+TEST_CASE("http.basics")
+{
+	using namespace std::literals;
+
+	ZenServerTestHelper Servers{"http.basics"sv, 1};
+	Servers.SpawnServers();
+
+	ZenServerInstance& Instance = Servers.GetInstance(0);
+	const std::string  BaseUri	= Instance.GetBaseUri();
+
+	{
+		cpr::Response r = cpr::Get(cpr::Url{"{}/testing/hello"_format(BaseUri)});
+		CHECK_EQ(r.status_code, 200);
+	}
+
+	{
+		cpr::Response r = cpr::Post(cpr::Url{"{}/testing/hello"_format(BaseUri)});
+		CHECK_EQ(r.status_code, 404);
+	}
+
+	{
+		cpr::Response r = cpr::Post(cpr::Url{"{}/testing/echo"_format(BaseUri)}, cpr::Body{"yoyoyoyo"});
+		CHECK_EQ(r.status_code, 200);
+		CHECK_EQ(r.text, "yoyoyoyo");
+	}
+}
+
+TEST_CASE("http.package")
+{
+	using namespace std::literals;
+
+	ZenServerTestHelper Servers{"http.package"sv, 1};
+	Servers.SpawnServers();
+
+	ZenServerInstance& Instance = Servers.GetInstance(0);
+	const std::string  BaseUri	= Instance.GetBaseUri();
+
+	static const uint8_t Data1[] = {0, 1, 2, 3};
+	static const uint8_t Data2[] = {0, 1, 2, 3, 4, 5, 6, 7, 8};
+
+	zen::CbAttachment Attach1{zen::CompressedBuffer::Compress(zen::SharedBuffer::Clone({Data1, 4}),
+															  zen::OodleCompressor::NotSet,
+															  zen::OodleCompressionLevel::None)};
+	zen::CbAttachment Attach2{zen::CompressedBuffer::Compress(zen::SharedBuffer::Clone({Data2, 8}),
+															  zen::OodleCompressor::NotSet,
+															  zen::OodleCompressionLevel::None)};
+
+	zen::CbObjectWriter Writer;
+
+	Writer.AddAttachment("attach1", Attach1);
+	Writer.AddAttachment("attach2", Attach2);
+
+	zen::CbObject CoreObject = Writer.Save();
+
+	zen::CbPackage TestPackage;
+	TestPackage.SetObject(CoreObject);
+	TestPackage.AddAttachment(Attach1);
+	TestPackage.AddAttachment(Attach2);
+
+	zen::HttpClient			  TestClient(BaseUri);
+	zen::HttpClient::Response Response = TestClient.TransactPackage("/testing/package"sv, TestPackage);
+}
+
 #endif