Merged from origin/main

1 files changed, 73 insertions, 0 deletions

diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index cb4ff06da..dbe7ac9b9 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -7,6 +7,7 @@
 #include <zencore/compactbinarypackage.h>
 #include <zencore/except.h>
 #include <zencore/filesystem.h>
+#include <zencore/fmtutils.h>
 #include <zencore/iohash.h>
 #include <zencore/string.h>
 #include <zencore/thread.h>
@@ -1068,6 +1069,7 @@ TEST_CASE("project.basic")
 				 zen::NiceRate(RequestCount, (uint32_t)Elapsed, "req"));
 }
 
+#	if 0  // this is extremely WIP
 TEST_CASE("project.pipe")
 {
 	using namespace std::literals;
@@ -1088,5 +1090,76 @@ TEST_CASE("project.pipe")
 
 	zen::CbObject Response = LocalClient.MessageTransaction(Cbow.Save());
 }
+#	endif
+
+TEST_CASE("z$.basic")
+{
+	using namespace std::literals;
+
+	std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
+
+	const uint16_t PortNumber = 13337;
+
+	const int  kIterationCount = 100;
+	const auto BaseUri		   = "http://localhost:{}/z$"_format(PortNumber);
+
+	{
+		ZenServerInstance Instance1(TestEnv);
+		Instance1.SetTestDir(TestDir);
+		Instance1.SpawnServer(PortNumber);
+		Instance1.WaitUntilReady();
+
+		// Populate with some simple data
+
+		for (int i = 0; i < kIterationCount; ++i)
+		{
+			zen::CbObjectWriter Cbo;
+			Cbo << "index" << i;
+
+			zen::MemoryOutStream MemOut;
+			zen::BinaryWriter	 Writer{MemOut};
+			Cbo.Save(Writer);
+
+			zen::IoHash Key = zen::IoHash::HashMemory(&i, sizeof i);
+
+			cpr::Response Result = cpr::Put(cpr::Url{"{}/{}/{}"_format(BaseUri, "test", Key)},
+											cpr::Body{(const char*)MemOut.Data(), MemOut.Size()},
+											cpr::Header{{"Content-Type", "application/x-ue-cb"}});
+
+			CHECK(Result.status_code == 201);
+		}
+
+		// Retrieve data
+
+		for (int i = 0; i < kIterationCount; ++i)
+		{
+			zen::IoHash Key = zen::IoHash::HashMemory(&i, sizeof i);
+
+			cpr::Response Result = cpr::Get(cpr::Url{"{}/{}/{}"_format(BaseUri, "test", Key)});
+
+			CHECK(Result.status_code == 200);
+		}
+	}
+
+	// Verify that the data persists between process runs (the previous server has exited at this point)
+
+	{
+		ZenServerInstance Instance1(TestEnv);
+		Instance1.SetTestDir(TestDir);
+		Instance1.SpawnServer(PortNumber);
+		Instance1.WaitUntilReady();
+
+		// Retrieve data again
+
+		for (int i = 0; i < kIterationCount; ++i)
+		{
+			zen::IoHash Key = zen::IoHash::HashMemory(&i, sizeof i);
+
+			cpr::Response Result = cpr::Get(cpr::Url{"{}/{}/{}"_format(BaseUri, "test", Key)});
+
+			CHECK(Result.status_code == 200);
+		}
+	}
+}
 
 #endif