notazof/yavsc
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 3 Packages Wiki Activity Actions

Revert "repoduces the bug"

Browse source 
This reverts commit fa7794b7a0.
This commit is contained in:
Paul Schneider 2026-07-11 22:17:58 +01:00
commit cb20b8a2d5
10 changed files with 18 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

69
src/Yavsc.Org.Tests/TestWebApplicationFactory.cs
View file

@ -2,11 +2,7 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc.Testing;
using Microsoft.AspNetCore.TestHost;
using Microsoft.Data.Sqlite;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Yavsc.Models;
using Yavsc.Tests.Shared;
namespace Yavsc.Org.Tests;
@ -28,21 +24,6 @@ namespace Yavsc.Org.Tests;
/// </summary>
public class TestWebApplicationFactory : WebApplicationFactory<Program>
{
// SQLite in-memory: the connection must stay open for the lifetime
// of the host, otherwise the in-memory database is destroyed and
// every new DbContext sees an empty store. We hold the connection
// here so it is disposed only when the factory is disposed. The
// Microsoft.Data.Sqlite pool reuses the underlying in-memory store
// across additional connections opened against the same connection
// string, as long as the original connection is alive. This is the
// SQLite equivalent of the EF Core InMemoryDatabaseRoot pattern.
private readonly SqliteConnection _sharedSqliteConnection = new("Data Source=:memory:");
public TestWebApplicationFactory()
{
_sharedSqliteConnection.Open();
}
protected override void ConfigureWebHost(IWebHostBuilder builder)
{
// UseEnvironment("Testing") puts the host in a dedicated
@ -57,25 +38,6 @@ public class TestWebApplicationFactory : WebApplicationFactory<Program>
builder.ConfigureTestServices(services =>
{
// The production Program.Main calls AddConfiguration("org")
// and then AddIdentityDBAndStores which calls
// GetConnectionString("YavscConnection"). The result is
// "Data Source=:memory:" (from appsettings-org.Testing.json),
// and the production code path in HostingExtensions routes
// that to UseSqlite. However, the EF Core in-memory test
// pattern needs all DbContext instances to see the same
// store; with a raw "Data Source=:memory:" connection string,
// each connection opens its own private database. We
// therefore drop the production DbContext registration and
// re-register ApplicationDbContext with the shared
// SqliteConnection held by this factory. Tests that need
// the schema to exist call EnsureCreated on the resulting
// DbContext (e.g. ClientControllerCollectionTests seeds a
// Client row in its constructor).
services.RemoveAll<DbContextOptions<ApplicationDbContext>>();
services.AddDbContext<ApplicationDbContext>(opt =>
opt.UseSqlite(_sharedSqliteConnection));
// Replace the production IAuthorizationPolicyProvider with
// the test one. The default registered by AddAuthorization
// becomes irrelevant: any GetPolicyAsync call is routed here.
@ -86,37 +48,6 @@ public class TestWebApplicationFactory : WebApplicationFactory<Program>
// TestUserMiddleware runs after UseAuthentication/Authorization.
services.AddTransient<TestUserMiddleware>();
services.AddTransient<IStartupFilter, TestUserStartupFilter>();
// Run EnsureCreated once at host start. With SQLite in-memory
// and a shared connection, this creates the schema once
// and the schema persists for the host lifetime. The
// test code (e.g. ClientControllerCollectionTests seed) can
// then write rows without having to call EnsureCreated
// itself. EnsureCreated is idempotent: re-running it on
// an existing schema is a no-op.
services.AddHostedService<SqliteEnsureCreatedHostedService>();
});
}
private sealed class SqliteEnsureCreatedHostedService : IHostedService
{
private readonly IServiceProvider _services;
public SqliteEnsureCreatedHostedService(IServiceProvider services)
{
_services = services;
}
public Task StartAsync(CancellationToken cancellationToken)
{
using var scope = _services.CreateScope();
var db = scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
return db.Database.EnsureCreatedAsync(cancellationToken);
}
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
}
protected override void Dispose(bool disposing)
{
if (disposing) _sharedSqliteConnection.Dispose();
base.Dispose(disposing);
}
}

15
src/Yavsc.Org.Tests/WebServerFixture.cs
View file

@ -75,20 +75,7 @@ public sealed class WebServerFixture : WebHostFixture
// that plus the in-memory overrides below.
builder.AddConfiguration(null).AddInMemoryCollection(new Dictionary<string, string?>
{
// The EF Core in-memory provider cannot materialise
// entity types from IdentityServer8 (see forgejo#3):
// it crashes with IndexOutOfRangeException on the
// multi-Include query in ClientController.LoadClientAsync
// and on per-collection LoadAsync. SQLite in-memory is
// a transient, file-less store that uses the same
// connection string semantics as the InMemory provider
// ("keep the connection open for the host lifetime")
// but actually executes SQL, so it handles
// navigation-property entities correctly. The
// HostingExtensions code path detects this connection
// string and routes to UseSqlite. See
// doc/testing.md for the test-driver policy.
[$"ConnectionStrings:{YavscConstants.YavscConnectionStringName}"] = "Data Source=:memory:",
[$"ConnectionStrings:{YavscConstants.YavscConnectionStringName}"] = "InMemory",
// SMTP test config: UserName non-null so MailSender
// exercises the Authenticate branch — the
// RecordingSmtpClient captures it.

1
src/Yavsc.Org.Tests/Yavsc.Org.Tests.csproj
View file

@ -53,7 +53,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
</ItemGroup>
<!--
MapStaticAssets() in the production pipeline resolves