From 4aacaf5e5152561215a770794cc4addae0d107a3 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Sun, 12 Jul 2026 05:48:47 +0100
Subject: [PATCH] tests: configure static fixture ports and update org test
 config

---
 .../BlogsWebServerFixture.cs                  |  2 ++
 src/Yavsc.Org.Tests/Mandatory/Remoting.cs     |  1 -
 src/Yavsc.Org.Tests/WebServerFixture.cs       |  7 +++++++
 src/Yavsc.Org.Tests/appsettings.json          | 12 ++++++++++-
 src/Yavsc.Tests.Shared/WebHostFixture.cs      | 20 ++++++++++++-------
 5 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/Yavsc.Blogs.Tests/BlogsWebServerFixture.cs b/src/Yavsc.Blogs.Tests/BlogsWebServerFixture.cs
index 6e39fd00..2b8bf705 100644
--- a/src/Yavsc.Blogs.Tests/BlogsWebServerFixture.cs
+++ b/src/Yavsc.Blogs.Tests/BlogsWebServerFixture.cs
@@ -48,6 +48,8 @@ namespace Yavsc.Blogs.Tests;
 /// </summary>
 public sealed class BlogsWebServerFixture : WebHostFixture
 {
+    protected override int HttpsPort => 5103;
+
     private InMemoryDatabaseRoot? _inMemoryRoot;
 
     protected override WebApplication BuildApp(WebApplicationBuilder builder)
diff --git a/src/Yavsc.Org.Tests/Mandatory/Remoting.cs b/src/Yavsc.Org.Tests/Mandatory/Remoting.cs
index 72aa6679..73f3da18 100644
--- a/src/Yavsc.Org.Tests/Mandatory/Remoting.cs
+++ b/src/Yavsc.Org.Tests/Mandatory/Remoting.cs
@@ -23,7 +23,6 @@ namespace Yavsc.Org.Tests
                 throw new InvalidOperationException("No HTTPS server address found");
 
             HttpClient client = NewHttpClient();
-
             var disco = await client.GetDiscoveryDocumentAsync(serverUrl);
             if (disco.IsError) throw new Exception(disco.Error);
 
diff --git a/src/Yavsc.Org.Tests/WebServerFixture.cs b/src/Yavsc.Org.Tests/WebServerFixture.cs
index daa16098..69629b8e 100644
--- a/src/Yavsc.Org.Tests/WebServerFixture.cs
+++ b/src/Yavsc.Org.Tests/WebServerFixture.cs
@@ -39,6 +39,8 @@ namespace Yavsc.Org.Tests;
 [CollectionDefinition("Yavsc Server")]
 public sealed class WebServerFixture : WebHostFixture
 {
+    protected override int HttpsPort => 5101;
+
     private static IConfiguration? _sharedConfiguration;
     private static SiteSettings? _sharedSiteSettings;
     private static ILogger? _sharedLogger;
@@ -81,6 +83,11 @@ public sealed class WebServerFixture : WebHostFixture
                 ["Smtp:Port"] = "465",
                 ["Smtp:UserName"] = "test-user",
                 ["Smtp:Password"] = "test-pass",
+                // Kestrel test config: override the default port from
+                // WebApplication.CreateBuilder() so that the test host
+                // binds to the same port as the production host would.
+                ["Kestrel:Endpoints:Http:Url"] =  "http://localhost:5100",
+                ["Kestrel:Endpoints:Https:Url"] = builder.Configuration["Site:Authority"] ?? "https://localhost:5101"
             });
 
         Configuration = builder.Configuration;
diff --git a/src/Yavsc.Org.Tests/appsettings.json b/src/Yavsc.Org.Tests/appsettings.json
index 964674b1..5f353cd8 100644
--- a/src/Yavsc.Org.Tests/appsettings.json
+++ b/src/Yavsc.Org.Tests/appsettings.json
@@ -1,6 +1,6 @@
 {
     "Site": {
-        "Authority": "https://localhost:5001",
+        "Authority": "https://localhost:5101",
         "Title": "Yavsc dev",
         "Slogan": "Yavsc : WIP.",
         "Banner": "/images/yavsc.png",
@@ -62,6 +62,16 @@
             "UserName": "fakeuser",
             "Password": "f/\\kePassw0rd"
         }
+    },
+    "Kestrel": {
+      "Endpoints": {
+        "Http": {
+          "Url": "http://localhost:5100"
+        },
+        "Https": {
+          "Url": "https://localhost:5101"
+        }
+      }
     }
 
 }
diff --git a/src/Yavsc.Tests.Shared/WebHostFixture.cs b/src/Yavsc.Tests.Shared/WebHostFixture.cs
index fb2e5984..417d29d8 100644
--- a/src/Yavsc.Tests.Shared/WebHostFixture.cs
+++ b/src/Yavsc.Tests.Shared/WebHostFixture.cs
@@ -16,8 +16,8 @@ namespace Yavsc.Tests.Shared;
 ///
 /// <list type="bullet">
 ///   <item><description>Kestrel with a self-signed HTTPS certificate
-///   on a dynamically-allocated port (no port collisions between
-///   parallel xUnit test classes).</description></item>
+///   on a fixture-defined fixed port for deterministic integration
+///   test endpoints.</description></item>
 ///   <item><description>A per-process single-instance host initialised
 ///   on first construction and torn down when the last fixture is
 ///   disposed — same lazy + lock + count pattern as the original Org
@@ -86,11 +86,12 @@ public abstract class WebHostFixture : IDisposable
     protected virtual void CopySpecialisedSharedState() { }
 
     /// <summary>Specialisations register their services and middleware
-    /// here. The base class has already configured Kestrel HTTPS on a
-    /// dynamic port — do not bind additional listeners.</summary>
+    /// here. The base class has already configured Kestrel HTTPS on
+    /// the fixture-defined test port — do not bind additional
+    /// listeners.</summary>
     /// <param name="builder">The <see cref="WebApplicationBuilder"/>
-    /// configured with Kestrel HTTPS on a dynamic port and the shared
-    /// self-signed certificate.</param>
+    /// configured with Kestrel HTTPS on the fixture-defined test port
+    /// and the shared self-signed certificate.</param>
     /// <returns>The fully built <see cref="WebApplication"/>, ready
     /// for <c>ConfigurePipeline</c> + <c>StartAsync</c>.</returns>
     protected abstract WebApplication BuildApp(WebApplicationBuilder builder);
@@ -104,13 +105,18 @@ public abstract class WebHostFixture : IDisposable
         return app;
     }
 
+    /// <summary>HTTPS port used by this fixture's Kestrel host.
+    /// Override in derived fixtures when they must not share the same
+    /// listen port.</summary>
+    protected virtual int HttpsPort => 5101;
+
     private async Task InitializeAsync()
     {
         var builder = WebApplication.CreateBuilder();
 
         builder.WebHost.ConfigureKestrel(options =>
         {
-            options.Listen(IPAddress.Loopback, 0, listenOptions =>
+            options.Listen(IPAddress.Loopback, HttpsPort, listenOptions =>
             {
                 listenOptions.UseHttps(_selfSignedCertificate.Value);
             });