mirrors/CleanArchitecture
0
0
Fork 0
mirror of https://github.com/alex289/CleanArchitecture.git synced 2025-07-03 03:52:56 +00:00
Code

feat: Simplify integration test setup (#70)

Browse Source
This commit is contained in:
Alex 2024-09-04 12:49:09 +02:00 committed by GitHub
commit 99ee108b04
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CleanArchitecture.IntegrationTests/Fixtures/TestFixtureBase.cs
View File

@ -21,9 +21,7 @@ public class TestFixtureBase
} }
protected virtual void RegisterCustomServicesHandler( protected virtual void RegisterCustomServicesHandler(
IServiceCollection services, IServiceCollection services)
ServiceProvider serviceProvider,
IServiceProvider scopedServices)
{ {
} }
} }

46
CleanArchitecture.IntegrationTests/Infrastructure/CleanArchitectureWebApplicationFactory.cs
View File

@ -13,9 +13,7 @@ namespace CleanArchitecture.IntegrationTests.Infrastructure;
public sealed class CleanArchitectureWebApplicationFactory : WebApplicationFactory<Program> public sealed class CleanArchitectureWebApplicationFactory : WebApplicationFactory<Program>
{ {
public delegate void RegisterCustomServicesHandler( public delegate void RegisterCustomServicesHandler(
IServiceCollection services, IServiceCollection services);
ServiceProvider serviceProvider,
IServiceProvider scopedServices);
private readonly bool _addTestAuthentication; private readonly bool _addTestAuthentication;
private readonly RegisterCustomServicesHandler? _registerCustomServicesHandler; private readonly RegisterCustomServicesHandler? _registerCustomServicesHandler;
@ -31,31 +29,14 @@ public sealed class CleanArchitectureWebApplicationFactory : WebApplicationFacto
protected override void ConfigureWebHost(IWebHostBuilder builder) protected override void ConfigureWebHost(IWebHostBuilder builder)
{ {
builder.UseEnvironment("Integration"); builder.UseEnvironment("Integration");
base.ConfigureWebHost(builder); base.ConfigureWebHost(builder);
var configuration = new ConfigurationBuilder()
.Build();
builder.ConfigureAppConfiguration(configurationBuilder =>
{
var redisPort = GlobalSetupFixture.RedisContainer.GetMappedPublicPort(Configuration.RedisPort); var redisPort = GlobalSetupFixture.RedisContainer.GetMappedPublicPort(Configuration.RedisPort);
var rabbitPort = GlobalSetupFixture.RabbitContainer.GetMappedPublicPort(Configuration.RabbitMqPort); var rabbitPort = GlobalSetupFixture.RabbitContainer.GetMappedPublicPort(Configuration.RabbitMqPort);
configurationBuilder.AddInMemoryCollection([ Environment.SetEnvironmentVariable("ConnectionStrings:DefaultConnection", GlobalSetupFixture.DatabaseConnectionString);
new KeyValuePair<string, string?>( Environment.SetEnvironmentVariable("RedisHostName", $"localhost:{redisPort}");
"ConnectionStrings:DefaultConnection", Environment.SetEnvironmentVariable("RabbitMQ:Port", rabbitPort.ToString());
GlobalSetupFixture.DatabaseConnectionString),
new KeyValuePair<string, string?>(
"RedisHostName",
$"localhost:{redisPort}"),
new KeyValuePair<string, string?>(
"RabbitMQ:Port",
rabbitPort.ToString())
]);
configuration = configurationBuilder.Build();
});
builder.ConfigureServices(services => builder.ConfigureServices(services =>
{ {
@ -68,24 +49,7 @@ public sealed class CleanArchitectureWebApplicationFactory : WebApplicationFacto
}).AddTestAuthentication(_ => { }); }).AddTestAuthentication(_ => { });
} }
var sp = services.BuildServiceProvider(); _registerCustomServicesHandler?.Invoke(services);
using var scope = sp.CreateScope();
var scopedServices = scope.ServiceProvider;
// Readd rabbitmq options to use the correct port
var rabbitMq = new RabbitMqConfiguration();
configuration.Bind("RabbitMQ", rabbitMq);
services.AddSingleton(rabbitMq);
// Readd IDistributedCache to replace the memory cache with redis
services.AddStackExchangeRedisCache(options =>
{
options.Configuration = configuration["RedisHostName"];
options.InstanceName = "clean-architecture";
});
_registerCustomServicesHandler?.Invoke(services, sp, scopedServices);
}); });
} }
} }