make more test use the GarnetApplication

s3w3nofficial · s3w3nofficial · commit 24a075f60f32 · 2025-01-23T08:51:59.000+01:00
diff --git a/test/Garnet.test/RespSetTest.cs b/test/Garnet.test/RespSetTest.cs
@@ -17,20 +17,20 @@ namespace Garnet.test
     [TestFixture]
     public class RespSetTest
     {
-        GarnetServer server;
+        GarnetApplication server;
 
         [SetUp]
-        public void Setup()
+        public async Task Setup()
         {
             TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);
-            server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, lowMemory: true);
-            server.Start();
+            server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, lowMemory: true);
+            await server.RunAsync();
         }
 
         [TearDown]
-        public void TearDown()
+        public async Task TearDown()
         {
-            server.Dispose();
+            await server.StopAsync();
             TestUtils.DeleteDirectory(TestUtils.MethodTestDir);
         }
 
diff --git a/test/Garnet.test/RespTests.cs b/test/Garnet.test/RespTests.cs
@@ -20,22 +20,22 @@ namespace Garnet.test
     [TestFixture]
     public class RespTests
     {
-        GarnetServer server;
+        GarnetApplication server;
         Random r;
 
         [SetUp]
-        public void Setup()
+        public async Task Setup()
         {
             r = new Random(674386);
             TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);
-            server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, disablePubSub: false);
-            server.Start();
+            server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, disablePubSub: false);
+            await server.RunAsync();
         }
 
         [TearDown]
-        public void TearDown()
+        public async Task TearDown()
         {
-            server.Dispose();
+            await server.StopAsync();
             TestUtils.DeleteDirectory(TestUtils.MethodTestDir);
         }
 
@@ -1359,13 +1359,13 @@ public void SingleDelete()
         }
 
         [Test]
-        public void SingleDeleteWithObjectStoreDisabled()
+        public async Task SingleDeleteWithObjectStoreDisabled()
         {
             TearDown();
 
             TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);
-            server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, DisableObjects: true);
-            server.Start();
+            server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, DisableObjects: true);
+            await server.RunAsync();
 
             var key = "delKey";
             var value = "1234";
@@ -1391,13 +1391,13 @@ private string GetRandomString(int len)
         }
 
         [Test]
-        public void SingleDeleteWithObjectStoreDisable_LTM()
+        public async Task SingleDeleteWithObjectStoreDisable_LTM()
         {
             TearDown();
 
             TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);
-            server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, lowMemory: true, DisableObjects: true);
-            server.Start();
+            server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, lowMemory: true, DisableObjects: true);
+            await server.RunAsync();
             using var redis = ConnectionMultiplexer.Connect(TestUtils.GetConfig());
             var db = redis.GetDatabase(0);
 
@@ -1431,14 +1431,14 @@ public void SingleDeleteWithObjectStoreDisable_LTM()
         }
 
         [Test]
-        public void MultiKeyDelete([Values] bool withoutObjectStore)
+        public async Task MultiKeyDelete([Values] bool withoutObjectStore)
         {
             if (withoutObjectStore)
             {
                 TearDown();
                 TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);
-                server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, DisableObjects: true);
-                server.Start();
+                server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, DisableObjects: true);
+                await server.RunAsync();
             }
 
             using var redis = ConnectionMultiplexer.Connect(TestUtils.GetConfig());
@@ -1499,14 +1499,14 @@ public void MultiKeyDeleteObjectStore()
         }
 
         [Test]
-        public void MultiKeyUnlink([Values] bool withoutObjectStore)
+        public async Task MultiKeyUnlink([Values] bool withoutObjectStore)
         {
             if (withoutObjectStore)
             {
                 TearDown();
                 TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);
-                server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, DisableObjects: true);
-                server.Start();
+                server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, DisableObjects: true);
+                await server.RunAsync();
             }
 
             using var redis = ConnectionMultiplexer.Connect(TestUtils.GetConfig());
@@ -1565,14 +1565,14 @@ public void MultiKeyUnlinkObjectStore()
         }
 
         [Test]
-        public void SingleExists([Values] bool withoutObjectStore)
+        public async Task SingleExists([Values] bool withoutObjectStore)
         {
             if (withoutObjectStore)
             {
                 TearDown();
                 TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);
-                server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, DisableObjects: true);
-                server.Start();
+                server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, DisableObjects: true);
+                await server.RunAsync();
             }
             using var redis = ConnectionMultiplexer.Connect(TestUtils.GetConfig());
             var db = redis.GetDatabase(0);
@@ -1830,14 +1830,14 @@ public void SingleRenameWithExpiry()
         }
 
         [Test]
-        public void SingleRenameKeyEdgeCase([Values] bool withoutObjectStore)
+        public async Task SingleRenameKeyEdgeCase([Values] bool withoutObjectStore)
         {
             if (withoutObjectStore)
             {
                 TearDown();
                 TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);
-                server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, DisableObjects: true);
-                server.Start();
+                server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, DisableObjects: true);
+                await server.RunAsync();
             }
             using var redis = ConnectionMultiplexer.Connect(TestUtils.GetConfig());
             var db = redis.GetDatabase(0);
