diff --git a/CleanArchitecture.IntegrationTests/Constants/Configuration.cs b/CleanArchitecture.IntegrationTests/Constants/Configuration.cs deleted file mode 100644 index 892194c..0000000 --- a/CleanArchitecture.IntegrationTests/Constants/Configuration.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace CleanArchitecture.IntegrationTests.Constants; - -public static class Configuration -{ - public const int RedisPort = 6379; - public const int MsSqlPort = 1433; - public const int RabbitMqPort = 5672; -} diff --git a/CleanArchitecture.IntegrationTests/GlobalSetupFixture.cs b/CleanArchitecture.IntegrationTests/GlobalSetupFixture.cs index 13a8277..1ca5a3a 100644 --- a/CleanArchitecture.IntegrationTests/GlobalSetupFixture.cs +++ b/CleanArchitecture.IntegrationTests/GlobalSetupFixture.cs @@ -1,6 +1,5 @@ using System; using System.Threading.Tasks; -using CleanArchitecture.IntegrationTests.Constants; using Respawn; using Testcontainers.MsSql; using Testcontainers.RabbitMq; @@ -14,17 +13,17 @@ internal class GlobalSetupFixture private static Respawner? s_respawner; public static MsSqlContainer DatabaseContainer { get; } = new MsSqlBuilder() - .WithPortBinding(Configuration.MsSqlPort, assignRandomHostPort: true) + .WithPortBinding(MsSqlBuilder.MsSqlPort, assignRandomHostPort: true) .Build(); public static RedisContainer RedisContainer { get; } = new RedisBuilder() - .WithPortBinding(Configuration.RedisPort, assignRandomHostPort: true) + .WithPortBinding(RedisBuilder.RedisPort, assignRandomHostPort: true) .Build(); public static RabbitMqContainer RabbitContainer { get; } = new RabbitMqBuilder() .WithUsername("guest") .WithPassword("guest") - .WithPortBinding(Configuration.RabbitMqPort, assignRandomHostPort: true) + .WithPortBinding(RabbitMqBuilder.RabbitMqPort, assignRandomHostPort: true) .Build(); public static string DatabaseConnectionString { get; private set; } = string.Empty; diff --git a/CleanArchitecture.IntegrationTests/Infrastructure/CleanArchitectureWebApplicationFactory.cs b/CleanArchitecture.IntegrationTests/Infrastructure/CleanArchitectureWebApplicationFactory.cs index 112c170..750e1b7 100644 --- a/CleanArchitecture.IntegrationTests/Infrastructure/CleanArchitectureWebApplicationFactory.cs +++ b/CleanArchitecture.IntegrationTests/Infrastructure/CleanArchitectureWebApplicationFactory.cs @@ -1,12 +1,10 @@ using System; -using System.Collections.Generic; -using CleanArchitecture.Domain.Rabbitmq; -using CleanArchitecture.IntegrationTests.Constants; using CleanArchitecture.IntegrationTests.Infrastructure.Auth; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc.Testing; -using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Testcontainers.RabbitMq; +using Testcontainers.Redis; namespace CleanArchitecture.IntegrationTests.Infrastructure; @@ -31,8 +29,8 @@ public sealed class CleanArchitectureWebApplicationFactory : WebApplicationFacto builder.UseEnvironment("Integration"); base.ConfigureWebHost(builder); - var redisPort = GlobalSetupFixture.RedisContainer.GetMappedPublicPort(Configuration.RedisPort); - var rabbitPort = GlobalSetupFixture.RabbitContainer.GetMappedPublicPort(Configuration.RabbitMqPort); + var redisPort = GlobalSetupFixture.RedisContainer.GetMappedPublicPort(RedisBuilder.RedisPort); + var rabbitPort = GlobalSetupFixture.RabbitContainer.GetMappedPublicPort(RabbitMqBuilder.RabbitMqPort); Environment.SetEnvironmentVariable("ConnectionStrings:DefaultConnection", GlobalSetupFixture.DatabaseConnectionString); Environment.SetEnvironmentVariable("RedisHostName", $"localhost:{redisPort}");