(#347) Added MSSQL TestContainer Fixture (#351)

Author: adrianhall

Directory.Packages.props

@@ -40,6 +40,7 @@
     <PackageVersion Include="System.Text.Json" Version="9.0.4" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="9.0.4" />
+    <PackageVersion Include="TestContainers.MsSql" Version="4.4.0" />
     <PackageVersion Include="TestContainers.MySql" Version="4.4.0" />
     <PackageVersion Include="TestContainers.PostgreSql" Version="4.4.0" />
     <PackageVersion Include="xunit" Version="2.9.3" />

infra/modules/postgresql.bicep

@@ -33,7 +33,6 @@ var appServicePlanName = 'asp-${resourceToken}'
 var appServiceName = 'web-${resourceToken}'
 var azsqlServerName = 'sql-${resourceToken}'
 var cosmosServerName = 'cosmos-${resourceToken}'
-var pgsqlServerName = 'pgsql-${resourceToken}'
 var mongoServerName = 'mongo-${resourceToken}'
 var mongoaciServerName = 'mongoaci-${resourceToken}'
 
@@ -67,19 +66,6 @@ module azuresql './modules/azuresql.bicep' = {
     }
 }
 
-module pgsql './modules/postgresql.bicep' = {
-    name: 'pgsql-deployment-${resourceToken}'
-    params: {
-        location: location
-        tags: tags
-        databaseName: testDatabaseName
-        firewallRules: clientIpFirewallRules
-        sqlServerName: pgsqlServerName
-        sqlAdminUsername: sqlAdminUsername
-        sqlAdminPassword: sqlAdminPassword
-    }
-}
-
 module cosmos './modules/cosmos.bicep' = {
     name: 'cosmos-deployment-${resourceToken}'
     params: {
@@ -136,5 +122,4 @@ output AZSQL_CONNECTIONSTRING string = azuresql.outputs.AZSQL_CONNECTIONSTRING
 output COSMOS_CONNECTIONSTRING string = cosmos.outputs.COSMOS_CONNECTIONSTRING
 output MONGO_CONNECTIONSTRING string = mongodb.outputs.MONGO_CONNECTIONSTRING
 output MONGOACI_CONNECTIONSTRING string = mongoaci.outputs.MONGO_CONNECTIONSTRING
-output PGSQL_CONNECTIONSTRING string = pgsql.outputs.PGSQL_CONNECTIONSTRING
 output SERVICE_ENDPOINT string = app_service.outputs.SERVICE_ENDPOINT

infra/resources.bicep

@@ -4,6 +4,7 @@
 
 using CommunityToolkit.Datasync.TestCommon;
 using CommunityToolkit.Datasync.TestCommon.Databases;
+using CommunityToolkit.Datasync.TestCommon.Fixtures;
 using Microsoft.EntityFrameworkCore;
 using Xunit.Abstractions;
 
@@ -13,19 +14,16 @@ namespace CommunityToolkit.Datasync.Server.EntityFrameworkCore.Test;
 
 [ExcludeFromCodeCoverage]
 [Collection("LiveTestsCollection")]
-public class AzureSqlEntityTableRepository_Tests(DatabaseFixture fixture, ITestOutputHelper output) : RepositoryTests<AzureSqlEntityMovie>, IAsyncLifetime
+public class AzureSqlEntityTableRepository_Tests(MsSqlDatabaseFixture fixture, ITestOutputHelper output) : RepositoryTests<AzureSqlEntityMovie>, IClassFixture<MsSqlDatabaseFixture>, IAsyncLifetime
 {
     #region Setup
     private readonly Random random = new();
     private List<AzureSqlEntityMovie> movies = [];
 
     public async Task InitializeAsync()
     {
-        if (!string.IsNullOrEmpty(ConnectionStrings.AzureSql))
-        {
-            Context = await AzureSqlDbContext.CreateContextAsync(ConnectionStrings.AzureSql, output);
-            this.movies = await Context.Movies.AsNoTracking().ToListAsync();
-        }
+        Context = await AzureSqlDbContext.CreateContextAsync(fixture.ConnectionString, output);
+        this.movies = await Context.Movies.AsNoTracking().ToListAsync();
     }
 
     public async Task DisposeAsync()
@@ -38,7 +36,7 @@ public async Task DisposeAsync()
 
     private AzureSqlDbContext Context { get; set; }
 
-    protected override bool CanRunLiveTests() => !string.IsNullOrEmpty(ConnectionStrings.AzureSql);
+    protected override bool CanRunLiveTests() => true;
 
     protected override async Task<AzureSqlEntityMovie> GetEntityAsync(string id)
         => await Context.Movies.AsNoTracking().SingleOrDefaultAsync(m => m.Id == id);

tests/CommunityToolkit.Datasync.Server.EntityFrameworkCore.Test/AzureSqlEntityTableRepository_Tests.cs

@@ -5,31 +5,24 @@
 using CommunityToolkit.Datasync.Server.EntityFrameworkCore;
 using CommunityToolkit.Datasync.Server.Test.Helpers;
 using CommunityToolkit.Datasync.TestCommon.Databases;
+using CommunityToolkit.Datasync.TestCommon.Fixtures;
 using Microsoft.EntityFrameworkCore;
 using Xunit.Abstractions;
 
 namespace CommunityToolkit.Datasync.Server.Test.Live;
 
 [ExcludeFromCodeCoverage]
 [Collection("LiveTestsCollection")]
-public class AzureSQL_Controller_Tests(DatabaseFixture fixture, ITestOutputHelper output) : LiveControllerTests<AzureSqlEntityMovie>, IAsyncLifetime
+public class AzureSQL_Controller_Tests(MsSqlDatabaseFixture fixture, ITestOutputHelper output) : LiveControllerTests<AzureSqlEntityMovie>, IClassFixture<MsSqlDatabaseFixture>, IAsyncLifetime
 {
     #region Setup
     private readonly Random random = new();
     private List<AzureSqlEntityMovie> movies = [];
 
     public async Task InitializeAsync()
     {
-        if (!string.IsNullOrEmpty(ConnectionStrings.AzureSql))
-        {
-            // Note: we don't clear entities on every run to speed up the test runs.  This can only be done because
-            // the tests are read-only (associated with the query and get capabilities).  If the test being run writes
-            // to the database then change clearEntities to true.
-            output.WriteLine($"AzureSqlIsInitialized = {fixture.AzureSqlIsInitialized}");
-            Context = await AzureSqlDbContext.CreateContextAsync(ConnectionStrings.AzureSql, output, clearEntities: !fixture.AzureSqlIsInitialized);
-            this.movies = await Context.Movies.AsNoTracking().ToListAsync();
-            fixture.AzureSqlIsInitialized = true;
-        }
+        Context = await AzureSqlDbContext.CreateContextAsync(fixture.ConnectionString, output);
+        this.movies = await Context.Movies.AsNoTracking().ToListAsync();
     }
 
     public async Task DisposeAsync()
@@ -44,7 +37,7 @@ public async Task DisposeAsync()
 
     protected override string DriverName { get; } = "AzureSQL";
 
-    protected override bool CanRunLiveTests() => !string.IsNullOrEmpty(ConnectionStrings.AzureSql);
+    protected override bool CanRunLiveTests() => true;
 
     protected override Task<AzureSqlEntityMovie> GetEntityAsync(string id)
         => Task.FromResult(Context.Movies.AsNoTracking().SingleOrDefault(m => m.Id == id));

tests/CommunityToolkit.Datasync.Server.Test/Live/AzureSQL_Controller_Tests.cs

@@ -20,6 +20,7 @@
     <PackageReference Include="Microsoft.Spatial" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" />
+    <PackageReference Include="TestContainers.MsSql" />
     <PackageReference Include="TestContainers.MySql" />
     <PackageReference Include="TestContainers.PostgreSql" />
   </ItemGroup>

tests/CommunityToolkit.Datasync.TestCommon/CommunityToolkit.Datasync.TestCommon.csproj

@@ -7,7 +7,6 @@ namespace CommunityToolkit.Datasync.TestCommon.Databases;
 [ExcludeFromCodeCoverage]
 public static class ConnectionStrings
 {
-    public static readonly string AzureSql = Environment.GetEnvironmentVariable("AZSQL_CONNECTION_STRING");
     public static readonly string CosmosDb = Environment.GetEnvironmentVariable("COSMOS_CONNECTION_STRING");
     public static readonly string MongoCommunity = Environment.GetEnvironmentVariable("MONGOACI_CONNECTION_STRING");
     public static readonly string CosmosMongo = Environment.GetEnvironmentVariable("MONGO_CONNECTION_STRING");

tests/CommunityToolkit.Datasync.TestCommon/Databases/ConnectionStrings.cs

@@ -0,0 +1,41 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Testcontainers.MsSql;
+using Xunit;
+
+namespace CommunityToolkit.Datasync.TestCommon.Fixtures;
+
+[ExcludeFromCodeCoverage]
+public class MsSqlDatabaseFixture : IAsyncLifetime
+{
+    private readonly MsSqlContainer _container;
+
+    public MsSqlDatabaseFixture()
+    {
+        this._container = new MsSqlBuilder()
+            .Build();
+    }
+
+    /// <inheritdoc />
+    public async Task DisposeAsync()
+    {
+        if (this._container is not null)
+        {
+            await this._container.DisposeAsync();
+        }
+    }
+
+    /// <inheritdoc />
+    public async Task InitializeAsync()
+    {
+        await this._container.StartAsync();
+        ConnectionString = this._container.GetConnectionString();
+    }
+
+    /// <summary>
+    /// The connection string for the MySQL database.
+    /// </summary>
+    public string ConnectionString { get; private set; } = string.Empty;
+}