Test fixes for Npgsql 7.0

npgsql · Nov 9, 2022 · 721c2bd · 721c2bd
1 parent 20a1e1a
commit 721c2bd
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/test/EFCore.PG.FunctionalTests/Query/SpatialQueryNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/Query/SpatialQueryNpgsqlFixture.cs
@@ -4,18 +4,18 @@ namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query;
 
 public class SpatialQueryNpgsqlFixture : SpatialQueryRelationalFixture
 {
-    protected override ITestStoreFactory TestStoreFactory
-        => NpgsqlTestStoreFactory.Instance;
-
-    protected override IServiceCollection AddServices(IServiceCollection serviceCollection)
+#pragma warning disable CS0618 // GlobalTypeMapper is obsolete
+    public SpatialQueryNpgsqlFixture()
     {
-#pragma warning disable CS0618 // NpgsqlConnection.GlobalTypeMapper is obsolete
         NpgsqlConnection.GlobalTypeMapper.UseNetTopologySuite();
+    }
 #pragma warning restore CS0618
 
-        return base.AddServices(serviceCollection)
-            .AddEntityFrameworkNpgsqlNetTopologySuite();
-    }
+    protected override ITestStoreFactory TestStoreFactory
+        => NpgsqlTestStoreFactory.Instance;
+
+    protected override IServiceCollection AddServices(IServiceCollection serviceCollection)
+        => base.AddServices(serviceCollection).AddEntityFrameworkNpgsqlNetTopologySuite();
 
     protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext context)
     {

diff --git a/test/EFCore.PG.FunctionalTests/SpatialNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/SpatialNpgsqlFixture.cs
@@ -5,6 +5,13 @@ namespace Npgsql.EntityFrameworkCore.PostgreSQL;
 
 public class SpatialNpgsqlFixture : SpatialFixtureBase
 {
+#pragma warning disable CS0618 // GlobalTypeMapper is obsolete
+    public SpatialNpgsqlFixture()
+    {
+        NpgsqlConnection.GlobalTypeMapper.UseNetTopologySuite();
+    }
+#pragma warning restore CS0618
+
     protected override ITestStoreFactory TestStoreFactory
         => NpgsqlTestStoreFactory.Instance;
 

diff --git a/test/EFCore.PG.NodaTime.FunctionalTests/NodaTimeQueryNpgsqlTest.cs b/test/EFCore.PG.NodaTime.FunctionalTests/NodaTimeQueryNpgsqlTest.cs
@@ -1899,6 +1899,13 @@ public class NodaTimeQueryNpgsqlFixture : SharedStoreFixtureBase<NodaTimeContext
     {
         protected override string StoreName => "NodaTimeTest";
 
+#pragma warning disable CS0618 // GlobalTypeMapper is obsolete
+        public NodaTimeQueryNpgsqlFixture()
+        {
+            NpgsqlConnection.GlobalTypeMapper.UseNodaTime();
+        }
+#pragma warning restore CS0618
+
         // Set the PostgreSQL TimeZone parameter to something local, to ensure that operations which take TimeZone into account
         // don't depend on the database's time zone, and also that operations which shouldn't take TimeZone into account indeed
         // don't.