Compare commits

..

4 commits

Author SHA1 Message Date
bb4ad4fcb8 Merge pull request 'fix/testing' (#6) from fix/testing into main
Some checks failed
Dotnet build and test / log-the-inputs (push) Has been cancelled
Dotnet build and test / build (push) Has been cancelled
Reviewed-on: #6
2026-07-12 06:03:39 +01:00
6c100ff759 use an available port for authority
Some checks failed
Dotnet build and test / log-the-inputs (pull_request) Has been cancelled
Dotnet build and test / build (pull_request) Has been cancelled
2026-07-12 06:01:42 +01:00
4aacaf5e51 tests: configure static fixture ports and update org test config 2026-07-12 05:48:47 +01:00
713f66f1a7 ? 2026-07-12 04:36:35 +01:00
6 changed files with 53 additions and 34 deletions

View file

@ -48,6 +48,8 @@ namespace Yavsc.Blogs.Tests;
/// </summary> /// </summary>
public sealed class BlogsWebServerFixture : WebHostFixture public sealed class BlogsWebServerFixture : WebHostFixture
{ {
protected override int HttpsPort => 5103;
private InMemoryDatabaseRoot? _inMemoryRoot; private InMemoryDatabaseRoot? _inMemoryRoot;
protected override WebApplication BuildApp(WebApplicationBuilder builder) protected override WebApplication BuildApp(WebApplicationBuilder builder)

View file

@ -18,7 +18,7 @@ namespace Yavsc.Org.Tests
[Fact] [Fact]
public async Task ObtainServiceToken() public async Task ObtainServiceToken()
{ {
var serverUrl = _serverFixture.Addresses.FirstOrDefault(u => u.StartsWith("https:")); var serverUrl = _serverFixture.SiteSettings.Authority;
if (string.IsNullOrEmpty(serverUrl)) if (string.IsNullOrEmpty(serverUrl))
throw new InvalidOperationException("No HTTPS server address found"); throw new InvalidOperationException("No HTTPS server address found");
@ -45,7 +45,7 @@ namespace Yavsc.Org.Tests
[Fact] [Fact]
public async Task ObtainResourceOwnerPasswordToken() public async Task ObtainResourceOwnerPasswordToken()
{ {
var serverUrl = _serverFixture.Addresses.FirstOrDefault(u => u.StartsWith("https:")); var serverUrl = _serverFixture.SiteSettings.Authority;
if (string.IsNullOrEmpty(serverUrl)) if (string.IsNullOrEmpty(serverUrl))
throw new InvalidOperationException("No HTTPS server address found"); throw new InvalidOperationException("No HTTPS server address found");

View file

@ -8,6 +8,8 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using System.Net;
using System.Net.Sockets;
using Yavsc; using Yavsc;
using Yavsc.Extensions; using Yavsc.Extensions;
using Yavsc.Interfaces; using Yavsc.Interfaces;
@ -39,6 +41,10 @@ namespace Yavsc.Org.Tests;
[CollectionDefinition("Yavsc Server")] [CollectionDefinition("Yavsc Server")]
public sealed class WebServerFixture : WebHostFixture public sealed class WebServerFixture : WebHostFixture
{ {
private static readonly int _httpsPort = GetAvailableLoopbackPort();
protected override int HttpsPort => _httpsPort;
private static IConfiguration? _sharedConfiguration; private static IConfiguration? _sharedConfiguration;
private static SiteSettings? _sharedSiteSettings; private static SiteSettings? _sharedSiteSettings;
private static ILogger? _sharedLogger; private static ILogger? _sharedLogger;
@ -64,6 +70,8 @@ public sealed class WebServerFixture : WebHostFixture
protected override WebApplication BuildApp(WebApplicationBuilder builder) protected override WebApplication BuildApp(WebApplicationBuilder builder)
{ {
var authority = $"https://localhost:{_httpsPort}";
// WebApplication.CreateBuilder defaults WebRootPath to // WebApplication.CreateBuilder defaults WebRootPath to
// {ContentRoot}/wwwroot. The test assembly runs from // {ContentRoot}/wwwroot. The test assembly runs from
// src/Yavsc.Org.Tests/bin/.../, which has no wwwroot of // src/Yavsc.Org.Tests/bin/.../, which has no wwwroot of
@ -81,6 +89,7 @@ public sealed class WebServerFixture : WebHostFixture
["Smtp:Port"] = "465", ["Smtp:Port"] = "465",
["Smtp:UserName"] = "test-user", ["Smtp:UserName"] = "test-user",
["Smtp:Password"] = "test-pass", ["Smtp:Password"] = "test-pass",
["Site:Authority"] = authority
}); });
Configuration = builder.Configuration; Configuration = builder.Configuration;
@ -276,4 +285,19 @@ public sealed class WebServerFixture : WebHostFixture
TestingUser = dbContext.Users.FirstOrDefault(u => u.UserName == testingUserName); TestingUser = dbContext.Users.FirstOrDefault(u => u.UserName == testingUserName);
} }
} }
private static int GetAvailableLoopbackPort()
{
var listener = new TcpListener(IPAddress.Loopback, 0);
listener.Start();
try
{
return ((IPEndPoint)listener.LocalEndpoint).Port;
}
finally
{
listener.Stop();
}
}
} }

View file

@ -1,6 +1,6 @@
{ {
"Site": { "Site": {
"Authority": "https://mercure.pschneider.fr", "Authority": "https://localhost:5101",
"Title": "Yavsc dev", "Title": "Yavsc dev",
"Slogan": "Yavsc : WIP.", "Slogan": "Yavsc : WIP.",
"Banner": "/images/yavsc.png", "Banner": "/images/yavsc.png",
@ -62,6 +62,16 @@
"UserName": "fakeuser", "UserName": "fakeuser",
"Password": "f/\\kePassw0rd" "Password": "f/\\kePassw0rd"
} }
},
"Kestrel": {
"Endpoints": {
"Http": {
"Url": "http://localhost:5100"
},
"Https": {
"Url": "https://localhost:5101"
}
}
} }
} }

