More tests switched to containers

Author: PawelGerr

tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests/DeleteTestData.cs

@@ -12,13 +12,15 @@ namespace Thinktecture.EntityFrameworkCore.TempTables.SqlServerTempTableCreatorT
 public class CreateTempTableAsync : IntegrationTestsBase
 {
    private readonly SqlServerTempTableCreationOptions _optionsWithNonUniqueName;
+   private readonly string _connectionString;
 
    private SqlServerTempTableCreator? _sut;
    private SqlServerTempTableCreator SUT => _sut ??= (SqlServerTempTableCreator)ActDbContext.GetService<ITempTableCreator>();
 
    public CreateTempTableAsync(ITestOutputHelper testOutputHelper, SqlServerContainerFixture sqlServerContainerFixture)
       : base(testOutputHelper, sqlServerContainerFixture)
    {
+      _connectionString = sqlServerContainerFixture.ConnectionString;
       _optionsWithNonUniqueName = new SqlServerTempTableCreationOptions { TableNameProvider = DefaultTempTableNameProvider.Instance, PrimaryKeyCreation = IPrimaryKeyPropertiesProvider.None };
    }
 
@@ -689,9 +691,9 @@ public async Task Should_honor_collation()
       ValidateColumn(columns[2], nameof(TestEntityWithCollation.ColumnWithoutCollation), "nvarchar", false, collation: databaseCollation);
    }
 
-   private static DbConnection CreateConnection()
+   private DbConnection CreateConnection()
    {
-      return new SqlConnection(TestContext.Instance.ConnectionString);
+      return new SqlConnection(_connectionString);
    }
 
    private DbContextOptions<TestDbContext> CreateOptions(DbConnection connection)

tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests/EntityFrameworkCore/TempTables/SqlServerTempTableCreatorTests/CreateTempTableAsync.cs

@@ -5,17 +5,17 @@
 namespace Thinktecture.Extensions.SqlServerOperationBuilderExtensionsTests;
 
 [Collection("SqlServerTests")]
-public class ExistTestBase
+public abstract class ExistTestBase
 {
    protected MigrationExtensionsTestDbContext Context { get; }
    protected DelegatingMigration Migration { get; }
    protected Action ExecuteMigration { get; }
 
-   protected ExistTestBase(ITestOutputHelper testOutputHelper)
+   protected ExistTestBase(ITestOutputHelper testOutputHelper, SqlServerContainerFixture sqlServerContainerFixture)
    {
       var loggerFactory = TestContext.Instance.GetLoggerFactory(testOutputHelper);
       var options = new DbContextOptionsBuilder<MigrationExtensionsTestDbContext>()
-                    .UseSqlServer(TestContext.Instance.ConnectionString,
+                    .UseSqlServer(sqlServerContainerFixture.ConnectionString,
                                   sqlServerBuilder => sqlServerBuilder.UseThinktectureSqlServerMigrationsSqlGenerator())
                     .UseLoggerFactory(loggerFactory)
                     .EnableDetailedErrors()

tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests/Extensions/SqlServerOperationBuilderExtensionsTests/ExistTestBase.cs

@@ -4,8 +4,8 @@ namespace Thinktecture.Extensions.SqlServerOperationBuilderExtensionsTests;
 
 public class IfExists : ExistTestBase
 {
-   public IfExists(ITestOutputHelper testOutputHelper)
-      : base(testOutputHelper)
+   public IfExists(ITestOutputHelper testOutputHelper, SqlServerContainerFixture sqlServerContainerFixture)
+      : base(testOutputHelper, sqlServerContainerFixture)
    {
    }
 

tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests/Extensions/SqlServerOperationBuilderExtensionsTests/IfExists.cs

@@ -4,8 +4,8 @@ namespace Thinktecture.Extensions.SqlServerOperationBuilderExtensionsTests;
 
 public class IfNotExists : ExistTestBase
 {
-   public IfNotExists(ITestOutputHelper testOutputHelper)
-      : base(testOutputHelper)
+   public IfNotExists(ITestOutputHelper testOutputHelper, SqlServerContainerFixture sqlServerContainerFixture)
+      : base(testOutputHelper, sqlServerContainerFixture)
    {
    }
 

tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests/Extensions/SqlServerOperationBuilderExtensionsTests/IfNotExists.cs

@@ -1,8 +1,11 @@
 using System.Text.Json;
 using Microsoft.EntityFrameworkCore.Diagnostics;
+using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.Extensions.Logging;
 using Thinktecture.EntityFrameworkCore.Infrastructure;
+using Thinktecture.EntityFrameworkCore.Parameters;
 using Thinktecture.EntityFrameworkCore.Query;
+using Thinktecture.EntityFrameworkCore.TempTables;
 using Thinktecture.EntityFrameworkCore.Testing;
 using Thinktecture.Json;
 using Thinktecture.TestDatabaseContext;
@@ -22,10 +25,22 @@ public class IntegrationTestsBase : SqlServerDbContextIntegrationTests<TestDbCon
    protected Mock<ITenantDatabaseProvider> TenantDatabaseProviderMock { get; }
 
    protected IntegrationTestsBase(ITestOutputHelper testOutputHelper, SqlServerContainerFixture sqlServerContainerFixture)
-      : this(sqlServerContainerFixture.ConnectionString, testOutputHelper, new DeleteTestData())
+      : this(sqlServerContainerFixture.ConnectionString, testOutputHelper, ITestIsolationOptions.DeleteData(NonExistingTableFilter))
    {
    }
 
+   private static bool NonExistingTableFilter(IEntityType entityType)
+   {
+      return entityType.ClrType != typeof(TestEntityWithCollation)
+             && entityType.ClrType != typeof(CustomTempTable)
+             && entityType.ClrType != typeof(OwnedEntity)
+             && entityType.ClrType != typeof(OwnedEntity_Owns_Inline)
+             && entityType.ClrType != typeof(OwnedEntity_Owns_SeparateOne)
+             && entityType.ClrType != typeof(OwnedEntity_Owns_SeparateMany)
+             && entityType.ClrType != typeof(MyParameter)
+             && entityType.ClrType != typeof(TestTemporalTableEntity);
+   }
+
    protected IntegrationTestsBase(string connectionString, ITestOutputHelper testOutputHelper, ITestIsolationOptions isolationOptions)
       : base(connectionString, isolationOptions, testOutputHelper)
    {

tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests/IntegrationTestsBase.cs

@@ -18,7 +18,10 @@ public SqlServerContainerFixture()
 
    private static MsSqlTestcontainer BuildContainer()
    {
+      // https: //github.com/testcontainers/testcontainers-dotnet/issues/750#issuecomment-1412257694
+#pragma warning disable 618
       return new TestcontainersBuilder<MsSqlTestcontainer>()
+#pragma warning restore 618
              .WithDatabase(new MsSqlTestcontainerConfiguration("mcr.microsoft.com/mssql/server:2022-latest")
                            {
                               Password = $"P@sswo0d01_{Guid.NewGuid()}"

tests/Thinktecture.EntityFrameworkCore.SqlServer.Tests/SqlServerContainerFixture.cs

@@ -8,7 +8,7 @@
         <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.3" PrivateAssets="all" />
         <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-       <PackageReference Include="Testcontainers" Version="2.3.0" />
+       <PackageReference Include="Testcontainers" Version="2.4.0" />
     </ItemGroup>
 
     <ItemGroup>