Add simpler Redis DB fixture

.github/workflows/build_and_test.yml

@@ -62,7 +62,7 @@ jobs:
           --results-directory ${{ env.ArtifactDirectory }}
 
     - name: Upload Test Results
-      if: ${{ github.event_name == 'pull_request' || github.ref == 'refs/heads/main' }}
+      if: ${{ always() && github.event_name == 'pull_request' || github.ref == 'refs/heads/main' }}
       uses: actions/upload-artifact@v4
       with:
         name: test-results
@@ -125,7 +125,7 @@ jobs:
           --results-directory ${{ env.ArtifactDirectory }}
 
     - name: Upload Test Results
-      if: ${{ github.event_name == 'pull_request' || github.ref == 'refs/heads/main' }}
+      if: ${{ always() && github.event_name == 'pull_request' || github.ref == 'refs/heads/main' }}
       uses: actions/upload-artifact@v4
       with:
         name: cosmos-test-results

src/Ephemerally.Redis.Xunit/RedisDatabaseFixture.cs

@@ -0,0 +1,43 @@
+using StackExchange.Redis;
+using Xunit;
+
+namespace Ephemerally.Redis.Xunit;
+
+public class RedisDatabaseFixture<TMultiplexerFixture>(TMultiplexerFixture multiplexerFixture)
+    : RedisDatabaseFixture(multiplexerFixture.Multiplexer)
+    where TMultiplexerFixture : IRedisMultiplexerFixture;
+
+public class RedisDatabaseFixture : IAsyncLifetime
+{
+    private bool _disposed;
+
+    private readonly IConnectionMultiplexer _multiplexer;
+
+    private readonly Lazy<Task<IEphemeralRedisDatabase>> _database;
+
+    public IEphemeralRedisDatabase Database => _database.Value.Result;
+
+    public RedisDatabaseFixture()
+    {
+        _database = new(CreateDatabaseAsync);
+    }
+
+    protected RedisDatabaseFixture(IConnectionMultiplexer multiplexer) : this()
+    {
+        _multiplexer = multiplexer;
+    }
+
+    protected virtual Task<IEphemeralRedisDatabase> CreateDatabaseAsync() =>
+        Task.FromResult(_multiplexer.GetEphemeralDatabase());
+
+    public async Task InitializeAsync() => await _database.Value;
+
+    public async Task DisposeAsync()
+    {
+        if (_disposed || !_database.IsValueCreated) return;
+
+        _disposed = true;
+
+        await Database.DisposeAsync();
+    }
+}

src/Ephemerally.Redis.Xunit/RedisMultiplexerFixture.cs

@@ -3,11 +3,16 @@
 
 namespace Ephemerally.Redis.Xunit;
 
+public interface IRedisMultiplexerFixture
+{
+    IConnectionMultiplexer Multiplexer { get; }
+}
+
 public class RedisMultiplexerFixture<TEphemeralRedisInstance>()
     : RedisMultiplexerFixture(new TEphemeralRedisInstance())
     where TEphemeralRedisInstance : IRedisInstanceFixture, new();
 
-public class RedisMultiplexerFixture : IAsyncLifetime, IAsyncDisposable
+public class RedisMultiplexerFixture : IRedisMultiplexerFixture, IAsyncLifetime, IAsyncDisposable
 {
     private bool _disposed;
 

tests/Ephemerally.Redis.Tests/FixedSizeObjectPoolTests.cs

@@ -3,11 +3,12 @@
 
 namespace Ephemerally.Redis.Tests;
 
+[Collection(FixedSizeObjectPoolTestCollection.Name)]
 public class FixedSizeObjectPoolTests
 {
-    private const int TestTimeout = 2;
+    private const int TestTimeout = 5;
 
-    [Fact]
+    [Fact(Timeout = TestTimeout)]
     public void Get_returns_object_from_pool()
     {
         // Arrange
@@ -162,4 +163,10 @@ public async Task GetWhere_should_wait_for_first_available_matching_object()
         actual.ShouldBe(2);
         await task1;
     }
+}
+
+[CollectionDefinition(Name, DisableParallelization = true)]
+public class FixedSizeObjectPoolTestCollection
+{
+    public const string Name = nameof(FixedSizeObjectPoolTestCollection);
 }

tests/Ephemerally.Redis.Tests/Fixtures/RedisDatabaseFixtureTests.cs

@@ -0,0 +1,25 @@
+using Ephemerally.Redis.Xunit;
+using Shouldly;
+
+namespace Ephemerally.Redis.Tests.Fixtures;
+
+[Collection(RedisDatabaseFixtureTestCollection.Name)]
+public class RedisDatabaseFixtureTests(RedisDatabaseFixture<RedisDatabaseFixtureTestCollectionFixture> databaseFixture)
+    : IClassFixture<RedisDatabaseFixture<RedisDatabaseFixtureTestCollectionFixture>>
+{
+    [Fact]
+    public void Database_should_not_be_null()
+    {
+        databaseFixture.Database.ShouldNotBeNull();
+    }
+}
+
+[CollectionDefinition(Name)]
+public class RedisDatabaseFixtureTestCollection
+    : ICollectionFixture<RedisDatabaseFixtureTestCollectionFixture>
+{
+    public const string Name = nameof(RedisDatabaseFixtureTestCollection);
+}
+
+public class RedisDatabaseFixtureTestCollectionFixture
+    : PooledEphemeralRedisMultiplexerFixture<RedisInstanceFixture7>;