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.

1 files changed, 10 insertions, 10 deletions

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();