wip: still refactoring cosmos fixtures

src/Ephemerally.Azure.Cosmos.Xunit/CosmosClientFixture.cs

@@ -1,16 +1,8 @@
 using Microsoft.Azure.Cosmos;
-using System.Diagnostics.CodeAnalysis;
-using Ephemerally.Xunit;
-using Xunit;
 
 namespace Ephemerally.Azure.Cosmos.Xunit;
 
-[SuppressMessage("ReSharper", "UseConfigureAwaitFalse")]
-public class CosmosClientFixture : SubjectFixture<CosmosClient>
+public abstract class CosmosClientFixture : CosmosSubjectFixture<CosmosClient>
 {
     public CosmosClient Client => GetOrCreateSubjectAsync().Result;
-
-    protected override Task<CosmosClient> CreateSubjectAsync() => Task.FromResult(CosmosEmulator.GetClient());
-
-    protected override Task DisposeSubjectAsync() => SafeCosmosDisposeAsync(GetOrCreateSubjectAsync);
 }

src/Ephemerally.Azure.Cosmos.Xunit/CosmosContainerFixture.cs

@@ -0,0 +1,17 @@
+using Ephemerally.Xunit;
+using Microsoft.Azure.Cosmos;
+
+namespace Ephemerally.Azure.Cosmos.Xunit;
+
+public abstract class CosmosContainerFixture
+    : CosmosContainerFixture<Container>;
+
+public abstract class CosmosContainerFixture<TContainer>
+    : CosmosSubjectFixture<TContainer>,
+        ISubjectFixture<Container> where TContainer : Container
+{
+    Task<Container> ISubjectFixture<Container>.GetOrCreateSubjectAsync() =>
+        GetOrCreateSubjectAsync().ContinueWith(Container (x) => x.Result);
+
+    public TContainer Container => GetOrCreateSubjectAsync().Result;
+}

src/Ephemerally.Azure.Cosmos.Xunit/CosmosDatabaseFixture.cs

@@ -0,0 +1,17 @@
+using Ephemerally.Xunit;
+using Microsoft.Azure.Cosmos;
+
+namespace Ephemerally.Azure.Cosmos.Xunit;
+
+public abstract class CosmosDatabaseFixture
+    : CosmosDatabaseFixture<Database>;
+
+public abstract class CosmosDatabaseFixture<TDatabase>
+    : CosmosSubjectFixture<TDatabase>,
+        ISubjectFixture<Database> where TDatabase : Database
+{
+    Task<Database> ISubjectFixture<Database>.GetOrCreateSubjectAsync() =>
+        GetOrCreateSubjectAsync().ContinueWith(Database (x) => x.Result);
+
+    public TDatabase Database => GetOrCreateSubjectAsync().Result;
+}

src/Ephemerally.Azure.Cosmos.Xunit/CosmosSubjectFixture.cs

@@ -0,0 +1,8 @@
+using Ephemerally.Xunit;
+
+namespace Ephemerally.Azure.Cosmos.Xunit;
+
+public abstract class CosmosSubjectFixture<TSubject> : SubjectFixture<TSubject> where TSubject : class
+{
+    protected override Task DisposeSubjectAsync() => SafeCosmosDisposeAsync(GetOrCreateSubjectAsync);
+}

src/Ephemerally.Azure.Cosmos.Xunit/DefaultFixtures.cs

@@ -0,0 +1,14 @@
+using Microsoft.Azure.Cosmos;
+
+namespace Ephemerally.Azure.Cosmos.Xunit;
+
+public class DefaultCosmosEmulatorClientFixture : CosmosClientFixture
+{
+    protected override Task<CosmosClient> CreateSubjectAsync() => Task.FromResult(CosmosEmulator.GetClient());
+}
+
+public class DefaultEphemeralCosmosDatabaseFixture()
+    : EphemeralCosmosDatabaseFixture(new DefaultCosmosEmulatorClientFixture());
+
+public class DefaultEphemeralCosmosContainerFixture()
+    : EphemeralCosmosContainerFixture(new DefaultEphemeralCosmosDatabaseFixture());

src/Ephemerally.Azure.Cosmos.Xunit/DependentSubjectFixture.cs

