use test container

Author: pwelter34

.github/workflows/dotnet.yml

@@ -24,33 +24,6 @@ jobs:
   build:
     runs-on: ubuntu-latest
 
-    services:
-      mssql:
-        image: mcr.microsoft.com/mssql/server:2022-latest
-        env:
-          MSSQL_SA_PASSWORD: "!P@ssw0rd"
-          ACCEPT_EULA: "Y"
-        ports:
-          - 1433:1433
-        volumes:
-          - mssql_data:/var/opt/mssql
-
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_PASSWORD: "!P@ssw0rd"
-        ports:
-          - 5432:5432
-        volumes:
-          - postgres_data:/var/lib/postgresql/data
-
-      redis:
-        image: redis
-        ports:
-          - 6379:6379
-        volumes:
-          - redis_data:/data
-
     steps:
       - name: Checkout
         uses: actions/checkout@v4

…d.Caching/ServiceCollectionExtensions.cs …ng/DataConfigurationBuilderExtensions.cssrc/FluentCommand.Caching/ServiceCollectionExtensions.cs renamed to src/FluentCommand.Caching/DataConfigurationBuilderExtensions.cs src/FluentCommand.Caching/ServiceCollectionExtensions.cs renamed to src/FluentCommand.Caching/DataConfigurationBuilderExtensions.cs

@@ -5,8 +5,16 @@
 
 namespace FluentCommand.Caching;
 
