Seperate tests for geo stuff.

Author: SebastianStehle

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContainer/TestDbContainerSqlite.cs

@@ -21,10 +21,7 @@ protected override string GetConnectionString()
     protected override void Configure(DbContextOptionsBuilder optionsBuilder)
     {
         optionsBuilder
-            .UseSqlite(GetConnectionString(), o =>
-            {
-                o.UseNetTopologySuite();
-            })
+            .UseSqlite(GetConnectionString())
             .UseBulkInsertSqlite();
     }
 

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContext/TestDbContext.cs

@@ -6,7 +6,6 @@ namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContext;
 public class TestDbContext : TestDbContextBase
 {
     public DbSet<TestEntity> TestEntities { get; set; } = null!;
-    public DbSet<TestEntityWithGeo> TestEntitiesWithGeo { get; set; } = null!;
     public DbSet<TestEntityWithJson> TestEntitiesWithJson { get; set; } = null!;
     public DbSet<TestEntityWithGuidId> TestEntitiesWithGuidId { get; set; } = null!;
     public DbSet<TestEntityWithConverters> TestEntitiesWithConverter { get; set; } = null!;

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContext/TestDbContextGeo.cs

@@ -0,0 +1,8 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContext;
+
+public class TestDbContextGeo : TestDbContextBase
+{
+    public DbSet<TestEntityWithGeo> TestEntitiesWithGeo { get; set; } = null!;
+}

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/PhenX.EntityFrameworkCore.BulkInsert.Tests.csproj

@@ -16,6 +16,7 @@
         <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.NetTopologySuite" Version="9.0.5" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite" Version="9.0.5" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+        <PackageReference Include="mod_spatialite" Version="4.3.0.1" />
         <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="9.0.4" />
         <PackageReference Include="Pomelo.EntityFrameworkCore.MySql.NetTopologySuite" Version="9.0.0-preview.3.efcore.9.0.0" />
         <PackageReference Include="xunit" Version="2.9.3" />

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Basic/BasicTestsBase.cs

@@ -113,31 +113,6 @@ public async Task InsertsEntities_WithJson()
         Assert.Contains(insertedEntities, e => e.Json[0] == 2);
     }
 
-    [SkippableFact]
-    public async Task InsertsEntities_WithGeo()
-    {
-        Skip.If(_context.IsProvider(ProviderType.Sqlite));
-
-        // Arrange
-        var geo1 = new Point(1, 2) { SRID = 4326 };
-        var geo2 = new Point(3, 4) { SRID = 4326 };
-
-        var entities = new List<TestEntityWithGeo>
-        {
-            new TestEntityWithGeo { TestRun = _run, GeoObject = geo1 },
-            new TestEntityWithGeo { TestRun = _run, GeoObject = geo2 }
-        };
-
-        // Act
-        await _context.ExecuteBulkInsertAsync(entities);
-
-        // Assert
-        var insertedEntities = _context.TestEntitiesWithGeo.Where(x => x.TestRun == _run).ToList();
-        Assert.Equal(2, insertedEntities.Count);
-        Assert.Contains(insertedEntities, e => e.GeoObject == geo1);
-        Assert.Contains(insertedEntities, e => e.GeoObject == geo2);
-    }
-
     [SkippableFact]
     public async Task InsertsEntities_AndReturn_AsyncEnumerable()
     {

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Geo/GeoTestsBase.cs

@@ -0,0 +1,57 @@
+using NetTopologySuite.Geometries;
+
+using PhenX.EntityFrameworkCore.BulkInsert.Enums;
+using PhenX.EntityFrameworkCore.BulkInsert.Extensions;
+using PhenX.EntityFrameworkCore.BulkInsert.MySql;
+using PhenX.EntityFrameworkCore.BulkInsert.Options;
+using PhenX.EntityFrameworkCore.BulkInsert.SqlServer;
+using PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContainer;
+using PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContext;
+
+using Xunit;
+
+namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Geo;
+
+public abstract class GeoTestsBase<TFixture, TDbContext>(TestDbContainer<TDbContext> dbContainer) : IClassFixture<TFixture>, IAsyncLifetime
+    where TDbContext : TestDbContextGeo, new()
+    where TFixture : TestDbContainer<TDbContext>
+{
+    private readonly Guid _run = Guid.NewGuid();
+    private TDbContext _context = null!;
+
+    public async Task InitializeAsync()
+    {
+        _context = await DbContainer.CreateContextAsync();
+    }
+
+    public Task DisposeAsync()
+    {
+        _context.Dispose();
+        return Task.CompletedTask;
+    }
+
+    protected TestDbContainer<TDbContext> DbContainer { get; } = dbContainer;
+
+    [Fact]
+    public async Task InsertsEntities_WithGeo()
+    {
+        // Arrange
+        var geo1 = new Point(1, 2) { SRID = 4326 };
+        var geo2 = new Point(3, 4) { SRID = 4326 };
+
+        var entities = new List<TestEntityWithGeo>
+        {
+            new TestEntityWithGeo { TestRun = _run, GeoObject = geo1 },
+            new TestEntityWithGeo { TestRun = _run, GeoObject = geo2 }
+        };
+
+        // Act
+        await _context.ExecuteBulkInsertAsync(entities);
+
+        // Assert
+        var insertedEntities = _context.TestEntitiesWithGeo.Where(x => x.TestRun == _run).ToList();
+        Assert.Equal(2, insertedEntities.Count);
+        Assert.Contains(insertedEntities, e => e.GeoObject == geo1);
+        Assert.Contains(insertedEntities, e => e.GeoObject == geo2);
+    }
+}

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Geo/GeoTestsMySql.cs

@@ -0,0 +1,11 @@
+using PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContainer;
+using PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContext;
+
+using Xunit;
+
+namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Geo;
+
+[Trait("Category", "MySql")]
+public class GeoTestsMySql(TestDbContainerMySql<TestDbContextGeo> dbContainer) : GeoTestsBase<TestDbContainerMySql<TestDbContextGeo>, TestDbContextGeo>(dbContainer)
+{
+}

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Geo/GeoTestsPostgreSql.cs

@@ -0,0 +1,11 @@
+using PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContainer;
+using PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContext;
+
+using Xunit;
+
+namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Geo;
+
+[Trait("Category", "PostgreSql")]
+public class GeoTestsPostgreSql(TestDbContainerPostgreSql<TestDbContextGeo> dbContainer) : GeoTestsBase<TestDbContainerPostgreSql<TestDbContextGeo>, TestDbContextGeo>(dbContainer)
+{
+}

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Geo/GeoTestsSqlServer.cs

@@ -0,0 +1,11 @@
+using PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContainer;
+using PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContext;
+
+using Xunit;
+
+namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Geo;
+
+[Trait("Category", "SqlServer")]
+public class GeoTestsSqlServer(TestDbContainerSqlServer<TestDbContextGeo> dbContainer) : GeoTestsBase<TestDbContainerSqlServer<TestDbContextGeo>, TestDbContextGeo>(dbContainer)
+{
+}