View file

@ -10,29 +10,6 @@ namespace Yavsc.Migrations
/// <inheritdoc /> /// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder) protected override void Up(MigrationBuilder migrationBuilder)
{ {
// Assainir les orphelins AVANT d'enforcer la FK Restrict.
// En prod (Postgres), la migration aurait sinon planté
// sur des billets/commentaires dont l'AuthorId pointe
// vers un user déjà supprimé. La logique métier refuse
// désormais l'orphelin (cf. BlogSpotService.Details) — on
// aligne l'état de la base avec ce contrat.
migrationBuilder.Sql(@"
DO $$
DECLARE n_comments int;
n_posts int;
BEGIN
DELETE FROM ""Comment""
WHERE ""AuthorId"" NOT IN (SELECT ""Id"" FROM ""AspNetUsers"");
GET DIAGNOSTICS n_comments = ROW_COUNT;
DELETE FROM ""BlogSpot""
WHERE ""AuthorId"" NOT IN (SELECT ""Id"" FROM ""AspNetUsers"");
GET DIAGNOSTICS n_posts = ROW_COUNT;
RAISE NOTICE 'EnforceBlogAuthorFKs: % orphaned comments deleted, % orphaned blog posts deleted',
n_comments, n_posts;
END $$;
");
migrationBuilder.DropForeignKey( migrationBuilder.DropForeignKey(
name: "FK_BlogSpot_AspNetUsers_AuthorId", name: "FK_BlogSpot_AspNetUsers_AuthorId",

View file

@ -16,8 +16,8 @@ namespace Yavsc.Tests.Shared;
/// ///
/// <list type="bullet"> /// <list type="bullet">
/// <item><description>Kestrel with a self-signed HTTPS certificate /// <item><description>Kestrel with a self-signed HTTPS certificate
/// on a dynamically-allocated port (no port collisions between /// on a fixture-defined fixed port for deterministic integration
/// parallel xUnit test classes).</description></item> /// test endpoints.</description></item>
/// <item><description>A per-process single-instance host initialised /// <item><description>A per-process single-instance host initialised
/// on first construction and torn down when the last fixture is /// on first construction and torn down when the last fixture is
/// disposed — same lazy + lock + count pattern as the original Org /// disposed — same lazy + lock + count pattern as the original Org
@ -86,11 +86,12 @@ public abstract class WebHostFixture : IDisposable
protected virtual void CopySpecialisedSharedState() { } protected virtual void CopySpecialisedSharedState() { }
/// <summary>Specialisations register their services and middleware /// <summary>Specialisations register their services and middleware
/// here. The base class has already configured Kestrel HTTPS on a /// here. The base class has already configured Kestrel HTTPS on
/// dynamic port — do not bind additional listeners.</summary> /// the fixture-defined test port — do not bind additional
/// listeners.</summary>
/// <param name="builder">The <see cref="WebApplicationBuilder"/> /// <param name="builder">The <see cref="WebApplicationBuilder"/>
/// configured with Kestrel HTTPS on a dynamic port and the shared /// configured with Kestrel HTTPS on the fixture-defined test port
/// self-signed certificate.</param> /// and the shared self-signed certificate.</param>
/// <returns>The fully built <see cref="WebApplication"/>, ready /// <returns>The fully built <see cref="WebApplication"/>, ready
/// for <c>ConfigurePipeline</c> + <c>StartAsync</c>.</returns> /// for <c>ConfigurePipeline</c> + <c>StartAsync</c>.</returns>
protected abstract WebApplication BuildApp(WebApplicationBuilder builder); protected abstract WebApplication BuildApp(WebApplicationBuilder builder);
@ -104,13 +105,18 @@ public abstract class WebHostFixture : IDisposable
return app; 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() private async Task InitializeAsync()
{ {
var builder = WebApplication.CreateBuilder(); var builder = WebApplication.CreateBuilder();
builder.WebHost.ConfigureKestrel(options => builder.WebHost.ConfigureKestrel(options =>
{ {
options.Listen(IPAddress.Loopback, 0, listenOptions => options.Listen(IPAddress.Loopback, HttpsPort, listenOptions =>
{ {
listenOptions.UseHttps(_selfSignedCertificate.Value); listenOptions.UseHttps(_selfSignedCertificate.Value);
}); });