refactor(test): avoid using HTTP assertions from FluentAssertions as …

…they will be gone with v8
mu88 · Jan 19, 2025 · 36ce52f · 36ce52f
1 parent eb403f0
commit 36ce52f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/tests/Tests/Integration/HealthCheckerTests.cs b/tests/Tests/Integration/HealthCheckerTests.cs
@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Mvc.Testing;
 using mu88.HealthCheck;
 using RichardSzalay.MockHttp;
+using System.Net;
 
 namespace Tests.Integration;
 
@@ -22,7 +23,7 @@ public async Task HealthChecker_ShouldIndicateSuccess_WhenAppIsHealthy()
         var healthCheckerResult = await healthChecker.CheckHealthAsync(["healthz"]);
 
         // Assert
-        response.Should().BeSuccessful();
+        response.StatusCode.Should().Be(HttpStatusCode.OK);
         healthCheckerResult.Should().Be(0);
     }
 
@@ -54,7 +55,7 @@ public async Task HealthChecker_ShouldIndicateFailure_WhenWrongHealthCheckEndpoi
         var healthCheckerResult = await healthChecker.CheckHealthAsync(["invalidHealthCheckEndpoint"]);
 
         // Assert
-        response.Should().BeSuccessful();
+        response.StatusCode.Should().Be(HttpStatusCode.OK);
         healthCheckerResult.Should().Be(1);
     }
 
@@ -71,7 +72,7 @@ public async Task HealthChecker_ShouldThrowArgumentException_WhenUriIsInvalid()
         Func<Task> act = async () => await healthChecker.CheckHealthAsync([]);
 
         // Assert
-        response.Should().BeSuccessful();
+        response.StatusCode.Should().Be(HttpStatusCode.OK);
         await act.Should().ThrowAsync<ArgumentException>().WithMessage("A valid URI must be given as first argument (Parameter 'args')");
     }
 }
diff --git a/tests/Tests/Integration/HostApplicationBuilderExtensionsTests.cs b/tests/Tests/Integration/HostApplicationBuilderExtensionsTests.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using System.Net;
 using FluentAssertions;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Testing;
@@ -19,7 +20,7 @@ public async Task WebApp_ShouldExposeMetrics()
         using var httpClient = customWebApplicationFactory.CreateClient();
 
         // Act
-        (await httpClient.GetAsync("hello")).Should().BeSuccessful(); // trigger metrics creation
+        (await httpClient.GetAsync("hello")).StatusCode.Should().Be(HttpStatusCode.OK);; // trigger metrics creation
         await customWebApplicationFactory.DisposeAsync(); // must be disposed, otherwise metrics remain empty
         await WaitAsync(metrics, TimeSpan.FromSeconds(30)); // wait some time so that the metrics get populated
 

diff --git a/tests/Tests/System/SystemTests.cs b/tests/Tests/System/SystemTests.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using System.Net;
 using DotNet.Testcontainers.Builders;
 using DotNet.Testcontainers.Containers;
 using DotNet.Testcontainers.Networks;
@@ -45,13 +46,13 @@ public async Task AppRunningInDocker_ShouldBeHealthy()
 
     private static async Task AppShouldRunAsync(HttpResponseMessage appResponse, CancellationToken cancellationToken)
     {
-        appResponse.Should().BeSuccessful();
+        appResponse.StatusCode.Should().Be(HttpStatusCode.OK);
         (await appResponse.Content.ReadAsStringAsync(cancellationToken)).Should().Contain("World");
     }
 
     private static async Task HealthCheckShouldBeHealthyAsync(HttpResponseMessage healthCheckResponse, CancellationToken cancellationToken)
     {
-        healthCheckResponse.Should().BeSuccessful();
+        healthCheckResponse.StatusCode.Should().Be(HttpStatusCode.OK);
         (await healthCheckResponse.Content.ReadAsStringAsync(cancellationToken)).Should().Be("Healthy");
     }