Refactoring

Author: hishamco

test/OrchardCoreContrib.Garnet.Tests/Extensions/GarnetClientExtensionsTests.cs

@@ -9,7 +9,7 @@ public class GarnetClientExtensionsTests : TestBase
 
     public override async Task InitializeAsync()
     {
-        _garnetClient = await CreateClientAsync();
+        _garnetClient = (await Utilities.CreateGarnetServiceAsync()).Client;
 
         await _garnetClient.ExecuteForStringResultAsync("SADD", ["sets_key1", "foo", "bar", "baz"]);
         await _garnetClient.KeyDeleteAsync(["sets_key2"]);
@@ -44,15 +44,4 @@ public async Task AddSetElements()
         Assert.NotEmpty(values);
         Assert.Equal(["foo", "bar"], values);
     }
-
-    private static async Task<GarnetClient> CreateClientAsync()
-    {
-        var garnetOptions = new GarnetOptions();
-
-        var garnetClient = new GarnetClient(garnetOptions.Host, garnetOptions.Port);
-
-        await garnetClient.ConnectAsync();
-
-        return garnetClient;
-    }
 }

test/OrchardCoreContrib.Garnet.Tests/GarnetCacheTests.cs

@@ -1,7 +1,3 @@
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Moq;
 using OrchardCoreContrib.Garnet.Services;
 using System.Text;
 
@@ -13,7 +9,7 @@ public class GarnetCacheTests : TestBase
 
     public override async Task InitializeAsync()
     {
-        _garnetService = await CreateGarnetServiceAsync();
+        _garnetService = await Utilities.CreateGarnetServiceAsync();
 
         await _garnetService.Client.KeyDeleteAsync(["key1", "key2", "key3", "key4"]);
     }
@@ -133,16 +129,4 @@ public async Task RefreshValueAsync()
         // Act & Assert
         await Assert.ThrowsAsync<NotImplementedException>(async () => await cache.RefreshAsync("key8"));
     }
-
-    private static async Task<IGarnetService> CreateGarnetServiceAsync()
-    {
-        var garnetClientFactory = new GarnetClientFactory(
-            Mock.Of<IHostApplicationLifetime>(),
-            Mock.Of<ILogger<GarnetClientFactory>>());
-        var garnetService = new GarnetService(garnetClientFactory, Options.Create(new GarnetOptions()));
-
-        await garnetService.ConnectAsync();
-
-        return garnetService;
-    }
 }

test/OrchardCoreContrib.Garnet.Tests/GarnetTagCacheTests.cs

@@ -1,8 +1,4 @@
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
-using Microsoft.Extensions.Options;
-using Moq;
+using Microsoft.Extensions.Logging.Abstractions;
 using OrchardCore.Environment.Shell;
 using OrchardCoreContrib.Garnet.Services;
 
@@ -17,7 +13,7 @@ public class GarnetTagCacheTests : TestBase
 
     public override async Task InitializeAsync()
     {
-        _garnetService = await CreateGarnetServiceAsync();
+        _garnetService = await Utilities.CreateGarnetServiceAsync();
 
         _garnetTagCache = new GarnetTagCache(
             _garnetService,
@@ -80,16 +76,4 @@ public async Task RemoveTaggedItem()
         var result = await _garnetService.Client.SetGetAsync($"{_garnetService.InstancePrefix}{_shellSettings.Name}:Tag:{tag}");
         Assert.Empty(result);
     }
-
-    private static async Task<IGarnetService> CreateGarnetServiceAsync()
-    {
-        var garnetClientFactory = new GarnetClientFactory(
-            Mock.Of<IHostApplicationLifetime>(),
-            Mock.Of<ILogger<GarnetClientFactory>>());
-        var garnetService = new GarnetService(garnetClientFactory, Options.Create(new GarnetOptions()));
-
-        await garnetService.ConnectAsync();
-
-        return garnetService;
-    }
 }

test/OrchardCoreContrib.Garnet.Tests/Utilities.cs

@@ -0,0 +1,22 @@
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Moq;
+using OrchardCoreContrib.Garnet.Services;
+
+namespace OrchardCoreContrib.Garnet.Tests;
+
+public static class Utilities
+{
+    public static async Task<IGarnetService> CreateGarnetServiceAsync()
+    {
+        var garnetClientFactory = new GarnetClientFactory(
+            Mock.Of<IHostApplicationLifetime>(),
+            Mock.Of<ILogger<GarnetClientFactory>>());
+        var garnetService = new GarnetService(garnetClientFactory, Options.Create(new GarnetOptions()));
+
+        await garnetService.ConnectAsync();
+
+        return garnetService;
+    }
+}