Merge branch 'develop' into feat/smtp4dev

wim07101993 · web-flow · commit 0a11a892f271 · 2025-03-03T08:28:36.000+01:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <PackageId>$(AssemblyName)</PackageId>
-    <Version>4.3.0</Version>
+    <Version>4.4.0</Version>
     <AssemblyVersion>$(Version)</AssemblyVersion>
     <FileVersion>$(Version)</FileVersion>
     <Product>Testcontainers</Product>
diff --git a/docs/modules/cassandra.md b/docs/modules/cassandra.md
@@ -0,0 +1,27 @@
+# Apache Cassandra
+
+[Apache Cassandra](https://cassandra.apache.org/) is a powerful, open-source, distributed NoSQL database that is highly available and fault-tolerant, used to store, manage, and retrieve structured data.
+
+Add the following dependency to your project file:
+
+```shell title="NuGet"
+dotnet add package Testcontainers.Cassandra
+```
+
+You can start an Apache Cassandra container instance from any .NET application. This example uses xUnit.net's `IAsyncLifetime` interface to manage the lifecycle of the container. The container is started in the `InitializeAsync` method before the test method runs, ensuring that the environment is ready for testing. After the test completes, the container is removed in the `DisposeAsync` method.
+
+=== "Usage Example"
+    ```csharp
+    --8<-- "tests/Testcontainers.Cassandra.Tests/CassandraContainerTest.cs:UseCassandraContainer"
+    ```
+
+The test example uses the following NuGet dependencies:
+
+=== "Package References"
+    ```xml
+    --8<-- "tests/Testcontainers.Cassandra.Tests/Testcontainers.Cassandra.Tests.csproj:PackageReferences"
+    ```
+
+To execute the tests, use the command `dotnet test` from a terminal.
+
+--8<-- "docs/modules/_call_out_test_projects.txt"
diff --git a/examples/Flyway/Directory.Packages.props b/examples/Flyway/Directory.Packages.props
@@ -6,7 +6,7 @@
     <ItemGroup>
         <!-- Unit and integration test dependencies: -->
         <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
-        <PackageVersion Include="Testcontainers.PostgreSql" Version="4.0.0"/>
+        <PackageVersion Include="Testcontainers.PostgreSql" Version="4.2.0"/>
         <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2"/>
         <PackageVersion Include="xunit" Version="2.9.2"/>
         <!-- Third-party client dependencies to connect and interact with the containers: -->
diff --git a/examples/Respawn/Directory.Packages.props b/examples/Respawn/Directory.Packages.props
@@ -6,7 +6,7 @@
     <ItemGroup>
         <!-- Unit and integration test dependencies: -->
         <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
-        <PackageVersion Include="Testcontainers.PostgreSql" Version="4.0.0"/>
+        <PackageVersion Include="Testcontainers.PostgreSql" Version="4.2.0"/>
         <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2"/>
         <PackageVersion Include="xunit" Version="2.9.2"/>
         <!-- Third-party client dependencies to connect and interact with the containers: -->
diff --git a/examples/WeatherForecast/Directory.Packages.props b/examples/WeatherForecast/Directory.Packages.props
@@ -4,15 +4,15 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.1"/>
-    <PackageVersion Include="Microsoft.Fast.Components.FluentUI" Version="3.5.4"/>
-    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2"/>
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.13"/>
+    <PackageVersion Include="Microsoft.Fast.Components.FluentUI" Version="3.5.5"/>
+    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.11"/>
     <!-- Unit and integration test dependencies: -->
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.1"/>
-    <PackageVersion Include="Testcontainers.PostgreSql" Version="3.8.0"/>
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7"/>
-    <PackageVersion Include="xunit" Version="2.7.0"/>
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.13"/>
+    <PackageVersion Include="Testcontainers.PostgreSql" Version="4.2.0"/>
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2"/>
+    <PackageVersion Include="xunit" Version="2.9.2"/>
     <!-- Third-party client dependencies to connect and interact with the containers: -->
     <PackageVersion Include="Selenium.WebDriver.ChromeDriver" Version="106.0.5249.6100"/>
     <PackageVersion Include="Selenium.WebDriver" Version="4.9.1"/>
diff --git a/examples/WeatherForecast/src/WeatherForecast.Repositories/Usings.cs b/examples/WeatherForecast/src/WeatherForecast.Repositories/Usings.cs
@@ -1,7 +1,6 @@
 global using System;
 global using System.Collections.Generic;
 global using System.Linq;
-global using System.Threading;
 global using System.Threading.Tasks;
 global using JetBrains.Annotations;
 global using WeatherForecast.Entities;
diff --git a/examples/WeatherForecast/src/WeatherForecast/Program.cs b/examples/WeatherForecast/src/WeatherForecast/Program.cs
@@ -4,9 +4,9 @@
 builder.Services.AddRazorPages();
 builder.Services.AddServerSideBlazor();
 
-var connectionString = builder.Configuration.GetConnectionString("DefaultConnection");
+var postgreSqlConnectionString = builder.Configuration.GetConnectionString("PostgreSQL");
 
-if (string.IsNullOrWhiteSpace(connectionString))
+if (string.IsNullOrWhiteSpace(postgreSqlConnectionString))
 {
   // The application configuration does not include a database connection string, use Testcontainers for .NET to create, start and seed the dependent database.
   builder.Services.AddSingleton<DatabaseContainer>();
@@ -20,7 +20,7 @@
 else
 {
   // The application configuration includes a database connection string, use it to establish a connection and seed the database.
-  builder.Services.AddDbContext<WeatherDataContext>((_, options) => options.UseNpgsql(connectionString));
+  builder.Services.AddDbContext<WeatherDataContext>((_, options) => options.UseNpgsql(postgreSqlConnectionString));
 }
 
 builder.Services.AddScoped<IWeatherDataReadOnlyRepository, WeatherDataReadOnlyContext>();
diff --git a/examples/WeatherForecast/tests/WeatherForecast.InProcess.Tests/Usings.cs b/examples/WeatherForecast/tests/WeatherForecast.InProcess.Tests/Usings.cs
@@ -2,10 +2,10 @@
 global using System.Collections.Generic;
 global using System.Linq;
 global using System.Net;
-global using System.Net.Http;
 global using System.Text.Json;
 global using System.Threading.Tasks;
 global using JetBrains.Annotations;
+global using Microsoft.AspNetCore.Hosting;
 global using Microsoft.AspNetCore.Mvc.Testing;
 global using Microsoft.Extensions.DependencyInjection;
 global using Testcontainers.PostgreSql;
diff --git a/examples/WeatherForecast/tests/WeatherForecast.InProcess.Tests/WeatherForecastTest.cs b/examples/WeatherForecast/tests/WeatherForecast.InProcess.Tests/WeatherForecastTest.cs
@@ -15,32 +15,19 @@ public Task DisposeAsync()
     return _postgreSqlContainer.DisposeAsync().AsTask();
   }
 
-  public sealed class Api : IClassFixture<WeatherForecastTest>, IDisposable
+  public sealed class Api : WebApplicationFactory<Program>, IClassFixture<WeatherForecastTest>
   {
-    private readonly WebApplicationFactory<Program> _webApplicationFactory;
-
-    private readonly IServiceScope _serviceScope;
-
-    private readonly HttpClient _httpClient;
+    private readonly string _postgreSqlConnectionString;
 
     public Api(WeatherForecastTest weatherForecastTest)
     {
-      // Instead of using environment variables to bootstrap our application configuration, we can implement a custom WebApplicationFactory<TEntryPoint>
-      // that overrides the ConfigureWebHost(IWebHostBuilder) method to add a WeatherDataContext to the service collection.
-      Environment.SetEnvironmentVariable("ASPNETCORE_URLS", "https://+");
-      Environment.SetEnvironmentVariable("ASPNETCORE_Kestrel__Certificates__Default__Path", "certificate.crt");
-      Environment.SetEnvironmentVariable("ASPNETCORE_Kestrel__Certificates__Default__Password", "password");
-      Environment.SetEnvironmentVariable("ConnectionStrings__DefaultConnection", weatherForecastTest._postgreSqlContainer.GetConnectionString());
-      _webApplicationFactory = new WebApplicationFactory<Program>();
-      _serviceScope = _webApplicationFactory.Services.GetRequiredService<IServiceScopeFactory>().CreateScope();
-      _httpClient = _webApplicationFactory.CreateClient();
+      _postgreSqlConnectionString = weatherForecastTest._postgreSqlContainer.GetConnectionString();
     }
 
-    public void Dispose()
+    protected override void ConfigureWebHost(IWebHostBuilder builder)
     {
-      _httpClient.Dispose();
-      _serviceScope.Dispose();
-      _webApplicationFactory.Dispose();
+      builder.UseSetting("URLS", "https://+");
+      builder.UseSetting("ConnectionStrings:PostgreSQL", _postgreSqlConnectionString);
     }
 
     [Fact]
@@ -50,8 +37,10 @@ public async Task Get_WeatherForecast_ReturnsSevenDays()
       // Given
       const string path = "api/WeatherForecast";
 
+      using var httpClient = CreateClient();
+
       // When
-      var response = await _httpClient.GetAsync(path)
+      var response = await httpClient.GetAsync(path)
         .ConfigureAwait(true);
 
       var weatherForecastStream = await response.Content.ReadAsStreamAsync()
@@ -72,7 +61,9 @@ public async Task Get_WeatherForecast_ReturnsThreeDays()
       // Given
       const int threeDays = 3;
 
-      var weatherDataReadOnlyRepository = _serviceScope.ServiceProvider.GetRequiredService<IWeatherDataReadOnlyRepository>();
+      using var serviceScope = Services.CreateScope();
+
+      var weatherDataReadOnlyRepository = serviceScope.ServiceProvider.GetRequiredService<IWeatherDataReadOnlyRepository>();
 
       // When
       var weatherForecast = await weatherDataReadOnlyRepository.GetAllAsync(string.Empty, string.Empty, DateTime.Today, DateTime.Today.AddDays(threeDays))
diff --git a/examples/WeatherForecast/tests/WeatherForecast.Tests/WeatherForecastContainer.cs b/examples/WeatherForecast/tests/WeatherForecast.Tests/WeatherForecastContainer.cs
@@ -22,7 +22,7 @@ public WeatherForecastContainer()
   {
     const string weatherForecastStorage = "weatherForecastStorage";
 
-    const string connectionString = $"Host={weatherForecastStorage};Username={PostgreSqlBuilder.DefaultUsername};Password={PostgreSqlBuilder.DefaultPassword};Database={PostgreSqlBuilder.DefaultDatabase}";
+    const string postgreSqlConnectionString = $"Host={weatherForecastStorage};Username={PostgreSqlBuilder.DefaultUsername};Password={PostgreSqlBuilder.DefaultPassword};Database={PostgreSqlBuilder.DefaultDatabase}";
 
     _weatherForecastNetwork = new NetworkBuilder()
       .Build();
@@ -39,7 +39,7 @@ public WeatherForecastContainer()
       .WithEnvironment("ASPNETCORE_URLS", "https://+")
       .WithEnvironment("ASPNETCORE_Kestrel__Certificates__Default__Path", WeatherForecastImage.CertificateFilePath)
       .WithEnvironment("ASPNETCORE_Kestrel__Certificates__Default__Password", WeatherForecastImage.CertificatePassword)
-      .WithEnvironment("ConnectionStrings__DefaultConnection", connectionString)
+      .WithEnvironment("ConnectionStrings__PostgreSQL", postgreSqlConnectionString)
       .WithWaitStrategy(Wait.ForUnixContainer().UntilPortIsAvailable(WeatherForecastImage.HttpsPort))
       .Build();
   }
diff --git a/examples/WeatherForecast/tests/WeatherForecast.Tests/WeatherForecastImage.cs b/examples/WeatherForecast/tests/WeatherForecast.Tests/WeatherForecastImage.cs
@@ -11,7 +11,17 @@ public sealed class WeatherForecastImage : IImage, IAsyncLifetime
 
   private readonly SemaphoreSlim _semaphoreSlim = new SemaphoreSlim(1, 1);
 
-  private readonly IImage _image = new DockerImage("localhost/testcontainers", "weather-forecast", DateTimeOffset.UtcNow.ToUnixTimeSeconds().ToString());
+  private readonly IImage _image = new DockerImage("localhost/testcontainers/weather-forecast", tag: DateTimeOffset.UtcNow.ToUnixTimeSeconds().ToString());
+
+  public string Repository => _image.Repository;
+
+  public string Registry => _image.Registry;
+
+  public string Tag => _image.Tag;
+
+  public string Digest => _image.Digest;
+
+  public string FullName => _image.FullName;
 
   public async Task InitializeAsync()
   {
@@ -41,16 +51,23 @@ public Task DisposeAsync()
     return Task.CompletedTask;
   }
 
-  public string Repository => _image.Repository;
-
-  public string Name => _image.Name;
+  public string GetHostname()
+  {
+    return _image.GetHostname();
+  }
 
-  public string Tag => _image.Tag;
+  public bool MatchLatestOrNightly()
+  {
+    return _image.MatchLatestOrNightly();
+  }
 
-  public string FullName => _image.FullName;
+  public bool MatchVersion(Predicate<string> predicate)
+  {
+    return _image.MatchVersion(predicate);
+  }
 
-  public string GetHostname()
+  public bool MatchVersion(Predicate<Version> predicate)
   {
-    return _image.GetHostname();
+    return _image.MatchVersion(predicate);
   }
 }
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -47,13 +47,14 @@ nav:
     - examples/aspnet.md
   - Modules:
     - modules/index.md
+    - modules/cassandra.md
+    - modules/pulsar.md
     - modules/db2.md
     - modules/elasticsearch.md
     - modules/mongodb.md
     - modules/mssql.md
     - modules/neo4j.md
     - modules/postgres.md
-    - modules/pulsar.md
     - modules/rabbitmq.md
   - contributing.md
   - contributing_docs.md
diff --git a/src/Testcontainers.Cassandra/CassandraBuilder.cs b/src/Testcontainers.Cassandra/CassandraBuilder.cs
@@ -1,4 +1,4 @@
-﻿namespace Testcontainers.Cassandra;
+namespace Testcontainers.Cassandra;
 
 /// <inheritdoc cref="ContainerBuilder{TBuilderEntity, TContainerEntity, TConfigurationEntity}" />
 [PublicAPI]
diff --git a/src/Testcontainers.Cassandra/CassandraConfiguration.cs b/src/Testcontainers.Cassandra/CassandraConfiguration.cs
@@ -1,4 +1,4 @@
-﻿namespace Testcontainers.Cassandra;
+namespace Testcontainers.Cassandra;
 
 /// <inheritdoc cref="ContainerConfiguration" />
 [PublicAPI]
diff --git a/src/Testcontainers.Cassandra/CassandraContainer.cs b/src/Testcontainers.Cassandra/CassandraContainer.cs
@@ -1,4 +1,4 @@
-﻿namespace Testcontainers.Cassandra;
+namespace Testcontainers.Cassandra;
 
 /// <inheritdoc cref="DockerContainer" />
 [PublicAPI]
diff --git a/src/Testcontainers.Cassandra/Testcontainers.Cassandra.csproj b/src/Testcontainers.Cassandra/Testcontainers.Cassandra.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFrameworks>net8.0;net9.0;netstandard2.0;netstandard2.1</TargetFrameworks>
         <LangVersion>latest</LangVersion>
diff --git a/src/Testcontainers/Configurations/WaitStrategies/UntilMessageIsLogged.cs b/src/Testcontainers/Configurations/WaitStrategies/UntilMessageIsLogged.cs
@@ -21,7 +21,8 @@ public UntilMessageIsLogged(Regex pattern)
 
     public async Task<bool> UntilAsync(IContainer container)
     {
-      var (stdout, stderr) = await container.GetLogsAsync(since: container.StoppedTime, timestampsEnabled: false)
+      var maxTime = container.StoppedTime > container.CreatedTime ? container.StoppedTime : container.CreatedTime;
+      var (stdout, stderr) = await container.GetLogsAsync(since: maxTime, timestampsEnabled: false)
         .ConfigureAwait(false);
 
       return _pattern.IsMatch(stdout) || _pattern.IsMatch(stderr);
diff --git a/tests/Testcontainers.Cassandra.Tests/CassandraContainerTest.cs b/tests/Testcontainers.Cassandra.Tests/CassandraContainerTest.cs
@@ -1,7 +1,8 @@
-﻿namespace Testcontainers.Cassandra;
+namespace Testcontainers.Cassandra;
 
 public sealed class CassandraContainerTest : IAsyncLifetime
 {
+    // # --8<-- [start:UseCassandraContainer]
     private readonly CassandraContainer _cassandraContainer = new CassandraBuilder().Build();
 
     public Task InitializeAsync()
@@ -50,6 +51,7 @@ public void ExecuteCqlStatementReturnsExpectedResult()
         Assert.Single(rows);
         Assert.Equal("COMPLETED", rows[0]["bootstrapped"]);
     }
+    // # --8<-- [end:UseCassandraContainer]
 
     [Fact]
     [Trait(nameof(DockerCli.DockerPlatform), nameof(DockerCli.DockerPlatform.Linux))]
diff --git a/tests/Testcontainers.Cassandra.Tests/Testcontainers.Cassandra.Tests.csproj b/tests/Testcontainers.Cassandra.Tests/Testcontainers.Cassandra.Tests.csproj
@@ -1,15 +1,17 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFrameworks>net9.0</TargetFrameworks>
         <IsPackable>false</IsPackable>
         <IsPublishable>false</IsPublishable>
     </PropertyGroup>
     <ItemGroup>
+        <!-- -8<- [start:PackageReferences] -->
         <PackageReference Include="Microsoft.NET.Test.Sdk"/>
         <PackageReference Include="coverlet.collector"/>
         <PackageReference Include="xunit.runner.visualstudio"/>
         <PackageReference Include="xunit"/>
         <PackageReference Include="CassandraCSharpDriver"/>
+        <!-- -8<- [end:PackageReferences] -->
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="../../src/Testcontainers.Cassandra/Testcontainers.Cassandra.csproj"/>
diff --git a/tests/Testcontainers.Cassandra.Tests/Usings.cs b/tests/Testcontainers.Cassandra.Tests/Usings.cs
@@ -1,4 +1,4 @@
-﻿global using System.Collections.Immutable;
+global using System.Collections.Immutable;
 global using System.Data;
 global using System.Data.Common;
 global using System.Threading.Tasks;
diff --git a/tests/Testcontainers.Commons/SharedContainerInstance.cs b/tests/Testcontainers.Commons/SharedContainerInstance.cs
diff --git a/tests/Testcontainers.Commons/Testcontainers.Commons.csproj b/tests/Testcontainers.Commons/Testcontainers.Commons.csproj
@@ -9,7 +9,6 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="JetBrains.Annotations" VersionOverride="2023.3.0"/>
-        <PackageReference Include="xunit"/>
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="../../src/Testcontainers/Testcontainers.csproj"/>
diff --git a/tests/Testcontainers.Commons/Usings.cs b/tests/Testcontainers.Commons/Usings.cs
@@ -2,8 +2,5 @@
 global using System.Diagnostics;
 global using System.IO;
 global using System.Text;
-global using System.Threading.Tasks;
-global using DotNet.Testcontainers.Containers;
 global using DotNet.Testcontainers.Images;
-global using JetBrains.Annotations;
-global using Xunit;
+global using JetBrains.Annotations;
diff --git a/tests/Testcontainers.PostgreSql.Tests/PostgreSqlContainerTest.cs b/tests/Testcontainers.PostgreSql.Tests/PostgreSqlContainerTest.cs
diff --git a/tests/Testcontainers.PostgreSql.Tests/Testcontainers.PostgreSql.Tests.csproj b/tests/Testcontainers.PostgreSql.Tests/Testcontainers.PostgreSql.Tests.csproj
diff --git a/tests/Testcontainers.PostgreSql.Tests/Usings.cs b/tests/Testcontainers.PostgreSql.Tests/Usings.cs

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@`
`4`	`4`	`builder.Services.AddRazorPages();`
`5`	`5`	`builder.Services.AddServerSideBlazor();`
`6`	`6`
`7`		`-var connectionString = builder.Configuration.GetConnectionString("DefaultConnection");`
	`7`	`+var postgreSqlConnectionString = builder.Configuration.GetConnectionString("PostgreSQL");`
`8`	`8`
`9`		`-if (string.IsNullOrWhiteSpace(connectionString))`
	`9`	`+if (string.IsNullOrWhiteSpace(postgreSqlConnectionString))`
`10`	`10`	`{`
`11`	`11`	`// The application configuration does not include a database connection string, use Testcontainers for .NET to create, start and seed the dependent database.`
`12`	`12`	`builder.Services.AddSingleton<DatabaseContainer>();`
`@@ -20,7 +20,7 @@`
`20`	`20`	`else`
`21`	`21`	`{`
`22`	`22`	`// The application configuration includes a database connection string, use it to establish a connection and seed the database.`
`23`		`- builder.Services.AddDbContext<WeatherDataContext>((_, options) => options.UseNpgsql(connectionString));`
	`23`	`+ builder.Services.AddDbContext<WeatherDataContext>((_, options) => options.UseNpgsql(postgreSqlConnectionString));`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`builder.Services.AddScoped<IWeatherDataReadOnlyRepository, WeatherDataReadOnlyContext>();`