Update the .NET Aspire tests

test/WireMock.Net.Aspire.Tests/DockerUtils.cs

@@ -8,10 +8,7 @@ namespace WireMock.Net.Aspire.Tests;
 [ExcludeFromCodeCoverage]
 internal static class DockerUtils
 {
-    public static bool IsDockerRunningLinuxContainerMode()
-    {
-        return IsDockerRunning() && IsLinuxContainerMode();
-    }
+    public static Lazy<bool> IsDockerRunningLinuxContainerMode => new(() => IsDockerRunning() && IsLinuxContainerMode());
 
     private static bool IsDockerRunning()
     {

test/WireMock.Net.Aspire.Tests/Facts/DockerIsRunningInLinuxContainerModeFact.cs

@@ -0,0 +1,16 @@
+// Copyright © WireMock.Net
+
+namespace WireMock.Net.Aspire.Tests.Facts;
+
+public sealed class DockerIsRunningInLinuxContainerModeFact : FactAttribute
+{
+    private const string SkipReason = "Docker is not running in Linux container mode. Skipping test.";
+
+    public DockerIsRunningInLinuxContainerModeFact()
+    {
+        if (!DockerUtils.IsDockerRunningLinuxContainerMode.Value)
+        {
+            Skip = SkipReason;
+        }
+    }
+}

test/WireMock.Net.Aspire.Tests/IntegrationTests.cs

@@ -3,6 +3,7 @@
 using System.Net.Http.Json;
 using FluentAssertions;
 using Projects;
+using WireMock.Net.Aspire.Tests.Facts;
 using Xunit.Abstractions;
 
 namespace WireMock.Net.Aspire.Tests;
@@ -11,15 +12,9 @@ public class IntegrationTests(ITestOutputHelper output)
 {
     private record WeatherForecast(DateOnly Date, int TemperatureC, string? Summary);
 
-    [Fact]
+    [DockerIsRunningInLinuxContainerModeFact]
     public async Task StartAppHostWithWireMockAndCreateHttpClientToCallTheMockedWeatherForecastEndpoint()
     {
-        if (!DockerUtils.IsDockerRunningLinuxContainerMode())
-        {
-            output.WriteLine("Docker is not running in Linux container mode. Skipping test.");
-            return;
-        }
-
         // Arrange
         var appHostBuilder = await DistributedApplicationTestingBuilder.CreateAsync<WireMock_Net_Aspire_TestAppHost>();
         await using var app = await appHostBuilder.BuildAsync();
@@ -44,15 +39,9 @@ public async Task StartAppHostWithWireMockAndCreateHttpClientToCallTheMockedWeat
         weatherForecasts2.Should().HaveCount(5);
     }
 
-    [Fact]
+    [DockerIsRunningInLinuxContainerModeFact]
     public async Task StartAppHostWithWireMockAndCreateWireMockAdminClientToCallTheAdminEndpoint()
     {
-        if (!DockerUtils.IsDockerRunningLinuxContainerMode())
-        {
-            output.WriteLine("Docker is not running in Linux container mode. Skipping test.");
-            return;
-        }
-
         // Arrange
         var appHostBuilder = await DistributedApplicationTestingBuilder.CreateAsync<WireMock_Net_Aspire_TestAppHost>();
         await using var app = await appHostBuilder.BuildAsync();

test/WireMock.Net.Tests/Facts/IgnoreOnContinuousIntegrationFact.cs

@@ -7,16 +7,16 @@ namespace WireMock.Net.Tests.Facts;
 
 public sealed class IgnoreOnContinuousIntegrationFact : FactAttribute
 {
-    private static readonly string _skipReason = "Ignore when run via CI/CD";
-    private static readonly bool _isContinuousIntegrationAzure = bool.TryParse(Environment.GetEnvironmentVariable("TF_BUILD"), out var isTF) && isTF;
-    private static readonly bool _isContinuousIntegrationGithub = bool.TryParse(Environment.GetEnvironmentVariable("GITHUB_ACTIONS"), out var isGH) && isGH;
-    private static bool IsContinuousIntegration() => _isContinuousIntegrationAzure || _isContinuousIntegrationGithub;
-    
+    private const string SkipReason = "Ignore when run via CI/CD";
+    private static readonly bool IsContinuousIntegrationAzure = bool.TryParse(Environment.GetEnvironmentVariable("TF_BUILD"), out var isTF) && isTF;
+    private static readonly bool IsContinuousIntegrationGithub = bool.TryParse(Environment.GetEnvironmentVariable("GITHUB_ACTIONS"), out var isGH) && isGH;
+    private static readonly bool IsContinuousIntegration = IsContinuousIntegrationAzure || IsContinuousIntegrationGithub;
+
     public IgnoreOnContinuousIntegrationFact()
     {
-        if (IsContinuousIntegration())
+        if (IsContinuousIntegration)
         {
-            Skip = _skipReason;
+            Skip = SkipReason;
         }
     }
-}
+}

test/WireMock.Net.Tests/WireMockServerTests.cs

@@ -40,7 +40,7 @@
     {
         _testOutputHelper = testOutputHelper;
     }
-    
+
     [Fact]
     public void WireMockServer_Start()
     {
@@ -209,7 +209,7 @@
             .Select(addr => addr.Address.ToString())
             .ToArray();
     }
-    
+
     [IgnoreOnContinuousIntegrationFact]
     public async Task WireMockServer_WithUrl0000_Should_Listen_On_All_IPs_IPv4()
     {
@@ -218,22 +218,20 @@
         var IPv4 = GetIPAddressesByFamily(System.Net.Sockets.AddressFamily.InterNetwork);
         var settings = new WireMockServerSettings
         {
-            Urls = new string[] { "http://0.0.0.0:" + port },
+            Urls = ["http://0.0.0.0:" + port],
         };
-        var server = WireMockServer.Start(settings);
-    
+        using var server = WireMockServer.Start(settings);
+
         server.Given(Request.Create().WithPath("/*")).RespondWith(Response.Create().WithBody("x"));
-    
-        foreach (var addr in IPv4)
+
+        foreach (var address in IPv4)
         {
             // Act
-            var response = await new HttpClient().GetStringAsync("http://" + addr + ":" + server.Ports[0] + "/foo").ConfigureAwait(false);
-    
+            var response = await new HttpClient().GetStringAsync("http://" + address + ":" + server.Ports[0] + "/foo").ConfigureAwait(false);
+
             // Assert
             response.Should().Be("x");
-        } 
-
-        server.Stop();
+        }
     }
 
     [IgnoreOnContinuousIntegrationFact]
@@ -244,25 +242,23 @@
         var IPv6 = GetIPAddressesByFamily(System.Net.Sockets.AddressFamily.InterNetworkV6);
         var settings = new WireMockServerSettings
         {
-            Urls = new string[] { "http://0.0.0.0:" + port },
+            Urls = ["http://0.0.0.0:" + port],
         };
-        var server = WireMockServer.Start(settings);
-    
+        using var server = WireMockServer.Start(settings);
+
         server.Given(Request.Create().WithPath("/*")).RespondWith(Response.Create().WithBody("x"));
 
-        foreach (var addr in IPv6)
+        foreach (var address in IPv6)
         {
             // Act
-            var response = await new HttpClient().GetStringAsync("http://[" + addr + "]:" + server.Ports[0] + "/foo").ConfigureAwait(false);
-    
+            var response = await new HttpClient().GetStringAsync("http://[" + address + "]:" + server.Ports[0] + "/foo").ConfigureAwait(false);
+
             // Assert
             response.Should().Be("x");
         }
-
-        server.Stop();
     }
 #endif
-    
+
     [Fact]
     public async Task WireMockServer_Should_respond_a_redirect_without_body()
     {