From 8c20e55ed2524acf50c0ecbd35efa79086d5703b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Crocquesel?=
 <88554524+scrocquesel@users.noreply.github.com>
Date: Wed, 11 Jun 2025 20:55:09 +0200
Subject: [PATCH] Use default resource cleaning behavior in test

---
 examples/WireMock.Net.TestcontainersExample/Program.cs | 10 ++--------
 .../Testcontainers/TestcontainersTests.Grpc.cs         |  8 --------
 .../Testcontainers/TestcontainersTests.cs              |  9 ---------
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/examples/WireMock.Net.TestcontainersExample/Program.cs b/examples/WireMock.Net.TestcontainersExample/Program.cs
index a634d93f9..1b6e65e0a 100644
--- a/examples/WireMock.Net.TestcontainersExample/Program.cs
+++ b/examples/WireMock.Net.TestcontainersExample/Program.cs
@@ -159,9 +159,7 @@ private static async Task TestCopy()
     private static async Task TestWindowsCopyAsync()
     {
         var builder = new WireMockContainerBuilder()
-            .WithWatchStaticMappings(true)
-            .WithAutoRemove(true)
-            .WithCleanUp(true);
+            .WithWatchStaticMappings(true);
 
         var container = builder.Build();
 
@@ -186,8 +184,6 @@ private static async Task TestWindowsCopyAsync()
         var mappings = await adminClient.GetMappingsAsync();
         Console.WriteLine("mappings = " + JsonConvert.SerializeObject(mappings, Formatting.Indented));
 
-        await Task.Delay(1_000);
-
         await container.StopAsync();
     }
 
@@ -205,9 +201,7 @@ private static async Task TestAsync(string? image = null)
             .WithNetwork(dummyNetwork)
             .WithAdminUserNameAndPassword("x", "y")
             .WithMappings(mappingsPath)
-            .WithWatchStaticMappings(true)
-            // .WithAutoRemove(true)
-            .WithCleanUp(true);
+            .WithWatchStaticMappings(true);
 
         if (image != null)
         {
diff --git a/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.Grpc.cs b/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.Grpc.cs
index 474615733..12b903b2b 100644
--- a/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.Grpc.cs
+++ b/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.Grpc.cs
@@ -25,8 +25,6 @@ public async Task WireMockContainer_Build_Grpc_TestPortsAndUrls1()
         var adminUsername = $"username_{Guid.NewGuid()}";
         var adminPassword = $"password_{Guid.NewGuid()}";
         var wireMockContainer = new WireMockContainerBuilder()
-            .WithAutoRemove(true)
-            .WithCleanUp(true)
             .WithAdminUserNameAndPassword(adminUsername, adminPassword)
             .WithCommand("--UseHttp2")
             .WithCommand("--Urls", "http://*:80 grpc://*:9090")
@@ -80,8 +78,6 @@ public async Task WireMockContainer_Build_Grpc_TestPortsAndUrls2()
         var adminUsername = $"username_{Guid.NewGuid()}";
         var adminPassword = $"password_{Guid.NewGuid()}";
         var wireMockContainer = new WireMockContainerBuilder()
-            .WithAutoRemove(true)
-            .WithCleanUp(true)
             .WithAdminUserNameAndPassword(adminUsername, adminPassword)
             .AddUrl("http://*:8080")
             .AddUrl("grpc://*:9090")
@@ -156,8 +152,6 @@ public async Task WireMockContainer_Build_Grpc_ProtoDefinitionAtServerLevel_Usin
     private static async Task<WireMockContainer> Given_WireMockContainerIsStartedForHttpAndGrpcAsync()
     {
         var wireMockContainer = new WireMockContainerBuilder()
-            .WithAutoRemove(true)
-            .WithCleanUp(true)
             .AddUrl("grpc://*:9090")
             .Build();
 
@@ -169,8 +163,6 @@ private static async Task<WireMockContainer> Given_WireMockContainerIsStartedFor
     private static async Task<WireMockContainer> Given_WireMockContainerWithProtoDefinitionAtServerLevelIsStartedForHttpAndGrpcAsync()
     {
         var wireMockContainer = new WireMockContainerBuilder()
-            .WithAutoRemove(true)
-            .WithCleanUp(true)
             .AddUrl("grpc://*:9090")
             .AddProtoDefinition("my-greeter", ReadFile("greet.proto"))
             .Build();
diff --git a/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs b/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs
index 23d95a8b2..ba5bb4bf5 100644
--- a/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs
+++ b/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs
@@ -24,8 +24,6 @@ public async Task WireMockContainer_Build_And_StartAsync_and_StopAsync()
         var adminUsername = $"username_{Guid.NewGuid()}";
         var adminPassword = $"password_{Guid.NewGuid()}";
         var wireMockContainer = new WireMockContainerBuilder()
-            .WithAutoRemove(true)
-            .WithCleanUp(true)
             .WithAdminUserNameAndPassword(adminUsername, adminPassword)
             .Build();
 
@@ -40,14 +38,11 @@ public async Task WireMockContainer_Build_WithNetwork_And_StartAsync_and_StopAsy
         // Act
         var dummyNetwork = new NetworkBuilder()
             .WithName("Dummy Network for TestcontainersTests")
-            .WithCleanUp(true)
             .Build();
 
         var wireMockContainer = new WireMockContainerBuilder()
             .WithNetwork(dummyNetwork)
             .WithWatchStaticMappings(true)
-            .WithAutoRemove(true)
-            .WithCleanUp(true)
             .Build();
 
         await StartTestAsync(wireMockContainer);
@@ -61,8 +56,6 @@ public async Task WireMockContainer_Build_WithImage_And_StartAsync_and_StopAsync
         var adminUsername = $"username_{Guid.NewGuid()}";
         var adminPassword = $"password_{Guid.NewGuid()}";
         var wireMockContainerBuilder = new WireMockContainerBuilder()
-            .WithAutoRemove(true)
-            .WithCleanUp(true)
             .WithAdminUserNameAndPassword(adminUsername, adminPassword);
 
         var imageOS = await TestcontainersUtils.GetImageOSAsync.Value;
@@ -88,8 +81,6 @@ public async Task WireMockContainer_Build_WithImageAsText_And_StartAsync_and_Sto
         var adminUsername = $"username_{Guid.NewGuid()}";
         var adminPassword = $"password_{Guid.NewGuid()}";
         var wireMockContainerBuilder = new WireMockContainerBuilder()
-            .WithAutoRemove(true)
-            .WithCleanUp(true)
             .WithAdminUserNameAndPassword(adminUsername, adminPassword);
 
         var imageOS = await TestcontainersUtils.GetImageOSAsync.Value;