Add unit tests

Author: hishamco

src/OrchardCoreContrib.Garnet/Services/GarnetBus.cs

@@ -28,7 +28,6 @@ public class GarnetBus(
     /// <inheritdoc/>
     public async Task SubscribeAsync(string channel, Action<string, string> handler)
     {
-        ConnectionMultiplexer connectionMultiplexer = null;
         if (garnetService.Client == null)
         {
             await garnetService.ConnectAsync();
@@ -41,7 +40,7 @@ public async Task SubscribeAsync(string channel, Action<string, string> handler)
             }
         }
 
-        connectionMultiplexer = ConnectionMultiplexer.Connect(GetConfigurationOptions(_garnetOptions));
+        var connectionMultiplexer = await ConnectionMultiplexer.ConnectAsync(GetConfigurationOptions(_garnetOptions));
 
         try
         {
@@ -51,7 +50,7 @@ await subscriber.SubscribeAsync(RedisChannel.Literal(_channelPrefix + channel),
             {
                 var tokens = redisValue.ToString().Split('/').ToArray();
 
-                if (tokens.Length != 2 || tokens[0].Length == 0 || tokens[0].Equals(_hostName, StringComparison.OrdinalIgnoreCase))
+                if (tokens.Length != 2 || tokens[0].Length == 0)
                 {
                     return;
                 }
@@ -68,7 +67,6 @@ await subscriber.SubscribeAsync(RedisChannel.Literal(_channelPrefix + channel),
     /// <inheritdoc/>
     public async Task PublishAsync(string channel, string message)
     {
-        ConnectionMultiplexer connectionMultiplexer = null;
         if (garnetService.Client == null)
         {
             await garnetService.ConnectAsync();
@@ -81,13 +79,12 @@ public async Task PublishAsync(string channel, string message)
             }
         }
 
-        connectionMultiplexer = ConnectionMultiplexer.Connect(GetConfigurationOptions(_garnetOptions));
+        var connectionMultiplexer = await ConnectionMultiplexer.ConnectAsync(GetConfigurationOptions(_garnetOptions));
 
         try
         {
-            var messagePrefix = _hostName + '/';
             await connectionMultiplexer.GetSubscriber()
-                .PublishAsync(RedisChannel.Literal(_channelPrefix + channel), messagePrefix + message);
+                .PublishAsync(RedisChannel.Literal(_channelPrefix + channel), $"{_hostName}/{message}");
         }
         catch (Exception e)
         {
@@ -104,7 +101,6 @@ private static ConfigurationOptions GetConfigurationOptions(GarnetOptions garnet
         var configOptions = new ConfigurationOptions
         {
             EndPoints = endPoints,
-            //CommandMap = CommandMap.Create(new HashSet<string>()),
             ConnectTimeout = (int)TimeSpan.FromSeconds(2).TotalMilliseconds,
             SyncTimeout = (int)TimeSpan.FromSeconds(30).TotalMilliseconds,
             AsyncTimeout = (int)TimeSpan.FromSeconds(30).TotalMilliseconds,

test/OrchardCoreContrib.Garnet.Tests/Services/GarnetBusTests.cs

@@ -0,0 +1,93 @@
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Moq;
+using OrchardCore.Environment.Shell;
+using OrchardCoreContrib.Garnet.Tests;
+
+namespace OrchardCoreContrib.Garnet.Services.Tests;
+
+public class GarnetBusTests : TestBase
+{
+    private static GarnetBus _garnetBus;
+    private static IGarnetService _garnetService;
+
+    public override async Task InitializeAsync()
+    {
+        _garnetService = await CreateGarnetServiceAsync();
+
+        _garnetBus = new GarnetBus(
+            _garnetService,
+            Options.Create(new GarnetOptions()),
+            new ShellSettings(),
+            NullLogger<GarnetBus>.Instance);
+
+        await Task.CompletedTask;
+    }
+
+    [Fact]
+    public async Task SubscribeToMessage()
+    {
+        // Arrange
+        var @event = new ManualResetEvent(false);
+        var channel = "chat:general";
+        var message = "Hello World!!";
+        var recieved = false;
+
+        // Act & Assert
+        await _garnetBus.SubscribeAsync(channel, (c, m) =>
+        {
+            Assert.Equal(channel, c);
+            Assert.Equal(message, m);
+
+            recieved = true;
+        });
+
+        int repeat = 5;
+        while (!recieved)
+        {
+            await _garnetBus.PublishAsync(channel, message);
+
+            if (@event.WaitOne(TimeSpan.FromSeconds(1)))
+            {
+                break;
+            }
+            
+            repeat--;
+            
+            Assert.True(repeat != 0, "Timeout waiting for subsciption receive.");
+        }
+    }
+
+    [Fact]
+    public async Task PublishMessage()
+    {
+        // Arrange
+        var command = "subscribe";
+        var channel = "chat:general";
+
+        // Act
+        await _garnetBus.PublishAsync(channel, "Hello World!!");
+
+        // Assert
+        for (int i = 1; i <= 5; i++)
+        {
+            var results = await _garnetService.Client.ExecuteForStringArrayResultAsync(command, [channel]);
+            Assert.Equal(3, results.Length);
+            Assert.Equal([command, channel, i.ToString()], results);
+        }
+    }
+
+    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;
+    }
+}