Use DbContainerFixture for MariaDbContainerTest

Author: 0xced

tests/Testcontainers.MariaDb.Tests/MariaDbContainerTest.cs

@@ -1,30 +1,20 @@
 namespace Testcontainers.MariaDb;
 
-public abstract class MariaDbContainerTest : IAsyncLifetime
+public abstract class MariaDbContainerTest
 {
-    private readonly MariaDbContainer _mariaDbContainer;
+    private readonly MariaDbFixture _mariaDbFixture;
 
-    protected MariaDbContainerTest(MariaDbContainer mariaDbContainer)
+    protected MariaDbContainerTest(MariaDbFixture fixture)
     {
-        _mariaDbContainer = mariaDbContainer;
-    }
-
-    public Task InitializeAsync()
-    {
-        return _mariaDbContainer.StartAsync();
-    }
-
-    public Task DisposeAsync()
-    {
-        return _mariaDbContainer.DisposeAsync().AsTask();
+        _mariaDbFixture = fixture;
     }
 
     [Fact]
     [Trait(nameof(DockerCli.DockerPlatform), nameof(DockerCli.DockerPlatform.Linux))]
     public void ConnectionStateReturnsOpen()
     {
         // Given
-        using DbConnection connection = new MySqlConnection(_mariaDbContainer.GetConnectionString());
+        using DbConnection connection = _mariaDbFixture.CreateDbConnection();
 
         // When
         connection.Open();
@@ -41,28 +31,48 @@ public async Task ExecScriptReturnsSuccessful()
         const string scriptContent = "SELECT 1;";
 
         // When
-        var execResult = await _mariaDbContainer.ExecScriptAsync(scriptContent)
+        var execResult = await _mariaDbFixture.Container.ExecScriptAsync(scriptContent)
             .ConfigureAwait(false);
 
         // When
         Assert.True(0L.Equals(execResult.ExitCode), execResult.Stderr);
     }
 
     [UsedImplicitly]
-    public sealed class MariaDbUserConfiguration : MariaDbContainerTest
+    public sealed class MariaDbUserConfiguration : MariaDbContainerTest, IClassFixture<MariaDbFixture>
     {
-        public MariaDbUserConfiguration()
-            : base(new MariaDbBuilder().Build())
+        public MariaDbUserConfiguration(MariaDbFixture fixture)
+            : base(fixture)
         {
         }
     }
 
     [UsedImplicitly]
-    public sealed class MariaDbRootConfiguration : MariaDbContainerTest
+    public sealed class MariaDbRootConfiguration : MariaDbContainerTest, IClassFixture<MariaDbRootUserFixture>
+    {
+        public MariaDbRootConfiguration(MariaDbRootUserFixture fixture)
+            : base(fixture)
+        {
+        }
+    }
+
+    public class MariaDbFixture : DbContainerFixture<MariaDbBuilder, MariaDbContainer>
     {
-        public MariaDbRootConfiguration()
-            : base(new MariaDbBuilder().WithUsername("root").Build())
+        public MariaDbFixture(IMessageSink messageSink)
+            : base(messageSink)
         {
         }
+
+        public override DbProviderFactory DbProviderFactory => MySqlConnectorFactory.Instance;
+    }
+
+    public class MariaDbRootUserFixture : MariaDbFixture
+    {
+        public MariaDbRootUserFixture(IMessageSink messageSink)
+            : base(messageSink)
+        {
+        }
+
+        protected override MariaDbBuilder Configure(MariaDbBuilder builder) => builder.WithUsername("root");
     }
 }

tests/Testcontainers.MariaDb.Tests/Testcontainers.MariaDb.Tests.csproj

@@ -13,6 +13,7 @@
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="$(SolutionDir)src/Testcontainers.MariaDb/Testcontainers.MariaDb.csproj"/>
+        <ProjectReference Include="$(SolutionDir)src/Testcontainers.Xunit/Testcontainers.Xunit.csproj" />
         <ProjectReference Include="$(SolutionDir)tests/Testcontainers.Commons/Testcontainers.Commons.csproj"/>
     </ItemGroup>
 </Project>

tests/Testcontainers.MariaDb.Tests/Usings.cs

@@ -2,6 +2,8 @@
 global using System.Data.Common;
 global using System.Threading.Tasks;
 global using DotNet.Testcontainers.Commons;
+global using DotNet.Testcontainers.Xunit;
 global using JetBrains.Annotations;
 global using MySqlConnector;
-global using Xunit;
+global using Xunit;
+global using Xunit.Abstractions;