Try to fix tests

Author: teoadal

src/Storage.Tests/Storage.Tests.csproj

@@ -17,7 +17,7 @@
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Testcontainers.Minio" Version="3.8.0" />
+        <PackageReference Include="Testcontainers" Version="3.8.0" />
         <PackageReference Include="xunit" Version="2.7.1" />
         <PackageReference Include="JunitXml.TestLogger" Version="3.1.12" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">

src/Storage.Tests/Utils/StorageFixture.cs

@@ -1,5 +1,5 @@
 using AutoFixture;
-using Testcontainers.Minio;
+using DotNet.Testcontainers.Containers;
 
 namespace Storage.Tests.Utils;
 
@@ -9,7 +9,7 @@ public sealed class StorageFixture : IDisposable, IAsyncDisposable
 
 	private const int DefaultByteArraySize = 1 * 1024 * 1024; // 7Mb
 
-	private readonly MinioContainer? _container;
+	private readonly IContainer? _container;
 	private Fixture? _fixture;
 
 	public StorageFixture()

src/Storage.Tests/Utils/TestHelper.cs

@@ -1,18 +1,20 @@
 using System.Globalization;
-using Testcontainers.Minio;
+using DotNet.Testcontainers.Builders;
+using DotNet.Testcontainers.Containers;
 
 namespace Storage.Tests.Utils;
 
 public static class TestHelper
 {
+	public const int MinioInternalPort = 9000;
 	public const string SecretKey = "ChangeMe123";
 	public const string Username = "ROOTUSER";
 
-	public static S3Settings CreateSettings(MinioContainer? container = null)
+	public static S3Settings CreateSettings(IContainer? container = null)
 	{
 		var environmentPort = Environment.GetEnvironmentVariable("STORAGE_PORT");
 		int? port = string.IsNullOrEmpty(environmentPort)
-			? container?.GetMappedPublicPort(MinioBuilder.MinioPort) ?? 5300
+			? container?.GetMappedPublicPort(MinioInternalPort) ?? 5300
 			: environmentPort is "null"
 				? null
 				: int.Parse(environmentPort, CultureInfo.InvariantCulture);
@@ -31,33 +33,47 @@ public static S3Settings CreateSettings(MinioContainer? container = null)
 		};
 	}
 
-	public static MinioContainer CreateContainer(bool run = true)
+	public static IContainer CreateContainer(bool run = true)
 	{
-		var container = new MinioBuilder()
-			.WithPassword(SecretKey)
-			.WithUsername(Username)
+		var container = new ContainerBuilder()
+			.WithImage("minio/minio:latest")
+			.WithEnvironment("MINIO_ROOT_USER", Username)
+			.WithEnvironment("MINIO_ROOT_PASSWORD", SecretKey)
+			.WithPortBinding(MinioInternalPort, true)
+			.WithCommand("server", "/data")
+			.WithWaitStrategy(Wait
+				.ForUnixContainer()
+				.UntilHttpRequestIsSucceeded(static request =>
+					request.ForPath("/minio/health/ready").ForPort(MinioInternalPort)))
 			.Build();
 
 		if (run)
 		{
-			container.StartAsync().Wait();
+			container
+				.StartAsync()
+				.ConfigureAwait(false)
+				.GetAwaiter()
+				.GetResult();
 		}
 
 		return container;
 	}
 
 	public static void EnsureBucketExists(S3Client client)
 	{
-		EnsureBucketExists(client, CancellationToken.None).Wait();
+		EnsureBucketExists(client, CancellationToken.None)
+			.ConfigureAwait(false)
+			.GetAwaiter()
+			.GetResult();
 	}
 
 	public static async Task EnsureBucketExists(S3Client client, CancellationToken cancellation)
 	{
-		if (await client.IsBucketExists(cancellation))
+		if (await client.IsBucketExists(cancellation).ConfigureAwait(false))
 		{
 			return;
 		}
 
-		await client.CreateBucket(cancellation);
+		await client.CreateBucket(cancellation).ConfigureAwait(false);
 	}
 }