@@ -3730,13 +3730,13 @@ public void HelloTest1()
         }
 
         [Test]
-        public void AsyncTest1()
+        public async Task AsyncTest1()
         {
             // Set up low-memory database
             TearDown();
             TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);
-            server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, lowMemory: true, DisableObjects: true);
-            server.Start();
+            server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, lowMemory: true, DisableObjects: true);
+            await server.RunAsync();
 
             string firstKey = null, firstValue = null, lastKey = null, lastValue = null;
 
diff --git a/test/Garnet.test/RespTlsTests.cs b/test/Garnet.test/RespTlsTests.cs
@@ -17,20 +17,20 @@ namespace Garnet.test
     [TestFixture]
     public class RespTlsTests
     {
-        GarnetServer server;
+        GarnetApplication server;
 
         [SetUp]
-        public void Setup()
+        public async Task Setup()
         {
             TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);
-            server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, EnableTLS: true);
-            server.Start();
+            server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, EnableTLS: true);
+            await server.RunAsync();
         }
 
         [TearDown]
-        public void TearDown()
+        public async Task TearDown()
         {
-            server.Dispose();
+            await server.StopAsync();
             TestUtils.DeleteDirectory(TestUtils.MethodTestDir);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -17,20 +17,20 @@ namespace Garnet.test`
`17`	`17`	`[TestFixture]`
`18`	`18`	`public class RespSetTest`
`19`	`19`	`{`
`20`		`- GarnetServer server;`
	`20`	`+ GarnetApplication server;`
`21`	`21`
`22`	`22`	`[SetUp]`
`23`		`- public void Setup()`
	`23`	`+ public async Task Setup()`
`24`	`24`	`{`
`25`	`25`	`TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);`
`26`		`- server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, lowMemory: true);`
`27`		`- server.Start();`
	`26`	`+ server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, lowMemory: true);`
	`27`	`+ await server.RunAsync();`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`[TearDown]`
`31`		`- public void TearDown()`
	`31`	`+ public async Task TearDown()`
`32`	`32`	`{`
`33`		`- server.Dispose();`
	`33`	`+ await server.StopAsync();`
`34`	`34`	`TestUtils.DeleteDirectory(TestUtils.MethodTestDir);`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -20,22 +20,22 @@ namespace Garnet.test`
`20`	`20`	`[TestFixture]`
`21`	`21`	`public class RespTests`
`22`	`22`	`{`
`23`		`- GarnetServer server;`
	`23`	`+ GarnetApplication server;`
`24`	`24`	`Random r;`
`25`	`25`
`26`	`26`	`[SetUp]`
`27`		`- public void Setup()`
	`27`	`+ public async Task Setup()`
`28`	`28`	`{`
`29`	`29`	`r = new Random(674386);`
`30`	`30`	`TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);`
`31`		`- server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, disablePubSub: false);`
`32`		`- server.Start();`
	`31`	`+ server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, disablePubSub: false);`
	`32`	`+ await server.RunAsync();`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`[TearDown]`
`36`		`- public void TearDown()`
	`36`	`+ public async Task TearDown()`
`37`	`37`	`{`
`38`		`- server.Dispose();`
	`38`	`+ await server.StopAsync();`
`39`	`39`	`TestUtils.DeleteDirectory(TestUtils.MethodTestDir);`
`40`	`40`	`}`
`41`	`41`
`@@ -1359,13 +1359,13 @@ public void SingleDelete()`
`1359`	`1359`	`}`
`1360`	`1360`
`1361`	`1361`	`[Test]`
`1362`		`- public void SingleDeleteWithObjectStoreDisabled()`
	`1362`	`+ public async Task SingleDeleteWithObjectStoreDisabled()`
`1363`	`1363`	`{`
`1364`	`1364`	`TearDown();`
`1365`	`1365`
`1366`	`1366`	`TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);`
`1367`		`- server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, DisableObjects: true);`
`1368`		`- server.Start();`
	`1367`	`+ server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, DisableObjects: true);`
	`1368`	`+ await server.RunAsync();`
`1369`	`1369`
`1370`	`1370`	`var key = "delKey";`
`1371`	`1371`	`var value = "1234";`
`@@ -1391,13 +1391,13 @@ private string GetRandomString(int len)`
`1391`	`1391`	`}`
`1392`	`1392`
`1393`	`1393`	`[Test]`
`1394`		`- public void SingleDeleteWithObjectStoreDisable_LTM()`
	`1394`	`+ public async Task SingleDeleteWithObjectStoreDisable_LTM()`
`1395`	`1395`	`{`
`1396`	`1396`	`TearDown();`
`1397`	`1397`
`1398`	`1398`	`TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);`
`1399`		`- server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, lowMemory: true, DisableObjects: true);`
`1400`		`- server.Start();`
	`1399`	`+ server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, lowMemory: true, DisableObjects: true);`
	`1400`	`+ await server.RunAsync();`
`1401`	`1401`	`using var redis = ConnectionMultiplexer.Connect(TestUtils.GetConfig());`
`1402`	`1402`	`var db = redis.GetDatabase(0);`
`1403`	`1403`
`@@ -1431,14 +1431,14 @@ public void SingleDeleteWithObjectStoreDisable_LTM()`
`1431`	`1431`	`}`
`1432`	`1432`
`1433`	`1433`	`[Test]`
`1434`		`- public void MultiKeyDelete([Values] bool withoutObjectStore)`
	`1434`	`+ public async Task MultiKeyDelete([Values] bool withoutObjectStore)`
`1435`	`1435`	`{`
`1436`	`1436`	`if (withoutObjectStore)`
`1437`	`1437`	`{`
`1438`	`1438`	`TearDown();`
`1439`	`1439`	`TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);`
`1440`		`- server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, DisableObjects: true);`
`1441`		`- server.Start();`
	`1440`	`+ server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, DisableObjects: true);`
	`1441`	`+ await server.RunAsync();`
`1442`	`1442`	`}`
`1443`	`1443`
`1444`	`1444`	`using var redis = ConnectionMultiplexer.Connect(TestUtils.GetConfig());`
`@@ -1499,14 +1499,14 @@ public void MultiKeyDeleteObjectStore()`
`1499`	`1499`	`}`
`1500`	`1500`
`1501`	`1501`	`[Test]`
`1502`		`- public void MultiKeyUnlink([Values] bool withoutObjectStore)`
	`1502`	`+ public async Task MultiKeyUnlink([Values] bool withoutObjectStore)`
`1503`	`1503`	`{`
`1504`	`1504`	`if (withoutObjectStore)`
`1505`	`1505`	`{`
`1506`	`1506`	`TearDown();`
`1507`	`1507`	`TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);`
`1508`		`- server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, DisableObjects: true);`
`1509`		`- server.Start();`
	`1508`	`+ server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, DisableObjects: true);`
	`1509`	`+ await server.RunAsync();`
`1510`	`1510`	`}`
`1511`	`1511`
`1512`	`1512`	`using var redis = ConnectionMultiplexer.Connect(TestUtils.GetConfig());`
`@@ -1565,14 +1565,14 @@ public void MultiKeyUnlinkObjectStore()`
`1565`	`1565`	`}`
`1566`	`1566`
`1567`	`1567`	`[Test]`
`1568`		`- public void SingleExists([Values] bool withoutObjectStore)`
	`1568`	`+ public async Task SingleExists([Values] bool withoutObjectStore)`
`1569`	`1569`	`{`
`1570`	`1570`	`if (withoutObjectStore)`
`1571`	`1571`	`{`
`1572`	`1572`	`TearDown();`
`1573`	`1573`	`TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);`
`1574`		`- server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, DisableObjects: true);`
`1575`		`- server.Start();`
	`1574`	`+ server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, DisableObjects: true);`
	`1575`	`+ await server.RunAsync();`
`1576`	`1576`	`}`
`1577`	`1577`	`using var redis = ConnectionMultiplexer.Connect(TestUtils.GetConfig());`
`1578`	`1578`	`var db = redis.GetDatabase(0);`
`@@ -1830,14 +1830,14 @@ public void SingleRenameWithExpiry()`
`1830`	`1830`	`}`
`1831`	`1831`
`1832`	`1832`	`[Test]`
`1833`		`- public void SingleRenameKeyEdgeCase([Values] bool withoutObjectStore)`
	`1833`	`+ public async Task SingleRenameKeyEdgeCase([Values] bool withoutObjectStore)`
`1834`	`1834`	`{`
`1835`	`1835`	`if (withoutObjectStore)`
`1836`	`1836`	`{`
`1837`	`1837`	`TearDown();`
`1838`	`1838`	`TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);`
`1839`		`- server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, DisableObjects: true);`
`1840`		`- server.Start();`
	`1839`	`+ server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, DisableObjects: true);`
	`1840`	`+ await server.RunAsync();`
`1841`	`1841`	`}`
`1842`	`1842`	`using var redis = ConnectionMultiplexer.Connect(TestUtils.GetConfig());`
`1843`	`1843`	`var db = redis.GetDatabase(0);`
`@@ -3730,13 +3730,13 @@ public void HelloTest1()`
`3730`	`3730`	`}`
`3731`	`3731`
`3732`	`3732`	`[Test]`
`3733`		`- public void AsyncTest1()`
	`3733`	`+ public async Task AsyncTest1()`
`3734`	`3734`	`{`
`3735`	`3735`	`// Set up low-memory database`
`3736`	`3736`	`TearDown();`
`3737`	`3737`	`TestUtils.DeleteDirectory(TestUtils.MethodTestDir, wait: true);`
`3738`		`- server = TestUtils.CreateGarnetServer(TestUtils.MethodTestDir, lowMemory: true, DisableObjects: true);`
`3739`		`- server.Start();`
	`3738`	`+ server = TestUtils.CreateGarnetApplication(TestUtils.MethodTestDir, lowMemory: true, DisableObjects: true);`
	`3739`	`+ await server.RunAsync();`
`3740`	`3740`
`3741`	`3741`	`string firstKey = null, firstValue = null, lastKey = null, lastValue = null;`
`3742`	`3742`