@@ -0,0 +1,53 @@
+using System.Diagnostics.CodeAnalysis;
+using Ephemerally.Xunit;
+
+namespace Ephemerally.Azure.Cosmos.Xunit;
+
+[SuppressMessage("ReSharper", "UseConfigureAwaitFalse")]
+public abstract class DependentSubjectFixture<TSubject> : ISubjectFixture<TSubject>
+{
+    private readonly ISubjectFixture<TSubject> _implementation;
+    private readonly ISubjectFixture[] _managedFixtures;
+
+    protected DependentSubjectFixture(
+        ISubjectFixture<TSubject> implementation,
+        params ISubjectFixture[] managedFixtures)
+    {
+        _implementation = implementation;
+        _managedFixtures = managedFixtures;
+    }
+
+    public Task<TSubject> GetOrCreateSubjectAsync() => _implementation.GetOrCreateSubjectAsync();
+
+    public Task InitializeAsync() => _implementation.InitializeAsync();
+
+    public async Task DisposeAsync()
+    {
+        try
+        {
+            await _implementation.DisposeAsync();
+        }
+        finally
+        {
+            var exceptions = new List<Exception>();
+            await Task.WhenAll(_managedFixtures.Select(async x =>
+                {
+                    try
+                    {
+                        await x.DisposeAsync();
+                    }
+                    catch (Exception ex)
+                    {
+                        exceptions.Add(ex);
+                    }
+                }
+            ));
+            if (exceptions.Count > 0)
+            {
+#pragma warning disable CA2219
+                throw new AggregateException(exceptions);
+#pragma warning restore CA2219
+            }
+        }
+    }
+}

src/Ephemerally.Azure.Cosmos.Xunit/EphemeralCosmosContainerFixture.cs

@@ -6,15 +6,11 @@ namespace Ephemerally.Azure.Cosmos.Xunit;
 
 [SuppressMessage("ReSharper", "UseConfigureAwaitFalse")]
 public class EphemeralCosmosContainerFixture(ISubjectFixture<Database> cosmosDatabaseFixture)
-    : ConsumingSubjectFixture<EphemeralCosmosContainer>
+    : CosmosContainerFixture<EphemeralCosmosContainer>
 {
-    public EphemeralCosmosContainer Container => GetOrCreateSubjectAsync().Result;
-
     protected override async Task<EphemeralCosmosContainer> CreateSubjectAsync()
     {
         var database = await cosmosDatabaseFixture.GetOrCreateSubjectAsync();
         return await database.CreateEphemeralContainerAsync();
     }
-
-    protected override Task DisposeSubjectAsync() => SafeCosmosDisposeAsync(GetOrCreateSubjectAsync);
 }

src/Ephemerally.Azure.Cosmos.Xunit/EphemeralCosmosDatabaseFixture.cs

@@ -6,15 +6,11 @@ namespace Ephemerally.Azure.Cosmos.Xunit;
 
 [SuppressMessage("ReSharper", "UseConfigureAwaitFalse")]
 public class EphemeralCosmosDatabaseFixture(ISubjectFixture<CosmosClient> cosmosClientFixture)
-    : ConsumingSubjectFixture<EphemeralCosmosDatabase>
+    : CosmosDatabaseFixture<EphemeralCosmosDatabase>
 {
-    public EphemeralCosmosDatabase Database => GetOrCreateSubjectAsync().Result;
-
     protected override async Task<EphemeralCosmosDatabase> CreateSubjectAsync()
     {
         var client = await cosmosClientFixture.GetOrCreateSubjectAsync();
         return await client.CreateEphemeralDatabaseAsync();
     }
-
-    protected override Task DisposeSubjectAsync() => SafeCosmosDisposeAsync(GetOrCreateSubjectAsync);
 }

tests/Ephemerally.Azure.Cosmos.Tests/Fixtures/CosmosClientFixtureTests.cs

@@ -0,0 +1,23 @@
+using Ephemerally.Azure.Cosmos.Xunit;
+using Shouldly;
+
+namespace Ephemerally.Azure.Cosmos.Tests.Fixtures;
+
+public class DefaultCosmosEmulatorClientFixtureTests : CosmosClientFixtureTests<DefaultCosmosEmulatorClientFixture>;
+
+public abstract class CosmosClientFixtureTests<TFixture> where TFixture : CosmosClientFixture, new()
+{
+    [Test]
+    public async Task Fixture_provides_usable_cosmos_client()
+    {
+        // Arrange
+        await using var fixture = new TFixture();
+        await fixture.InitializeAsync();
+
+        // Act
+        var canConnect = await fixture.Client.CanConnectAsync();
+
+        // Assert
+        canConnect.ShouldBeTrue();
+    }
+}

tests/Ephemerally.Azure.Cosmos.Tests/Fixtures/CosmosDatabaseFixtureTests.cs

@@ -0,0 +1,8 @@
+using Ephemerally.Azure.Cosmos.Xunit;
+
+namespace Ephemerally.Azure.Cosmos.Tests.Fixtures;
+
+public abstract class CosmosDatabaseFixtureTests<TFixture> where TFixture : EphemeralCosmosDatabaseFixture
+{
+
+}