Use ContainerTest for MongoDbContainerTest

Author: 0xced

tests/Testcontainers.MongoDb.Tests/MongoDbContainerTest.cs

@@ -1,30 +1,18 @@
 namespace Testcontainers.MongoDb;
 
-public abstract class MongoDbContainerTest : IAsyncLifetime
+public abstract class MongoDbContainerTest : ContainerTest<MongoDbBuilder, MongoDbContainer>
 {
-    private readonly MongoDbContainer _mongoDbContainer;
-
-    private MongoDbContainerTest(MongoDbContainer mongoDbContainer)
-    {
-        _mongoDbContainer = mongoDbContainer;
-    }
-
-    public Task InitializeAsync()
-    {
-        return _mongoDbContainer.StartAsync();
-    }
-
-    public Task DisposeAsync()
+    protected MongoDbContainerTest(ITestOutputHelper testOutputHelper, Func<MongoDbBuilder, MongoDbBuilder> configure = null)
+        : base(testOutputHelper, configure)
     {
-        return _mongoDbContainer.DisposeAsync().AsTask();
     }
 
     [Fact]
     [Trait(nameof(DockerCli.DockerPlatform), nameof(DockerCli.DockerPlatform.Linux))]
     public void ConnectionStateReturnsOpen()
     {
         // Given
-        var client = new MongoClient(_mongoDbContainer.GetConnectionString());
+        var client = new MongoClient(Container.GetConnectionString());
 
         // When
         using var databases = client.ListDatabases();
@@ -41,7 +29,7 @@ public async Task ExecScriptReturnsSuccessful()
         const string scriptContent = "printjson(db.adminCommand({listDatabases:1,nameOnly:true,filter:{\"name\":/^admin/}}));";
 
         // When
-        var execResult = await _mongoDbContainer.ExecScriptAsync(scriptContent)
+        var execResult = await Container.ExecScriptAsync(scriptContent)
             .ConfigureAwait(false);
 
         // When
@@ -51,35 +39,35 @@ public async Task ExecScriptReturnsSuccessful()
     [UsedImplicitly]
     public sealed class MongoDbDefaultConfiguration : MongoDbContainerTest
     {
-        public MongoDbDefaultConfiguration()
-            : base(new MongoDbBuilder().Build())
+        public MongoDbDefaultConfiguration(ITestOutputHelper testOutputHelper)
+            : base(testOutputHelper)
         {
         }
     }
 
     [UsedImplicitly]
     public sealed class MongoDbNoAuthConfiguration : MongoDbContainerTest
     {
-        public MongoDbNoAuthConfiguration()
-            : base(new MongoDbBuilder().WithUsername(string.Empty).WithPassword(string.Empty).Build())
+        public MongoDbNoAuthConfiguration(ITestOutputHelper testOutputHelper)
+            : base(testOutputHelper, builder => builder.WithUsername(string.Empty).WithPassword(string.Empty))
         {
         }
     }
 
     [UsedImplicitly]
     public sealed class MongoDbV5Configuration : MongoDbContainerTest
     {
-        public MongoDbV5Configuration()
-            : base(new MongoDbBuilder().WithImage("mongo:5.0").Build())
+        public MongoDbV5Configuration(ITestOutputHelper testOutputHelper)
+            : base(testOutputHelper, builder => builder.WithImage("mongo:5.0"))
         {
         }
     }
 
     [UsedImplicitly]
     public sealed class MongoDbV4Configuration : MongoDbContainerTest
     {
-        public MongoDbV4Configuration()
-            : base(new MongoDbBuilder().WithImage("mongo:4.4").Build())
+        public MongoDbV4Configuration(ITestOutputHelper testOutputHelper)
+            : base(testOutputHelper, builder => builder.WithImage("mongo:4.4"))
         {
         }
     }

tests/Testcontainers.MongoDb.Tests/Testcontainers.MongoDb.Tests.csproj

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

tests/Testcontainers.MongoDb.Tests/Usings.cs

@@ -1,5 +1,8 @@
+global using System;
 global using System.Threading.Tasks;
 global using DotNet.Testcontainers.Commons;
+global using DotNet.Testcontainers.Xunit;
 global using JetBrains.Annotations;
 global using MongoDB.Driver;
-global using Xunit;
+global using Xunit;
+global using Xunit.Abstractions;