-public static class ServiceCollectionExtensions
+/// <summary>
+/// Extension methods for <see cref="DataConfigurationBuilder"/>
+/// </summary>
+public static class DataConfigurationBuilderExtensions
 {
+    /// <summary>
+    /// Adds the distributed data cache.
+    /// </summary>
+    /// <param name="builder">The data configuration builder.</param>
+    /// <returns></returns>
     public static DataConfigurationBuilder AddDistributedDataCache(this DataConfigurationBuilder builder)
     {
         builder.AddService(sp =>

src/FluentCommand.Json/ConcurrencyTokenJsonConverter.cs

@@ -3,11 +3,36 @@
 
 namespace FluentCommand;
 
+/// <summary>
+/// Json Converter for <see cref="ConcurrencyToken"/>
+/// </summary>
 public class ConcurrencyTokenJsonConverter : JsonConverter<ConcurrencyToken>
 {
+    /// <summary>
+    /// Read and convert the JSON to T.
+    /// </summary>
+    /// <param name="reader">The <see cref="T:System.Text.Json.Utf8JsonReader" /> to read from.</param>
+    /// <param name="typeToConvert">The <see cref="T:System.Type" /> being converted.</param>
+    /// <param name="options">The <see cref="T:System.Text.Json.JsonSerializerOptions" /> being used.</param>
+    /// <returns>
+    /// The value that was converted.
+    /// </returns>
+    /// <remarks>
+    /// A converter may throw any Exception, but should throw <cref>JsonException</cref> when the JSON is invalid.
+    /// </remarks>
     public override ConcurrencyToken Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        => new ConcurrencyToken(reader.GetString());
+        => new(reader.GetString());
 
+    /// <summary>
+    /// Write the value as JSON.
+    /// </summary>
+    /// <param name="writer">The <see cref="T:System.Text.Json.Utf8JsonWriter" /> to write to.</param>
+    /// <param name="value">The value to convert. Note that the value of <seealso cref="P:System.Text.Json.Serialization.JsonConverter`1.HandleNull" /> determines if the converter handles <see langword="null" /> values.</param>
+    /// <param name="options">The <see cref="T:System.Text.Json.JsonSerializerOptions" /> being used.</param>
+    /// <remarks>
+    /// A converter may throw any Exception, but should throw <cref>JsonException</cref> when the JSON
+    /// cannot be created.
+    /// </remarks>
     public override void Write(Utf8JsonWriter writer, ConcurrencyToken value, JsonSerializerOptions options)
         => writer.WriteStringValue(value.ToString());
 }

test/FluentCommand.Generators.Tests/FluentCommand.Generators.Tests.csproj

@@ -7,6 +7,12 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="TestResults\**" />
+    <EmbeddedResource Remove="TestResults\**" />
+    <None Remove="TestResults\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

test/FluentCommand.PostgreSQL.Tests/DatabaseFixture.cs

@@ -1,15 +1,36 @@
+using System.Threading.Tasks;
+
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 using Npgsql;
 
+using Testcontainers.PostgreSql;
+
+using Xunit;
+
 using XUnit.Hosting;
 
 namespace FluentCommand.PostgreSQL.Tests;
 
-public class DatabaseFixture : TestHostFixture
+public class DatabaseFixture : TestHostFixture, IAsyncLifetime
 {
+    private readonly PostgreSqlContainer _postgreSqlContainer = new PostgreSqlBuilder()
+        .WithDatabase("TrackerDocker")
+        .Build();
+
+    public async Task InitializeAsync()
+    {
+        await _postgreSqlContainer.StartAsync();
+    }
+
+    public async Task DisposeAsync()
+    {
+        await _postgreSqlContainer.DisposeAsync();
+    }
+
+
     protected override void ConfigureLogging(HostBuilderContext context, ILoggingBuilder builder)
     {
         base.ConfigureLogging(context, builder);
@@ -18,10 +39,12 @@ protected override void ConfigureLogging(HostBuilderContext context, ILoggingBui
 
     protected override void ConfigureServices(HostBuilderContext context, IServiceCollection services)
     {
+        var trackerConnection = _postgreSqlContainer.GetConnectionString();
+
         services.AddHostedService<DatabaseInitializer>();
 
         services.AddFluentCommand(builder => builder
-            .UseConnectionName("Tracker")
+            .UseConnectionString(trackerConnection)
             .AddProviderFactory(NpgsqlFactory.Instance)
             .AddPostgreSqlGenerator()
         );

test/FluentCommand.PostgreSQL.Tests/DatabaseInitializer.cs

@@ -14,9 +14,9 @@ namespace FluentCommand.PostgreSQL.Tests;
 public class DatabaseInitializer : IHostedService, IUpgradeLog
 {
     private readonly ILogger<DatabaseInitializer> _logger;
-    private readonly IConfiguration _configuration;
+    private readonly IDataConfiguration _configuration;
 
-    public DatabaseInitializer(ILogger<DatabaseInitializer> logger, IConfiguration configuration)
+    public DatabaseInitializer(ILogger<DatabaseInitializer> logger, IDataConfiguration configuration)
     {
         _logger = logger;
         _configuration = configuration;
@@ -25,7 +25,7 @@ public DatabaseInitializer(ILogger<DatabaseInitializer> logger, IConfiguration c
 
     public Task StartAsync(CancellationToken cancellationToken)
     {
-        var connectionString = _configuration.GetConnectionString("Tracker");
+        var connectionString = _configuration.ConnectionString;
 
         EnsureDatabase.For.PostgresqlDatabase(connectionString, this);
 

test/FluentCommand.PostgreSQL.Tests/FluentCommand.PostgreSQL.Tests.csproj

@@ -5,6 +5,12 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="TestResults\**" />
+    <EmbeddedResource Remove="TestResults\**" />
+    <None Remove="TestResults\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Remove="Scripts\Script001.Tracker.Schema.sql" />
     <None Remove="Scripts\Script002.Tracker.Data.sql" />
@@ -24,6 +30,7 @@
     <PackageReference Include="dbup-postgresql" Version="5.0.37" />
     <PackageReference Include="Npgsql" Version="7.0.6" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Testcontainers.Postgresql" Version="3.5.0" />
     <PackageReference Include="XUnit.Hosting" Version="1.0.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
       <PrivateAssets>all</PrivateAssets>

test/FluentCommand.SQLite.Tests/FluentCommand.SQLite.Tests.csproj

@@ -5,6 +5,12 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="TestResults\**" />
+    <EmbeddedResource Remove="TestResults\**" />
+    <None Remove="TestResults\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Remove="Scripts\Script001.Tracker.Schema.sql" />
     <None Remove="Scripts\Script002.Tracker.Data.sql" />

test/FluentCommand.SqlServer.Tests/DataConfigurationTests.cs

@@ -49,7 +49,7 @@ public void GetServices()
 
         var dataConfiguration = services.GetService<IDataConfiguration>();
         dataConfiguration.Should().NotBeNull();
-        dataConfiguration.ConnectionString.Should().NotEndWith("ApplicationIntent=ReadOnly;");
+        dataConfiguration.ConnectionString.Should().NotContain("Application Intent=ReadOnly");
 
         var dataSession = services.GetService<IDataSession>();
         dataSession.Should().NotBeNull();
@@ -59,7 +59,7 @@ public void GetServices()
 
         var readonlyConfiguration = services.GetService<IDataConfiguration<ReadOnlyIntent>>();
         readonlyConfiguration.Should().NotBeNull();
-        readonlyConfiguration.ConnectionString.Should().EndWith("ApplicationIntent=ReadOnly;");
+        //readonlyConfiguration.ConnectionString.Should().Contain("Application Intent=ReadOnly");
 
         var readonlySession = services.GetService<IDataSession<ReadOnlyIntent>>();
         readonlySession.Should().NotBeNull();

test/FluentCommand.SqlServer.Tests/DatabaseFixture.cs

@@ -1,17 +1,44 @@
+using System.Threading.Tasks;
+
 using FluentCommand.Caching;
 
 using Microsoft.Data.SqlClient;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
+using Testcontainers.MsSql;
+using Testcontainers.Redis;
+
+using Xunit;
+
 using XUnit.Hosting;
 
 namespace FluentCommand.SqlServer.Tests;
 
-public class DatabaseFixture : TestHostFixture
+public class DatabaseFixture : TestHostFixture, IAsyncLifetime
 {
+    private readonly MsSqlContainer _msSqlContainer = new MsSqlBuilder()
+        .WithImage("mcr.microsoft.com/mssql/server:2022-latest")
+        .WithPassword("!P@ss0rd")
+        .Build();
+
+    private readonly RedisContainer _redisContainer = new RedisBuilder()
+        .Build();
+
+
+    public async Task InitializeAsync()
+    {
+        await _msSqlContainer.StartAsync();
+        await _redisContainer.StartAsync();
+    }
+
+    public async Task DisposeAsync()
+    {
+        await _msSqlContainer.DisposeAsync();
+        await _redisContainer.DisposeAsync();
+    }
+
     protected override void ConfigureLogging(HostBuilderContext context, ILoggingBuilder builder)
     {
         base.ConfigureLogging(context, builder);
@@ -20,8 +47,14 @@ protected override void ConfigureLogging(HostBuilderContext context, ILoggingBui
 
     protected override void ConfigureServices(HostBuilderContext context, IServiceCollection services)
     {
-        var trackerConnection = context.Configuration.GetConnectionString("Tracker");
-        var cacheConnection = context.Configuration.GetConnectionString("DistributedCache");
+        // change database from container default
+        var connectionBuilder = new SqlConnectionStringBuilder(_msSqlContainer.GetConnectionString())
+        {
+            InitialCatalog = "TrackerDocker"
+        };
+
+        var trackerConnection = connectionBuilder.ToString();
+        var cacheConnection = _redisContainer.GetConnectionString();
 
         services.AddHostedService<DatabaseInitializer>();
 
@@ -37,13 +70,15 @@ protected override void ConfigureServices(HostBuilderContext context, IServiceCo
             .AddDistributedDataCache()
         );
 
-        var readOnlyConnection = trackerConnection + "ApplicationIntent=ReadOnly;";
+        // readonly intent connection
+        connectionBuilder.ApplicationIntent = ApplicationIntent.ReadOnly;
+
+        var readOnlyConnection = connectionBuilder.ToString();
 
         services.AddFluentCommand<ReadOnlyIntent>(builder => builder
             .UseConnectionString(readOnlyConnection)
             .UseSqlServer()
             .AddDistributedDataCache()
         );
     }
-
 }