Use SQLite instead of MSSQL in tests (#76)

bitwarden · Nov 21, 2023 · 1b518c4 · 1b518c4
1 parent 298df55
commit 1b518c4
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 55 deletions.
diff --git a/tests/Passwordless.Tests/Fixtures/TestApiFixture.cs b/tests/Passwordless.Tests/Fixtures/TestApiFixture.cs
@@ -10,65 +10,35 @@
 using DotNet.Testcontainers.Builders;
 using DotNet.Testcontainers.Containers;
 using DotNet.Testcontainers.Images;
-using DotNet.Testcontainers.Networks;
 using Microsoft.Extensions.DependencyInjection;
-using Testcontainers.MsSql;
 using Xunit;
 
 namespace Passwordless.Tests.Fixtures;
 
 public class TestApiFixture : IAsyncLifetime
 {
     private const string ManagementKey = "yourStrong(!)ManagementKey";
-    private const string DatabaseHost = "database";
     private const ushort ApiPort = 8080;
 
     private readonly HttpClient _http = new();
 
-    private readonly INetwork _network;
-    private readonly MsSqlContainer _databaseContainer;
     private readonly IContainer _apiContainer;
-
-    private readonly MemoryStream _databaseContainerStdOut = new();
-    private readonly MemoryStream _databaseContainerStdErr = new();
     private readonly MemoryStream _apiContainerStdOut = new();
     private readonly MemoryStream _apiContainerStdErr = new();
 
     private string PublicApiUrl => $"http://{_apiContainer.Hostname}:{_apiContainer.GetMappedPublicPort(ApiPort)}";
 
     public TestApiFixture()
     {
-        _network = new NetworkBuilder()
-            .Build();
-
-        _databaseContainer = new MsSqlBuilder()
-            .WithImage("mcr.microsoft.com/mssql/server:2022-latest")
-            .WithNetwork(_network)
-            .WithNetworkAliases(DatabaseHost)
-            .WithOutputConsumer(
-                Consume.RedirectStdoutAndStderrToStream(_databaseContainerStdOut, _databaseContainerStdErr)
-            )
-            .Build();
-
         _apiContainer = new ContainerBuilder()
             // https://github.com/passwordless/passwordless-server/pkgs/container/passwordless-test-api
             // TODO: replace with ':stable' after the next release of the server.
             .WithImage("ghcr.io/passwordless/passwordless-test-api:latest")
             // Make sure we always have the latest version of the image
             .WithImagePullPolicy(PullPolicy.Always)
-            .WithNetwork(_network)
             // Run in development environment to execute migrations
             .WithEnvironment("ASPNETCORE_ENVIRONMENT", "Development")
             .WithEnvironment("ASPNETCORE_HTTP_PORTS", ApiPort.ToString())
-            .WithEnvironment("ConnectionStrings__sqlite:api", "")
-            .WithEnvironment("ConnectionStrings__mssql:api",
-                $"Server={DatabaseHost},{MsSqlBuilder.MsSqlPort};" +
-                "Database=Passwordless;" +
-                $"User Id={MsSqlBuilder.DefaultUsername};" +
-                $"Password={MsSqlBuilder.DefaultPassword};" +
-                "Trust Server Certificate=true;" +
-                "Trusted_Connection=false;"
-            )
             .WithEnvironment("PasswordlessManagement__ManagementKey", ManagementKey)
             .WithPortBinding(ApiPort, true)
             // Wait until the API is launched, has performed migrations, and is ready to accept requests
@@ -96,8 +66,6 @@ public async Task InitializeAsync()
             // in case something goes wrong (e.g. wait strategy never succeeds).
             using var timeoutCts = new CancellationTokenSource(TimeSpan.FromMinutes(5));
 
-            await _network.CreateAsync(timeoutCts.Token);
-            await _databaseContainer.StartAsync(timeoutCts.Token);
             await _apiContainer.StartAsync(timeoutCts.Token);
         }
         catch (Exception ex) when (ex is OperationCanceledException or TimeoutException)
@@ -148,14 +116,6 @@ public async Task<IPasswordlessClient> CreateClientAsync()
 
     public string GetLogs()
     {
-        var databaseContainerStdOutText = Encoding.UTF8.GetString(
-            _databaseContainerStdOut.ToArray()
-        );
-
-        var databaseContainerStdErrText = Encoding.UTF8.GetString(
-            _databaseContainerStdErr.ToArray()
-        );
-
         var apiContainerStdOutText = Encoding.UTF8.GetString(
             _apiContainerStdOut.ToArray()
         );
@@ -164,7 +124,6 @@ public string GetLogs()
             _apiContainerStdErr.ToArray()
         );
 
-        // API logs are typically more relevant, so put them first
         return
             $"""
              # API container STDOUT:
@@ -174,25 +133,12 @@ public string GetLogs()
              # API container STDERR:
 
              {apiContainerStdErrText}
-
-             # Database container STDOUT:
-
-             {databaseContainerStdOutText}
-
-             # Database container STDERR:
-
-             {databaseContainerStdErrText}
              """;
     }
 
     public async Task DisposeAsync()
     {
         await _apiContainer.DisposeAsync();
-        await _databaseContainer.DisposeAsync();
-        await _network.DisposeAsync();
-
-        _databaseContainerStdOut.Dispose();
-        _databaseContainerStdErr.Dispose();
         _apiContainerStdOut.Dispose();
         _apiContainerStdErr.Dispose();
 

diff --git a/tests/Passwordless.Tests/Passwordless.Tests.csproj b/tests/Passwordless.Tests/Passwordless.Tests.csproj
@@ -18,7 +18,6 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="Testcontainers" Version="3.5.0" />
-    <PackageReference Include="Testcontainers.MsSql" Version="3.5.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="all" />
     <PackageReference Include="coverlet.collector" Version="3.2.0" PrivateAssets="all" />