From 57c42492bcd0b4dd48e9b1fd54c1b855176c75b1 Mon Sep 17 00:00:00 2001
From: Stef Heyenrath <Stef.Heyenrath@gmail.com>
Date: Thu, 25 Jan 2024 09:54:25 +0100
Subject: [PATCH] Pin the version from Testcontainers to 3.7.0 in
 WireMock.Net.Testcontainers (#1057)

* TestcontainersTests

* WireMockContainer_Build_and_StartAsync_and_StopAsync

* --

* [3.7.0]
---
 .../WireMock.Net.Testcontainers.csproj        |  7 +--
 .../WireMockConfiguration.cs                  |  5 +--
 .../WireMockContainerBuilder.cs               |  5 +++
 .../Testcontainers/TestcontainersTests.cs     | 43 +++++++++++++++++++
 .../WireMock.Net.Tests.csproj                 |  4 ++
 5 files changed, 55 insertions(+), 9 deletions(-)
 create mode 100644 test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs

diff --git a/src/WireMock.Net.Testcontainers/WireMock.Net.Testcontainers.csproj b/src/WireMock.Net.Testcontainers/WireMock.Net.Testcontainers.csproj
index 24b402a4..f52bc3c4 100644
--- a/src/WireMock.Net.Testcontainers/WireMock.Net.Testcontainers.csproj
+++ b/src/WireMock.Net.Testcontainers/WireMock.Net.Testcontainers.csproj
@@ -29,15 +29,12 @@
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Stef.Validation" Version="0.1.1" />
-        <PackageReference Include="Testcontainers" Version="3.6.0" />
+        <PackageReference Include="Testcontainers" Version="[3.7.0]" />
         <PackageReference Include="JetBrains.Annotations" VersionOverride="2022.3.1" PrivateAssets="All" Version="2023.3.0" />
     </ItemGroup>
 
     <ItemGroup>
       <ProjectReference Include="..\WireMock.Net.RestClient\WireMock.Net.RestClient.csproj" />
     </ItemGroup>
-
-    <ItemGroup>
-      <Folder Include="Http\" />
-    </ItemGroup>
+    
 </Project>
\ No newline at end of file
diff --git a/src/WireMock.Net.Testcontainers/WireMockConfiguration.cs b/src/WireMock.Net.Testcontainers/WireMockConfiguration.cs
index 3403eca1..56a91f7e 100644
--- a/src/WireMock.Net.Testcontainers/WireMockConfiguration.cs
+++ b/src/WireMock.Net.Testcontainers/WireMockConfiguration.cs
@@ -16,10 +16,7 @@ public sealed class WireMockConfiguration : ContainerConfiguration
 
     public bool HasBasicAuthentication => !string.IsNullOrEmpty(Username) && !string.IsNullOrEmpty(Password);
 
-    public WireMockConfiguration(
-        string? username = null,
-        string? password = null
-    )
+    public WireMockConfiguration(string? username = null, string? password = null)
     {
         Username = username;
         Password = password;
diff --git a/src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs b/src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs
index d724b0e6..fbbb9f0f 100644
--- a/src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs
+++ b/src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs
@@ -25,6 +25,11 @@ public sealed class WireMockContainerBuilder : ContainerBuilder<WireMockContaine
 
     private readonly Lazy<Task<bool>> _isWindowsAsLazy = new(async () =>
     {
+        if (TestcontainersSettings.OS.DockerEndpointAuthConfig == null)
+        {
+            throw new InvalidOperationException($"The {nameof(TestcontainersSettings.OS.DockerEndpointAuthConfig)} is null. Check if Docker is started.");
+        }
+
         using var dockerClientConfig = TestcontainersSettings.OS.DockerEndpointAuthConfig.GetDockerClientConfiguration();
         using var dockerClient = dockerClientConfig.CreateClient();
 
diff --git a/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs b/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs
new file mode 100644
index 00000000..27ac9b43
--- /dev/null
+++ b/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs
@@ -0,0 +1,43 @@
+#if NET6_0_OR_GREATER
+using System.Threading.Tasks;
+using FluentAssertions;
+using FluentAssertions.Execution;
+using WireMock.Net.Testcontainers;
+using Xunit;
+
+namespace WireMock.Net.Tests.Testcontainers;
+
+public class TestcontainersTests
+{
+    [Fact]
+    public async Task WireMockContainer_Build_and_StartAsync_and_StopAsync()
+    {
+        // Act
+        var wireMockContainer = new WireMockContainerBuilder()
+            .WithAutoRemove(true)
+            .WithCleanUp(true)
+            .Build();
+
+        try
+        {
+            await wireMockContainer.StartAsync().ConfigureAwait(false);
+
+            // Assert
+            using (new AssertionScope())
+            {
+                var url = wireMockContainer.GetPublicUrl();
+                url.Should().NotBeNullOrWhiteSpace();
+
+                var adminClient = wireMockContainer.CreateWireMockAdminClient();
+
+                var settings = await adminClient.GetSettingsAsync();
+                settings.Should().NotBeNull();
+            }
+        }
+        finally
+        {
+            await wireMockContainer.StopAsync();
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj b/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj
index 0a585d41..07d32aed 100644
--- a/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj
+++ b/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj
@@ -105,6 +105,10 @@
         <PackageReference Include="JsonConverter.System.Text.Json" Version="0.4.0" />
     </ItemGroup>
 
+    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0'">
+        <ProjectReference Include="..\..\src\WireMock.Net.Testcontainers\WireMock.Net.Testcontainers.csproj" />
+    </ItemGroup>
+
     <ItemGroup>
         <None Update="OpenApiParser\*.json">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>