Skip to content

Refactor Redis Fixtures #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Confusingboat wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Refactor Redis Fixtures #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Ephemerally.Redis.Xunit/Ephemerally.Redis.Xunit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

<ItemGroup>
<ProjectReference Include="..\Ephemerally.Redis\Ephemerally.Redis.csproj" />
<ProjectReference Include="..\Ephemerally.Xunit\Ephemerally.Xunit.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
23 changes: 8 additions & 15 deletions src/Ephemerally.Redis.Xunit/RedisMultiplexerFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using StackExchange.Redis;
using Ephemerally.Xunit;
using StackExchange.Redis;
using Xunit;

namespace Ephemerally.Redis.Xunit;
Expand All @@ -12,34 +13,26 @@ public class RedisMultiplexerFixture<TEphemeralRedisInstance>()
: RedisMultiplexerFixture(new TEphemeralRedisInstance())
where TEphemeralRedisInstance : IRedisInstanceFixture, new();

public class RedisMultiplexerFixture : IRedisMultiplexerFixture, IAsyncLifetime, IAsyncDisposable
public class RedisMultiplexerFixture(ISubjectFixture<IRedisInstance> redisInstanceFixture)
: SubjectFixture<IConnectionMultiplexer>, IRedisMultiplexerFixture, IAsyncLifetime, IAsyncDisposable
{
private bool _disposed;

private readonly IRedisInstanceFixture _redisInstanceFixture;
private readonly Lazy<Task<IConnectionMultiplexer>> _multiplexer;
protected ISubjectFixture<IRedisInstance> RedisInstanceFixture { get; } = redisInstanceFixture;

public IConnectionMultiplexer Multiplexer => _multiplexer.Value.Result;

protected Task<IConnectionMultiplexer> GetMultiplexer() => _multiplexer.Value;
public IConnectionMultiplexer Multiplexer => GetOrCreateSubjectAsync().Result;

public RedisMultiplexerFixture() : this(UnmanagedDefaultLocalRedisInstanceFixture.DefaultLocalRedisInstanceFixture) { }

protected RedisMultiplexerFixture(IRedisInstanceFixture redisInstanceFixture)
{
_redisInstanceFixture = redisInstanceFixture;
_multiplexer = new Lazy<Task<IConnectionMultiplexer>>(CreateMultiplexerAsync);
}

protected virtual async Task<IConnectionMultiplexer> CreateMultiplexerAsync() =>
protected override async Task<IConnectionMultiplexer> CreateSubjectAsync() =>
await ConnectionMultiplexer.ConnectAsync(_redisInstanceFixture.ConnectionString);

public virtual async Task InitializeAsync()
{
await _redisInstanceFixture.InitializeAsync();
}

public virtual async Task DisposeAsync()
public override async Task DisposeAsync()
{
if (_disposed) return;
_disposed = true;
Expand Down