ZenServerProcess API changes (#719)

This refactor aims to improve the `ZenServerProcess` classes by making them useful for managing child zenserver instances in more scenarios than just automated tests. This involves changing some functions to not talk about "test directory" and instead use "data directory" etc

As a consequence of the API changes, some tests have changed accordingly.

The code includes som reference to the "hub" mode but there is not yet any other code using this mode, it's just included in this PR to simplify future merges.

5 files changed, 28 insertions, 28 deletions

diff --git a/src/zenserver-test/cache-tests.cpp b/src/zenserver-test/cache-tests.cpp
index 854590987..0272d3797 100644
--- a/src/zenserver-test/cache-tests.cpp
+++ b/src/zenserver-test/cache-tests.cpp
@@ -35,7 +35,7 @@ TEST_CASE("zcache.basic")
 
 	{
 		ZenServerInstance Instance1(TestEnv);
-		Instance1.SetTestDir(TestDir);
+		Instance1.SetDataDir(TestDir);
 
 		const uint16_t	  PortNumber = Instance1.SpawnServerAndWaitUntilReady();
 		const std::string BaseUri	 = fmt::format("http://localhost:{}/z$", PortNumber);
@@ -91,7 +91,7 @@ TEST_CASE("zcache.basic")
 
 	{
 		ZenServerInstance Instance1(TestEnv);
-		Instance1.SetTestDir(TestDir);
+		Instance1.SetDataDir(TestDir);
 		const uint16_t PortNumber = Instance1.SpawnServerAndWaitUntilReady();
 
 		const std::string BaseUri = fmt::format("http://localhost:{}/z$", PortNumber);
@@ -167,7 +167,7 @@ TEST_CASE("zcache.cbpackage")
 		std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
 
 		ZenServerInstance Instance1(TestEnv);
-		Instance1.SetTestDir(TestDir);
+		Instance1.SetDataDir(TestDir);
 		const uint16_t	  PortNumber = Instance1.SpawnServerAndWaitUntilReady();
 		const std::string BaseUri	 = fmt::format("http://localhost:{}/z$", PortNumber);
 
@@ -203,11 +203,11 @@ TEST_CASE("zcache.cbpackage")
 		std::filesystem::path RemoteDataDir = TestEnv.CreateNewTestDir();
 
 		ZenServerInstance RemoteInstance(TestEnv);
-		RemoteInstance.SetTestDir(RemoteDataDir);
+		RemoteInstance.SetDataDir(RemoteDataDir);
 		const uint16_t RemotePortNumber = RemoteInstance.SpawnServerAndWaitUntilReady();
 
 		ZenServerInstance LocalInstance(TestEnv);
-		LocalInstance.SetTestDir(LocalDataDir);
+		LocalInstance.SetDataDir(LocalDataDir);
 		LocalInstance.SpawnServer(TestEnv.GetNewPortNumber(),
 								  fmt::format("--upstream-thread-count=0 --upstream-zen-url=http://localhost:{}", RemotePortNumber));
 		const uint16_t LocalPortNumber = LocalInstance.WaitUntilReady();
@@ -261,11 +261,11 @@ TEST_CASE("zcache.cbpackage")
 		std::filesystem::path RemoteDataDir = TestEnv.CreateNewTestDir();
 
 		ZenServerInstance RemoteInstance(TestEnv);
-		RemoteInstance.SetTestDir(RemoteDataDir);
+		RemoteInstance.SetDataDir(RemoteDataDir);
 		const uint16_t RemotePortNumber = RemoteInstance.SpawnServerAndWaitUntilReady();
 
 		ZenServerInstance LocalInstance(TestEnv);
-		LocalInstance.SetTestDir(LocalDataDir);
+		LocalInstance.SetDataDir(LocalDataDir);
 		LocalInstance.SpawnServer(TestEnv.GetNewPortNumber(),
 								  fmt::format("--upstream-thread-count=0 --upstream-zen-url=http://localhost:{}", RemotePortNumber));
 		const uint16_t LocalPortNumber = LocalInstance.WaitUntilReady();
@@ -756,7 +756,7 @@ TEST_CASE("zcache.rpc")
 		std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
 
 		ZenServerInstance Inst(TestEnv);
-		Inst.SetTestDir(TestDir);
+		Inst.SetDataDir(TestDir);
 
 		const uint16_t	  BasePort = Inst.SpawnServerAndWaitUntilReady();
 		const std::string BaseUri  = fmt::format("http://localhost:{}/z$", BasePort);
@@ -786,7 +786,7 @@ TEST_CASE("zcache.rpc")
 		std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
 
 		ZenServerInstance Inst(TestEnv);
-		Inst.SetTestDir(TestDir);
+		Inst.SetDataDir(TestDir);
 		const uint16_t	  BasePort = Inst.SpawnServerAndWaitUntilReady();
 		const std::string BaseUri  = fmt::format("http://localhost:{}/z$", BasePort);
 
@@ -1239,7 +1239,7 @@ TEST_CASE("zcache.rpc")
 		std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
 
 		ZenServerInstance Inst(TestEnv);
-		Inst.SetTestDir(TestDir);
+		Inst.SetDataDir(TestDir);
 
 		const uint16_t	  BasePort = Inst.SpawnServerAndWaitUntilReady();
 		const std::string BaseUri  = fmt::format("http://localhost:{}/z$", BasePort);
diff --git a/src/zenserver-test/projectstore-tests.cpp b/src/zenserver-test/projectstore-tests.cpp
index c8c96dbbb..735aef159 100644
--- a/src/zenserver-test/projectstore-tests.cpp
+++ b/src/zenserver-test/projectstore-tests.cpp
@@ -34,7 +34,7 @@ TEST_CASE("project.basic")
 	std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
 
 	ZenServerInstance Instance1(TestEnv);
-	Instance1.SetTestDir(TestDir);
+	Instance1.SetDataDir(TestDir);
 
 	const uint16_t PortNumber = Instance1.SpawnServerAndWaitUntilReady();
 
diff --git a/src/zenserver-test/workspace-tests.cpp b/src/zenserver-test/workspace-tests.cpp
index f299b6dcf..7595d790a 100644
--- a/src/zenserver-test/workspace-tests.cpp
+++ b/src/zenserver-test/workspace-tests.cpp
@@ -81,7 +81,7 @@ TEST_CASE("workspaces.create")
 
 	std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
 	ZenServerInstance	  Instance(TestEnv);
-	Instance.SetTestDir(TestDir);
+	Instance.SetDataDir(TestDir);
 	const uint16_t PortNumber = Instance.SpawnServerAndWaitUntilReady(
 		fmt::format("--workspaces-enabled --workspaces-allow-changes --system-dir {}", SystemRootPath));
 	CHECK(PortNumber != 0);
@@ -214,7 +214,7 @@ TEST_CASE("workspaces.restricted")
 
 	std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
 	ZenServerInstance	  Instance(TestEnv);
-	Instance.SetTestDir(TestDir);
+	Instance.SetDataDir(TestDir);
 	const uint16_t PortNumber = Instance.SpawnServerAndWaitUntilReady(fmt::format("--workspaces-enabled --system-dir {}", SystemRootPath));
 	CHECK(PortNumber != 0);
 
@@ -319,7 +319,7 @@ TEST_CASE("workspaces.lifetimes")
 	{
 		std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
 		ZenServerInstance	  Instance(TestEnv);
-		Instance.SetTestDir(TestDir);
+		Instance.SetDataDir(TestDir);
 		const uint16_t PortNumber = Instance.SpawnServerAndWaitUntilReady(
 			fmt::format("--workspaces-enabled --workspaces-allow-changes --system-dir {}", SystemRootPath));
 		CHECK(PortNumber != 0);
@@ -343,7 +343,7 @@ TEST_CASE("workspaces.lifetimes")
 	{
 		std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
 		ZenServerInstance	  Instance(TestEnv);
-		Instance.SetTestDir(TestDir);
+		Instance.SetDataDir(TestDir);
 		const uint16_t PortNumber =
 			Instance.SpawnServerAndWaitUntilReady(fmt::format("--workspaces-enabled --system-dir {}", SystemRootPath));
 		CHECK(PortNumber != 0);
@@ -362,7 +362,7 @@ TEST_CASE("workspaces.lifetimes")
 	{
 		std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
 		ZenServerInstance	  Instance(TestEnv);
-		Instance.SetTestDir(TestDir);
+		Instance.SetDataDir(TestDir);
 		const uint16_t PortNumber =
 			Instance.SpawnServerAndWaitUntilReady(fmt::format("--workspaces-enabled --system-dir {}", SystemRootPath));
 		CHECK(PortNumber != 0);
diff --git a/src/zenserver-test/zenserver-test.cpp b/src/zenserver-test/zenserver-test.cpp
index 418fc7978..6f207b184 100644
--- a/src/zenserver-test/zenserver-test.cpp
+++ b/src/zenserver-test/zenserver-test.cpp
@@ -122,7 +122,7 @@ TEST_CASE("default.single")
 {
 	std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
 	ZenServerInstance	  Instance(TestEnv);
-	Instance.SetTestDir(TestDir);
+	Instance.SetDataDir(TestDir);
 	const uint16_t PortNumber = Instance.SpawnServerAndWaitUntilReady();
 
 	std::atomic<uint64_t> RequestCount{0};
@@ -172,7 +172,7 @@ TEST_CASE("default.loopback")
 	std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
 
 	ZenServerInstance Instance(TestEnv);
-	Instance.SetTestDir(TestDir);
+	Instance.SetDataDir(TestDir);
 	const uint16_t PortNumber = Instance.SpawnServerAndWaitUntilReady("--http-forceloopback");
 
 	ZEN_INFO("Running loopback server test...");
@@ -200,12 +200,12 @@ TEST_CASE("multi.basic")
 {
 	ZenServerInstance	  Instance1(TestEnv);
 	std::filesystem::path TestDir1 = TestEnv.CreateNewTestDir();
-	Instance1.SetTestDir(TestDir1);
+	Instance1.SetDataDir(TestDir1);
 	Instance1.SpawnServer();
 
 	ZenServerInstance	  Instance2(TestEnv);
 	std::filesystem::path TestDir2 = TestEnv.CreateNewTestDir();
-	Instance2.SetTestDir(TestDir2);
+	Instance2.SetDataDir(TestDir2);
 	Instance2.SpawnServer();
 
 	ZEN_INFO("Waiting...");
@@ -336,14 +336,14 @@ TEST_CASE("lifetime.owner")
 
 	ZenServerInstance	  Zen1(TestEnv);
 	std::filesystem::path TestDir1 = TestEnv.CreateNewTestDir();
-	Zen1.SetTestDir(TestDir1);
+	Zen1.SetDataDir(TestDir1);
 	Zen1.SpawnServer(PortNumber);
 	Zen1.WaitUntilReady();
 	Zen1.Detach();
 
 	ZenServerInstance	  Zen2(TestEnv);
 	std::filesystem::path TestDir2 = TestEnv.CreateNewTestDir();
-	Zen2.SetTestDir(TestDir2);
+	Zen2.SetDataDir(TestDir2);
 	Zen2.SpawnServer(PortNumber);
 	Zen2.WaitUntilReady();
 	Zen2.Detach();
@@ -362,24 +362,24 @@ TEST_CASE("lifetime.owner.2")
 	std::filesystem::path TestDir2 = TestEnv.CreateNewTestDir();
 
 	ZenServerInstance Zen1(TestEnv);
-	Zen1.SetTestDir(TestDir1);
+	Zen1.SetDataDir(TestDir1);
 	Zen1.SpawnServer(PortNumber);
 	Zen1.WaitUntilReady();
 
 	ZenServerInstance Zen2(TestEnv);
-	Zen2.SetTestDir(TestDir2);
+	Zen2.SetDataDir(TestDir2);
 	Zen2.SetOwnerPid(Zen1.GetPid());
 	Zen2.SpawnServer(PortNumber + 1);
 	Zen2.Detach();
 
 	ZenServerInstance Zen3(TestEnv);
-	Zen3.SetTestDir(TestDir2);
+	Zen3.SetDataDir(TestDir2);
 	Zen3.SetOwnerPid(Zen1.GetPid());
 	Zen3.SpawnServer(PortNumber + 1);
 	Zen3.Detach();
 
 	ZenServerInstance Zen4(TestEnv);
-	Zen4.SetTestDir(TestDir2);
+	Zen4.SetDataDir(TestDir2);
 	Zen4.SetOwnerPid(Zen1.GetPid());
 	Zen4.SpawnServer(PortNumber + 1);
 	Zen4.Detach();
diff --git a/src/zenserver-test/zenserver-test.h b/src/zenserver-test/zenserver-test.h
index e7cee3f94..8d83285e6 100644
--- a/src/zenserver-test/zenserver-test.h
+++ b/src/zenserver-test/zenserver-test.h
@@ -82,7 +82,7 @@ namespace utils {
 
 		void Spawn(ZenServerInstance& Inst)
 		{
-			Inst.SetTestDir(DataDir);
+			Inst.SetDataDir(DataDir);
 			Inst.SpawnServer(Port, Args);
 			const uint16_t InstancePort = Inst.WaitUntilReady();
 			CHECK_MESSAGE(InstancePort != 0, Inst.GetLogOutput());
@@ -163,7 +163,7 @@ public:
 		{
 			auto& Instance = m_Instances[i];
 			Instance	   = std::make_unique<ZenServerInstance>(TestEnv);
-			Instance->SetTestDir(TestEnv.CreateNewTestDir());
+			Instance->SetDataDir(TestEnv.CreateNewTestDir());
 		}
 
 		for (int i = 0; i < m_ServerCount; ++i)