diff --git a/test/EFCore.PG.FunctionalTests/BadDataJsonDeserializationNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/BadDataJsonDeserializationNpgsqlTest.cs index 29e0cfa280..03a04d59fe 100644 --- a/test/EFCore.PG.FunctionalTests/BadDataJsonDeserializationNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/BadDataJsonDeserializationNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class BadDataJsonDeserializationSqlServerTest : BadDataJsonDeserializationTestBase { diff --git a/test/EFCore.PG.FunctionalTests/BatchingTest.cs b/test/EFCore.PG.FunctionalTests/BatchingTest.cs index 5f3fe57618..9b0637e896 100644 --- a/test/EFCore.PG.FunctionalTests/BatchingTest.cs +++ b/test/EFCore.PG.FunctionalTests/BatchingTest.cs @@ -1,11 +1,10 @@ using Microsoft.EntityFrameworkCore.Diagnostics.Internal; using Npgsql.EntityFrameworkCore.PostgreSQL.Diagnostics.Internal; using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; // ReSharper disable UnusedAutoPropertyAccessor.Local // ReSharper disable InconsistentNaming -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; #nullable disable diff --git a/test/EFCore.PG.FunctionalTests/BuiltInDataTypesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/BuiltInDataTypesNpgsqlTest.cs index 59433e3939..985357d248 100644 --- a/test/EFCore.PG.FunctionalTests/BuiltInDataTypesNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/BuiltInDataTypesNpgsqlTest.cs @@ -1,9 +1,8 @@ using System.Collections.Immutable; using System.ComponentModel.DataAnnotations.Schema; using System.Net.NetworkInformation; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; #nullable disable diff --git a/test/EFCore.PG.FunctionalTests/BulkUpdates/ComplexTypeBulkUpdatesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/BulkUpdates/ComplexTypeBulkUpdatesNpgsqlTest.cs index cd7edad978..e9bc9cac7f 100644 --- a/test/EFCore.PG.FunctionalTests/BulkUpdates/ComplexTypeBulkUpdatesNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/BulkUpdates/ComplexTypeBulkUpdatesNpgsqlTest.cs @@ -1,7 +1,4 @@ -using Microsoft.EntityFrameworkCore.BulkUpdates; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Update; +namespace Microsoft.EntityFrameworkCore.BulkUpdates; public class ComplexTypeBulkUpdatesNpgsqlTest( ComplexTypeBulkUpdatesNpgsqlTest.ComplexTypeBulkUpdatesNpgsqlFixture fixture, diff --git a/test/EFCore.PG.FunctionalTests/BulkUpdates/NonSharedModelBulkUpdatesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/BulkUpdates/NonSharedModelBulkUpdatesNpgsqlTest.cs index 55b9460fe5..6738856aaa 100644 --- a/test/EFCore.PG.FunctionalTests/BulkUpdates/NonSharedModelBulkUpdatesNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/BulkUpdates/NonSharedModelBulkUpdatesNpgsqlTest.cs @@ -1,7 +1,4 @@ -using Microsoft.EntityFrameworkCore.BulkUpdates; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Update; +namespace Microsoft.EntityFrameworkCore.BulkUpdates; public class NonSharedModelBulkUpdatesNpgsqlTest : NonSharedModelBulkUpdatesRelationalTestBase { diff --git a/test/EFCore.PG.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesNpgsqlFixture.cs index 13ea835116..693f4fcaca 100644 --- a/test/EFCore.PG.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesNpgsqlFixture.cs @@ -1,9 +1,6 @@ -using Microsoft.EntityFrameworkCore.BulkUpdates; using Microsoft.EntityFrameworkCore.TestModels.Northwind; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestModels.Northwind; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.BulkUpdates; +namespace Microsoft.EntityFrameworkCore.BulkUpdates; public class NorthwindBulkUpdatesNpgsqlFixture : NorthwindBulkUpdatesRelationalFixture where TModelCustomizer : ITestModelCustomizer, new() diff --git a/test/EFCore.PG.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesNpgsqlTest.cs index c76802b582..8ac9c9c04f 100644 --- a/test/EFCore.PG.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesNpgsqlTest.cs @@ -1,7 +1,6 @@ -using Microsoft.EntityFrameworkCore.BulkUpdates; using Microsoft.EntityFrameworkCore.TestModels.Northwind; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.BulkUpdates; +namespace Microsoft.EntityFrameworkCore.BulkUpdates; public class NorthwindBulkUpdatesNpgsqlTest( NorthwindBulkUpdatesNpgsqlFixture fixture, diff --git a/test/EFCore.PG.FunctionalTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesNpgsqlFixture.cs index e83514f12b..9aaf4e69d3 100644 --- a/test/EFCore.PG.FunctionalTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesNpgsqlFixture.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.BulkUpdates; +namespace Microsoft.EntityFrameworkCore.BulkUpdates; public class TPCFiltersInheritanceBulkUpdatesNpgsqlFixture : TPCInheritanceBulkUpdatesNpgsqlFixture { diff --git a/test/EFCore.PG.FunctionalTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesNpgsqlTest.cs index ae128131e8..0d4966c9ba 100644 --- a/test/EFCore.PG.FunctionalTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/BulkUpdates/TPCFiltersInheritanceBulkUpdatesNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Microsoft.EntityFrameworkCore.BulkUpdates; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.BulkUpdates; +namespace Microsoft.EntityFrameworkCore.BulkUpdates; public class TPCFiltersInheritanceBulkUpdatesNpgsqlTest( TPCFiltersInheritanceBulkUpdatesNpgsqlFixture fixture, diff --git a/test/EFCore.PG.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesNpgsqlFixture.cs index cd3b23c195..1d2b2b8f10 100644 --- a/test/EFCore.PG.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesNpgsqlFixture.cs @@ -1,7 +1,4 @@ -using Microsoft.EntityFrameworkCore.BulkUpdates; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.BulkUpdates; +namespace Microsoft.EntityFrameworkCore.BulkUpdates; public class TPCInheritanceBulkUpdatesNpgsqlFixture : TPCInheritanceBulkUpdatesFixture { diff --git a/test/EFCore.PG.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesNpgsqlTest.cs index f16b4aad56..1e12c4bd51 100644 --- a/test/EFCore.PG.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/BulkUpdates/TPCInheritanceBulkUpdatesNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Microsoft.EntityFrameworkCore.BulkUpdates; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.BulkUpdates; +namespace Microsoft.EntityFrameworkCore.BulkUpdates; public class TPCInheritanceBulkUpdatesNpgsqlTest( TPCInheritanceBulkUpdatesNpgsqlFixture fixture, diff --git a/test/EFCore.PG.FunctionalTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesNpgsqlFixture.cs index 5fa8e6ce82..281e76cfe5 100644 --- a/test/EFCore.PG.FunctionalTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesNpgsqlFixture.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.BulkUpdates; +namespace Microsoft.EntityFrameworkCore.BulkUpdates; public class TPHFiltersInheritanceBulkUpdatesNpgsqlFixture : TPHInheritanceBulkUpdatesNpgsqlFixture { diff --git a/test/EFCore.PG.FunctionalTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesNpgsqlTest.cs index e20926d550..5f6dbb2467 100644 --- a/test/EFCore.PG.FunctionalTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/BulkUpdates/TPHFiltersInheritanceBulkUpdatesNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Microsoft.EntityFrameworkCore.BulkUpdates; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.BulkUpdates; +namespace Microsoft.EntityFrameworkCore.BulkUpdates; public class TPHFiltersInheritanceBulkUpdatesNpgsqlTest( TPHFiltersInheritanceBulkUpdatesNpgsqlFixture fixture, diff --git a/test/EFCore.PG.FunctionalTests/BulkUpdates/TPHInheritanceBulkUpdatesNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/BulkUpdates/TPHInheritanceBulkUpdatesNpgsqlFixture.cs index dee6e67aa2..d783d64d3a 100644 --- a/test/EFCore.PG.FunctionalTests/BulkUpdates/TPHInheritanceBulkUpdatesNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/BulkUpdates/TPHInheritanceBulkUpdatesNpgsqlFixture.cs @@ -1,8 +1,6 @@ -using Microsoft.EntityFrameworkCore.BulkUpdates; using Microsoft.EntityFrameworkCore.TestModels.InheritanceModel; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.BulkUpdates; +namespace Microsoft.EntityFrameworkCore.BulkUpdates; public class TPHInheritanceBulkUpdatesNpgsqlFixture : TPHInheritanceBulkUpdatesFixture { diff --git a/test/EFCore.PG.FunctionalTests/BulkUpdates/TPHInheritanceBulkUpdatesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/BulkUpdates/TPHInheritanceBulkUpdatesNpgsqlTest.cs index 943ea3f91f..f1f7a92502 100644 --- a/test/EFCore.PG.FunctionalTests/BulkUpdates/TPHInheritanceBulkUpdatesNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/BulkUpdates/TPHInheritanceBulkUpdatesNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Microsoft.EntityFrameworkCore.BulkUpdates; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.BulkUpdates; +namespace Microsoft.EntityFrameworkCore.BulkUpdates; public class TPHInheritanceBulkUpdatesNpgsqlTest( TPHInheritanceBulkUpdatesNpgsqlFixture fixture, diff --git a/test/EFCore.PG.FunctionalTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesNpgsqlFixture.cs index 4cc18266ed..4069a3542d 100644 --- a/test/EFCore.PG.FunctionalTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesNpgsqlFixture.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.BulkUpdates; +namespace Microsoft.EntityFrameworkCore.BulkUpdates; public class TPTFiltersInheritanceBulkUpdatesNpgsqlFixture : TPTInheritanceBulkUpdatesNpgsqlFixture { diff --git a/test/EFCore.PG.FunctionalTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesNpgsqlTest.cs index 6ecf13d061..32db8953f0 100644 --- a/test/EFCore.PG.FunctionalTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/BulkUpdates/TPTFiltersInheritanceBulkUpdatesNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Microsoft.EntityFrameworkCore.BulkUpdates; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.BulkUpdates; +namespace Microsoft.EntityFrameworkCore.BulkUpdates; public class TPTFiltersInheritanceBulkUpdatesSqlServerTest( TPTFiltersInheritanceBulkUpdatesNpgsqlFixture fixture, diff --git a/test/EFCore.PG.FunctionalTests/BulkUpdates/TPTInheritanceBulkUpdatesNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/BulkUpdates/TPTInheritanceBulkUpdatesNpgsqlFixture.cs index 06e8d4b9f9..67e773802c 100644 --- a/test/EFCore.PG.FunctionalTests/BulkUpdates/TPTInheritanceBulkUpdatesNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/BulkUpdates/TPTInheritanceBulkUpdatesNpgsqlFixture.cs @@ -1,7 +1,4 @@ -using Microsoft.EntityFrameworkCore.BulkUpdates; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.BulkUpdates; +namespace Microsoft.EntityFrameworkCore.BulkUpdates; public class TPTInheritanceBulkUpdatesNpgsqlFixture : TPTInheritanceBulkUpdatesFixture { diff --git a/test/EFCore.PG.FunctionalTests/BulkUpdates/TPTInheritanceBulkUpdatesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/BulkUpdates/TPTInheritanceBulkUpdatesNpgsqlTest.cs index 9516e6ec77..39637fe56e 100644 --- a/test/EFCore.PG.FunctionalTests/BulkUpdates/TPTInheritanceBulkUpdatesNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/BulkUpdates/TPTInheritanceBulkUpdatesNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Microsoft.EntityFrameworkCore.BulkUpdates; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.BulkUpdates; +namespace Microsoft.EntityFrameworkCore.BulkUpdates; public class TPTInheritanceBulkUpdatesNpgsqlTest( TPTInheritanceBulkUpdatesNpgsqlFixture fixture, diff --git a/test/EFCore.PG.FunctionalTests/CommandInterceptionNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/CommandInterceptionNpgsqlTest.cs index 26799628e1..225e1fc96b 100644 --- a/test/EFCore.PG.FunctionalTests/CommandInterceptionNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/CommandInterceptionNpgsqlTest.cs @@ -1,8 +1,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public abstract class CommandInterceptionNpgsqlTestBase(CommandInterceptionNpgsqlTestBase.InterceptionNpgsqlFixtureBase fixture) : CommandInterceptionTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/ComplexTypesTrackingNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/ComplexTypesTrackingNpgsqlTest.cs index 02fb249a29..8a5c929dc6 100644 --- a/test/EFCore.PG.FunctionalTests/ComplexTypesTrackingNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/ComplexTypesTrackingNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class ComplexTypesTrackingNpgsqlTest : ComplexTypesTrackingTestBase { diff --git a/test/EFCore.PG.FunctionalTests/CompositeKeyEndToEndTest.cs b/test/EFCore.PG.FunctionalTests/CompositeKeyEndToEndTest.cs index 3770aaf737..9b9081f7b2 100644 --- a/test/EFCore.PG.FunctionalTests/CompositeKeyEndToEndTest.cs +++ b/test/EFCore.PG.FunctionalTests/CompositeKeyEndToEndTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class CompositeKeyEndToEndNpgsqlTest(CompositeKeyEndToEndNpgsqlTest.CompositeKeyEndToEndNpgsqlFixture fixture) : CompositeKeyEndToEndTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/ComputedColumnTest.cs b/test/EFCore.PG.FunctionalTests/ComputedColumnTest.cs index 49f7675280..46de11410b 100644 --- a/test/EFCore.PG.FunctionalTests/ComputedColumnTest.cs +++ b/test/EFCore.PG.FunctionalTests/ComputedColumnTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; [MinimumPostgresVersion(12, 0)] public class ComputedColumnTest : IAsyncLifetime diff --git a/test/EFCore.PG.FunctionalTests/ConcurrencyDetectorDisabledNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/ConcurrencyDetectorDisabledNpgsqlTest.cs index d312126477..615c367f9b 100644 --- a/test/EFCore.PG.FunctionalTests/ConcurrencyDetectorDisabledNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/ConcurrencyDetectorDisabledNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class ConcurrencyDetectorDisabledNpgsqlTest : ConcurrencyDetectorDisabledRelationalTestBase< ConcurrencyDetectorDisabledNpgsqlTest.ConcurrencyDetectorNpgsqlFixture> diff --git a/test/EFCore.PG.FunctionalTests/ConcurrencyDetectorEnabledNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/ConcurrencyDetectorEnabledNpgsqlTest.cs index 6cb940eddb..d9dd48f46b 100644 --- a/test/EFCore.PG.FunctionalTests/ConcurrencyDetectorEnabledNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/ConcurrencyDetectorEnabledNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class ConcurrencyDetectorEnabledNpgsqlTest : ConcurrencyDetectorEnabledRelationalTestBase< ConcurrencyDetectorEnabledNpgsqlTest.ConcurrencyDetectorNpgsqlFixture> diff --git a/test/EFCore.PG.FunctionalTests/ConferencePlannerNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/ConferencePlannerNpgsqlTest.cs index eed20e42f6..2afacd122d 100644 --- a/test/EFCore.PG.FunctionalTests/ConferencePlannerNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/ConferencePlannerNpgsqlTest.cs @@ -1,8 +1,7 @@ using System.Text.Json; using Microsoft.EntityFrameworkCore.TestModels.ConferencePlanner; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; #nullable disable diff --git a/test/EFCore.PG.FunctionalTests/ConnectionInterceptionNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/ConnectionInterceptionNpgsqlTest.cs index c111fc4e1e..ad7b852f13 100644 --- a/test/EFCore.PG.FunctionalTests/ConnectionInterceptionNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/ConnectionInterceptionNpgsqlTest.cs @@ -1,9 +1,8 @@ using System.Data; using System.Data.Common; using System.Diagnostics.CodeAnalysis; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public abstract class ConnectionInterceptionNpgsqlTestBase(ConnectionInterceptionNpgsqlTestBase.InterceptionNpgsqlFixtureBase fixture) : ConnectionInterceptionTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/ConnectionSpecificationTest.cs b/test/EFCore.PG.FunctionalTests/ConnectionSpecificationTest.cs index f75b6186dc..c16a173f0f 100644 --- a/test/EFCore.PG.FunctionalTests/ConnectionSpecificationTest.cs +++ b/test/EFCore.PG.FunctionalTests/ConnectionSpecificationTest.cs @@ -1,8 +1,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; // ReSharper disable StringLiteralTypo -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; #nullable disable diff --git a/test/EFCore.PG.FunctionalTests/ConvertToProviderTypesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/ConvertToProviderTypesNpgsqlTest.cs index 50fd6c5ee3..0d69d9173c 100644 --- a/test/EFCore.PG.FunctionalTests/ConvertToProviderTypesNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/ConvertToProviderTypesNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class ConvertToProviderTypesNpgsqlTest : ConvertToProviderTypesTestBase< ConvertToProviderTypesNpgsqlTest.ConvertToProviderTypesNpgsqlFixture> diff --git a/test/EFCore.PG.FunctionalTests/CustomConvertersNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/CustomConvertersNpgsqlTest.cs index a08007fe75..15502c0106 100644 --- a/test/EFCore.PG.FunctionalTests/CustomConvertersNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/CustomConvertersNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class CustomConvertersNpgsqlTest(CustomConvertersNpgsqlTest.CustomConvertersNpgsqlFixture fixture) : CustomConvertersTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/DataAnnotationNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/DataAnnotationNpgsqlTest.cs index 71b56bd3ad..57c3b7cd59 100644 --- a/test/EFCore.PG.FunctionalTests/DataAnnotationNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/DataAnnotationNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class DataAnnotationNpgsqlTest(DataAnnotationNpgsqlTest.DataAnnotationNpgsqlFixture fixture) : DataAnnotationRelationalTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/DataBindingNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/DataBindingNpgsqlTest.cs index 9e53df97ae..9eaba3a495 100644 --- a/test/EFCore.PG.FunctionalTests/DataBindingNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/DataBindingNpgsqlTest.cs @@ -1,3 +1,3 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class DataBindingNpgsqlTest(F1BytesNpgsqlFixture fixture) : DataBindingTestBase(fixture); diff --git a/test/EFCore.PG.FunctionalTests/DefaultValuesTest.cs b/test/EFCore.PG.FunctionalTests/DefaultValuesTest.cs index 6a7977d942..6b27f2acfb 100644 --- a/test/EFCore.PG.FunctionalTests/DefaultValuesTest.cs +++ b/test/EFCore.PG.FunctionalTests/DefaultValuesTest.cs @@ -1,8 +1,8 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; + // ReSharper disable IdentifierTypo // ReSharper disable StringLiteralTypo -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class DefaultValuesTest : IDisposable { diff --git a/test/EFCore.PG.FunctionalTests/DesignTimeNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/DesignTimeNpgsqlTest.cs index 3bfffa890c..2d1650a6f1 100644 --- a/test/EFCore.PG.FunctionalTests/DesignTimeNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/DesignTimeNpgsqlTest.cs @@ -1,7 +1,6 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Design.Internal; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class DesignTimeNpgsqlTest(DesignTimeNpgsqlTest.DesignTimeNpgsqlFixture fixture) : DesignTimeTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/EntitySplittingNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/EntitySplittingNpgsqlTest.cs index 8552d88f9f..deb98d00e2 100644 --- a/test/EFCore.PG.FunctionalTests/EntitySplittingNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/EntitySplittingNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class EntitySplittingNpgsqlTest(ITestOutputHelper testOutputHelper) : EntitySplittingTestBase(testOutputHelper) { diff --git a/test/EFCore.PG.FunctionalTests/ExecutionStrategyTest.cs b/test/EFCore.PG.FunctionalTests/ExecutionStrategyTest.cs index 542f95432b..cfd2690145 100644 --- a/test/EFCore.PG.FunctionalTests/ExecutionStrategyTest.cs +++ b/test/EFCore.PG.FunctionalTests/ExecutionStrategyTest.cs @@ -1,11 +1,10 @@ using System.Data; using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; // ReSharper disable MethodSupportsCancellation // ReSharper disable AccessToDisposedClosure -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; #nullable disable diff --git a/test/EFCore.PG.FunctionalTests/ExistingConnectionTest.cs b/test/EFCore.PG.FunctionalTests/ExistingConnectionTest.cs index f7b2fcffc5..cd14721057 100644 --- a/test/EFCore.PG.FunctionalTests/ExistingConnectionTest.cs +++ b/test/EFCore.PG.FunctionalTests/ExistingConnectionTest.cs @@ -1,7 +1,6 @@ using System.Data; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class ExistingConnectionTest { diff --git a/test/EFCore.PG.FunctionalTests/F1NpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/F1NpgsqlFixture.cs index 3281de74b8..839f99b7c2 100644 --- a/test/EFCore.PG.FunctionalTests/F1NpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/F1NpgsqlFixture.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.ConcurrencyModel; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class F1BytesNpgsqlFixture : F1NpgsqlFixtureBase { diff --git a/test/EFCore.PG.FunctionalTests/FieldMappingNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/FieldMappingNpgsqlTest.cs index c725a2f930..32ae436825 100644 --- a/test/EFCore.PG.FunctionalTests/FieldMappingNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/FieldMappingNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class FieldMappingNpgsqlTest(FieldMappingNpgsqlTest.FieldMappingNpgsqlFixture fixture) : FieldMappingTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/FindNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/FindNpgsqlTest.cs index a768375112..9b99503d59 100644 --- a/test/EFCore.PG.FunctionalTests/FindNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/FindNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public abstract class FindNpgsqlTest : FindTestBase { diff --git a/test/EFCore.PG.FunctionalTests/JsonTypesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/JsonTypesNpgsqlTest.cs index f3b5b20d2a..fb77cb47e5 100644 --- a/test/EFCore.PG.FunctionalTests/JsonTypesNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/JsonTypesNpgsqlTest.cs @@ -4,10 +4,9 @@ using NetTopologySuite; using NetTopologySuite.Geometries; using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; using Xunit.Sdk; -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class JsonTypesNpgsqlTest : JsonTypesRelationalTestBase { diff --git a/test/EFCore.PG.FunctionalTests/KeysWithConvertersNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/KeysWithConvertersNpgsqlTest.cs index e83af54b8e..998a0c5209 100644 --- a/test/EFCore.PG.FunctionalTests/KeysWithConvertersNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/KeysWithConvertersNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class KeysWithConvertersNpgsqlTest(KeysWithConvertersNpgsqlTest.KeysWithConvertersNpgsqlFixture fixture) : KeysWithConvertersTestBase< diff --git a/test/EFCore.PG.FunctionalTests/LazyLoadProxyNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/LazyLoadProxyNpgsqlTest.cs index b299a9f9bf..39f760f90b 100644 --- a/test/EFCore.PG.FunctionalTests/LazyLoadProxyNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/LazyLoadProxyNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; // ReSharper disable once UnusedMember.Global public class LazyLoadProxyNpgsqlTest : LazyLoadProxyTestBase diff --git a/test/EFCore.PG.FunctionalTests/LoadNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/LoadNpgsqlTest.cs index 1b11afc968..d383c72d51 100644 --- a/test/EFCore.PG.FunctionalTests/LoadNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/LoadNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; // ReSharper disable once UnusedMember.Global public class LoadNpgsqlTest : LoadTestBase diff --git a/test/EFCore.PG.FunctionalTests/LoggingNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/LoggingNpgsqlTest.cs index ad77a5eb35..06380e3b57 100644 --- a/test/EFCore.PG.FunctionalTests/LoggingNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/LoggingNpgsqlTest.cs @@ -2,7 +2,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal; -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class LoggingNpgsqlTest : LoggingRelationalTestBase { diff --git a/test/EFCore.PG.FunctionalTests/ManyToManyFieldsLoadNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/ManyToManyFieldsLoadNpgsqlTest.cs index e56daca7a1..4280f23638 100644 --- a/test/EFCore.PG.FunctionalTests/ManyToManyFieldsLoadNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/ManyToManyFieldsLoadNpgsqlTest.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.ManyToManyFieldsModel; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class ManyToManyFieldsLoadNpgsqlTest(ManyToManyFieldsLoadNpgsqlTest.ManyToManyFieldsLoadNpgsqlFixture fixture) : ManyToManyFieldsLoadTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/ManyToManyLoadNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/ManyToManyLoadNpgsqlTest.cs index c25a46d38b..c541846353 100644 --- a/test/EFCore.PG.FunctionalTests/ManyToManyLoadNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/ManyToManyLoadNpgsqlTest.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.ManyToManyModel; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class ManyToManyLoadNpgsqlTest(ManyToManyLoadNpgsqlTest.ManyToManyLoadNpgsqlFixture fixture) : ManyToManyLoadTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/ManyToManyTrackingNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/ManyToManyTrackingNpgsqlTest.cs index 9faf5f107b..7d14f32bc4 100644 --- a/test/EFCore.PG.FunctionalTests/ManyToManyTrackingNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/ManyToManyTrackingNpgsqlTest.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.ManyToManyModel; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class ManyToManyTrackingNpgsqlTest(ManyToManyTrackingNpgsqlTest.ManyToManyTrackingNpgsqlFixture fixture) : ManyToManyTrackingRelationalTestBase< diff --git a/test/EFCore.PG.FunctionalTests/MaterializationInterceptionNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/MaterializationInterceptionNpgsqlTest.cs index 503a23f5dc..10b2911ac8 100644 --- a/test/EFCore.PG.FunctionalTests/MaterializationInterceptionNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/MaterializationInterceptionNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class MaterializationInterceptionNpgsqlTest : MaterializationInterceptionTestBase diff --git a/test/EFCore.PG.FunctionalTests/Migrations/MigrationsInfrastructureNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Migrations/MigrationsInfrastructureNpgsqlTest.cs index 1675c11db8..3885e461b8 100644 --- a/test/EFCore.PG.FunctionalTests/Migrations/MigrationsInfrastructureNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Migrations/MigrationsInfrastructureNpgsqlTest.cs @@ -1,229 +1,223 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; +namespace Microsoft.EntityFrameworkCore.Migrations; #nullable disable -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Migrations +public class MigrationsInfrastructureNpgsqlTest(MigrationsInfrastructureNpgsqlTest.MigrationsInfrastructureNpgsqlFixture fixture) + : MigrationsInfrastructureTestBase(fixture) { - public class MigrationsInfrastructureNpgsqlTest(MigrationsInfrastructureNpgsqlTest.MigrationsInfrastructureNpgsqlFixture fixture) - : MigrationsInfrastructureTestBase(fixture) + public override void Can_get_active_provider() { - public override void Can_get_active_provider() - { - base.Can_get_active_provider(); + base.Can_get_active_provider(); - Assert.Equal("Npgsql.EntityFrameworkCore.PostgreSQL", ActiveProvider); - } + Assert.Equal("Npgsql.EntityFrameworkCore.PostgreSQL", ActiveProvider); + } - // See #3407 - public override void Can_apply_two_migrations_in_transaction() - => Assert.ThrowsAny(() => base.Can_apply_two_migrations_in_transaction()); + // See #3407 + public override void Can_apply_two_migrations_in_transaction() + => Assert.ThrowsAny(() => base.Can_apply_two_migrations_in_transaction()); - // See #3407 - public override Task Can_apply_two_migrations_in_transaction_async() - => Assert.ThrowsAnyAsync(() => base.Can_apply_two_migrations_in_transaction_async()); + // See #3407 + public override Task Can_apply_two_migrations_in_transaction_async() + => Assert.ThrowsAnyAsync(() => base.Can_apply_two_migrations_in_transaction_async()); - // This tests uses Fixture.CreateEmptyContext(), which does not go through MigrationsInfrastructureNpgsqlFixture.CreateContext() - // and therefore does not set the PostgresVersion in the context options. As a result, we try to drop the database with - // WITH (FORCE), which is only supported starting with PG 13. - [MinimumPostgresVersion(13, 0)] - public override Task Can_generate_no_migration_script() - => base.Can_generate_no_migration_script(); + // This tests uses Fixture.CreateEmptyContext(), which does not go through MigrationsInfrastructureNpgsqlFixture.CreateContext() + // and therefore does not set the PostgresVersion in the context options. As a result, we try to drop the database with + // WITH (FORCE), which is only supported starting with PG 13. + [MinimumPostgresVersion(13, 0)] + public override Task Can_generate_no_migration_script() + => base.Can_generate_no_migration_script(); - [ConditionalFact(Skip = "https://github.com/dotnet/efcore/issues/33056")] - public override void Can_apply_all_migrations() - => base.Can_apply_all_migrations(); + [ConditionalFact(Skip = "https://github.com/dotnet/efcore/issues/33056")] + public override void Can_apply_all_migrations() + => base.Can_apply_all_migrations(); - [ConditionalFact(Skip = "https://github.com/dotnet/efcore/issues/33056")] - public override void Can_apply_range_of_migrations() - => base.Can_apply_range_of_migrations(); + [ConditionalFact(Skip = "https://github.com/dotnet/efcore/issues/33056")] + public override void Can_apply_range_of_migrations() + => base.Can_apply_range_of_migrations(); - [ConditionalFact(Skip = "https://github.com/dotnet/efcore/issues/33056")] - public override void Can_revert_all_migrations() - => base.Can_revert_all_migrations(); + [ConditionalFact(Skip = "https://github.com/dotnet/efcore/issues/33056")] + public override void Can_revert_all_migrations() + => base.Can_revert_all_migrations(); - [ConditionalFact(Skip = "https://github.com/dotnet/efcore/issues/33056")] - public override void Can_revert_one_migrations() - => base.Can_revert_one_migrations(); + [ConditionalFact(Skip = "https://github.com/dotnet/efcore/issues/33056")] + public override void Can_revert_one_migrations() + => base.Can_revert_one_migrations(); - [ConditionalFact(Skip = "https://github.com/dotnet/efcore/issues/33056")] - public override Task Can_apply_all_migrations_async() - => base.Can_apply_all_migrations_async(); + [ConditionalFact(Skip = "https://github.com/dotnet/efcore/issues/33056")] + public override Task Can_apply_all_migrations_async() + => base.Can_apply_all_migrations_async(); - [ConditionalFact] - public async Task Empty_Migration_Creates_Database() - { - await using var context = new BloggingContext( - Fixture.TestStore.AddProviderOptions( - new DbContextOptionsBuilder().EnableServiceProviderCaching(false)) - .ConfigureWarnings(e => e.Log(RelationalEventId.PendingModelChangesWarning)).Options); + [ConditionalFact] + public async Task Empty_Migration_Creates_Database() + { + await using var context = new BloggingContext( + Fixture.TestStore.AddProviderOptions( + new DbContextOptionsBuilder().EnableServiceProviderCaching(false)) + .ConfigureWarnings(e => e.Log(RelationalEventId.PendingModelChangesWarning)).Options); - var creator = (NpgsqlDatabaseCreator)context.GetService(); - creator.RetryTimeout = TimeSpan.FromMinutes(10); + var creator = (NpgsqlDatabaseCreator)context.GetService(); + creator.RetryTimeout = TimeSpan.FromMinutes(10); - await context.Database.MigrateAsync(); + await context.Database.MigrateAsync(); - Assert.True(creator.Exists()); - } + Assert.True(creator.Exists()); + } - private class BloggingContext(DbContextOptions options) : DbContext(options) - { - // ReSharper disable once UnusedMember.Local - public DbSet Blogs { get; set; } - - // ReSharper disable once ClassNeverInstantiated.Local - public class Blog - { - // ReSharper disable UnusedMember.Local - public int Id { get; set; } - - public string Name { get; set; } - // ReSharper restore UnusedMember.Local - } - } + private class BloggingContext(DbContextOptions options) : DbContext(options) + { + // ReSharper disable once UnusedMember.Local + public DbSet Blogs { get; set; } - [DbContext(typeof(BloggingContext))] - [Migration("00000000000000_Empty")] - public class EmptyMigration : Migration + // ReSharper disable once ClassNeverInstantiated.Local + public class Blog { - protected override void Up(MigrationBuilder migrationBuilder) - { - } + // ReSharper disable UnusedMember.Local + public int Id { get; set; } + + public string Name { get; set; } + // ReSharper restore UnusedMember.Local } + } - public override void Can_diff_against_2_2_model() + [DbContext(typeof(BloggingContext))] + [Migration("00000000000000_Empty")] + public class EmptyMigration : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) { - using var context = new ModelSnapshot22.BloggingContext(); - DiffSnapshot(new BloggingContextModelSnapshot22(), context); } + } + + public override void Can_diff_against_2_2_model() + { + using var context = new Migrations.BloggingContext(); + DiffSnapshot(new BloggingContextModelSnapshot22(), context); + } - public class BloggingContextModelSnapshot22 : ModelSnapshot + public class BloggingContextModelSnapshot22 : ModelSnapshot + { + protected override void BuildModel(ModelBuilder modelBuilder) { - protected override void BuildModel(ModelBuilder modelBuilder) - { #pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation( - "Npgsql:ValueGenerationStrategy", - NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + modelBuilder + .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") + .HasAnnotation("Relational:MaxIdentifierLength", 128) + .HasAnnotation( + "Npgsql:ValueGenerationStrategy", + NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); - modelBuilder.Entity( - "ModelSnapshot22.Blog", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasAnnotation( - "Npgsql:ValueGenerationStrategy", - NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + modelBuilder.Entity( + "ModelSnapshot22.Blog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation( + "Npgsql:ValueGenerationStrategy", + NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); - b.Property("Name"); + b.Property("Name"); - b.HasKey("Id"); + b.HasKey("Id"); - b.ToTable("Blogs"); - }); + b.ToTable("Blogs"); + }); - modelBuilder.Entity( - "ModelSnapshot22.Post", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasAnnotation( - "Npgsql:ValueGenerationStrategy", - NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + modelBuilder.Entity( + "ModelSnapshot22.Post", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasAnnotation( + "Npgsql:ValueGenerationStrategy", + NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); - b.Property("BlogId"); + b.Property("BlogId"); - b.Property("Content"); + b.Property("Content"); - b.Property("EditDate"); + b.Property("EditDate"); - b.Property("Title"); + b.Property("Title"); - b.HasKey("Id"); + b.HasKey("Id"); - b.HasIndex("BlogId"); + b.HasIndex("BlogId"); - b.ToTable("Post"); - }); + b.ToTable("Post"); + }); - modelBuilder.Entity( - "ModelSnapshot22.Post", b => - { - b.HasOne("ModelSnapshot22.Blog", "Blog") - .WithMany("Posts") - .HasForeignKey("BlogId"); - }); + modelBuilder.Entity( + "ModelSnapshot22.Post", b => + { + b.HasOne("ModelSnapshot22.Blog", "Blog") + .WithMany("Posts") + .HasForeignKey("BlogId"); + }); #pragma warning restore 612, 618 - } } + } - public override void Can_diff_against_3_0_ASP_NET_Identity_model() - { - // TODO: Implement - } + public override void Can_diff_against_3_0_ASP_NET_Identity_model() + { + // TODO: Implement + } - public override void Can_diff_against_2_2_ASP_NET_Identity_model() - { - // TODO: Implement - } + public override void Can_diff_against_2_2_ASP_NET_Identity_model() + { + // TODO: Implement + } - public override void Can_diff_against_2_1_ASP_NET_Identity_model() - { - // TODO: Implement - } + public override void Can_diff_against_2_1_ASP_NET_Identity_model() + { + // TODO: Implement + } - protected override Task ExecuteSqlAsync(string value) - => ((NpgsqlTestStore)Fixture.TestStore).ExecuteNonQueryAsync(value); + protected override Task ExecuteSqlAsync(string value) + => ((NpgsqlTestStore)Fixture.TestStore).ExecuteNonQueryAsync(value); - public class MigrationsInfrastructureNpgsqlFixture : MigrationsInfrastructureFixtureBase + public class MigrationsInfrastructureNpgsqlFixture : MigrationsInfrastructureFixtureBase + { + protected override ITestStoreFactory TestStoreFactory + => NpgsqlTestStoreFactory.Instance; + + public override MigrationsContext CreateContext() { - protected override ITestStoreFactory TestStoreFactory - => NpgsqlTestStoreFactory.Instance; - - public override MigrationsContext CreateContext() - { - var options = AddOptions( - TestStore.AddProviderOptions(new DbContextOptionsBuilder()) - .UseNpgsql( - TestStore.ConnectionString, b => b.ApplyConfiguration() - .SetPostgresVersion(TestEnvironment.PostgresVersion))) - .UseInternalServiceProvider(ServiceProvider) - .Options; - return new MigrationsContext(options); - } + var options = AddOptions( + TestStore.AddProviderOptions(new DbContextOptionsBuilder()) + .UseNpgsql( + TestStore.ConnectionString, b => b.ApplyConfiguration() + .SetPostgresVersion(TestEnvironment.PostgresVersion))) + .UseInternalServiceProvider(ServiceProvider) + .Options; + return new MigrationsContext(options); } } } -namespace ModelSnapshot22 +public class Blog { - public class Blog - { - public int Id { get; set; } - public string Name { get; set; } + public int Id { get; set; } + public string Name { get; set; } - public ICollection Posts { get; set; } - } + public ICollection Posts { get; set; } +} - public class Post - { - public int Id { get; set; } - public string Title { get; set; } - public string Content { get; set; } - public DateTime EditDate { get; set; } +public class Post +{ + public int Id { get; set; } + public string Title { get; set; } + public string Content { get; set; } + public DateTime EditDate { get; set; } - public Blog Blog { get; set; } - } + public Blog Blog { get; set; } +} - public class BloggingContext : DbContext - { - protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) - => optionsBuilder.UseNpgsql(TestEnvironment.DefaultConnection); +public class BloggingContext : DbContext +{ + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) + => optionsBuilder.UseNpgsql(TestEnvironment.DefaultConnection); - public DbSet Blogs { get; set; } - } -} + public DbSet Blogs { get; set; } +} \ No newline at end of file diff --git a/test/EFCore.PG.FunctionalTests/Migrations/MigrationsNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Migrations/MigrationsNpgsqlTest.cs index f92cb47997..ab863ce11a 100644 --- a/test/EFCore.PG.FunctionalTests/Migrations/MigrationsNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Migrations/MigrationsNpgsqlTest.cs @@ -2,9 +2,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata.Internal; using Npgsql.EntityFrameworkCore.PostgreSQL.Scaffolding.Internal; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Migrations; +namespace Microsoft.EntityFrameworkCore.Migrations; public class MigrationsNpgsqlTest : MigrationsTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Migrations/NpgsqlMigrationsSqlGeneratorTest.cs b/test/EFCore.PG.FunctionalTests/Migrations/NpgsqlMigrationsSqlGeneratorTest.cs index a5881dec12..2cf1b21d9b 100644 --- a/test/EFCore.PG.FunctionalTests/Migrations/NpgsqlMigrationsSqlGeneratorTest.cs +++ b/test/EFCore.PG.FunctionalTests/Migrations/NpgsqlMigrationsSqlGeneratorTest.cs @@ -3,9 +3,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata.Internal; using Npgsql.EntityFrameworkCore.PostgreSQL.Migrations.Operations; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Migrations; +namespace Microsoft.EntityFrameworkCore.Migrations; public class NpgsqlMigrationsSqlGeneratorTest() : MigrationsSqlGeneratorTestBase( NpgsqlTestHelpers.Instance, diff --git a/test/EFCore.PG.FunctionalTests/ModelBuilding/NpgsqlModelBuilderGenericTest.cs b/test/EFCore.PG.FunctionalTests/ModelBuilding/NpgsqlModelBuilderGenericTest.cs index 588c943365..c5050eb38c 100644 --- a/test/EFCore.PG.FunctionalTests/ModelBuilding/NpgsqlModelBuilderGenericTest.cs +++ b/test/EFCore.PG.FunctionalTests/ModelBuilding/NpgsqlModelBuilderGenericTest.cs @@ -1,6 +1,6 @@ using Xunit.Sdk; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.ModelBuilding; +namespace Microsoft.EntityFrameworkCore.ModelBuilding; public class NpgsqlModelBuilderGenericTest : NpgsqlModelBuilderTestBase { diff --git a/test/EFCore.PG.FunctionalTests/ModelBuilding/NpgsqlModelBuilderTestBase.cs b/test/EFCore.PG.FunctionalTests/ModelBuilding/NpgsqlModelBuilderTestBase.cs index 59ba51863b..265cd2858a 100644 --- a/test/EFCore.PG.FunctionalTests/ModelBuilding/NpgsqlModelBuilderTestBase.cs +++ b/test/EFCore.PG.FunctionalTests/ModelBuilding/NpgsqlModelBuilderTestBase.cs @@ -1,7 +1,4 @@ -using Microsoft.EntityFrameworkCore.ModelBuilding; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.ModelBuilding; +namespace Microsoft.EntityFrameworkCore.ModelBuilding; public class NpgsqlModelBuilderTestBase : RelationalModelBuilderTest { diff --git a/test/EFCore.PG.FunctionalTests/ModelBuilding101NpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/ModelBuilding101NpgsqlTest.cs index 0c8a5b57c2..ab5f152686 100644 --- a/test/EFCore.PG.FunctionalTests/ModelBuilding101NpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/ModelBuilding101NpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class ModelBuilding101NpgsqlTest : ModelBuilding101RelationalTestBase { diff --git a/test/EFCore.PG.FunctionalTests/MonsterFixupChangedChangingNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/MonsterFixupChangedChangingNpgsqlTest.cs index 4336775642..3707ea498f 100644 --- a/test/EFCore.PG.FunctionalTests/MonsterFixupChangedChangingNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/MonsterFixupChangedChangingNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class MonsterFixupChangedChangingNpgsqlTest(MonsterFixupChangedChangingNpgsqlTest.MonsterFixupChangedChangingNpgsqlFixture fixture) : MonsterFixupTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/MusicStoreNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/MusicStoreNpgsqlTest.cs index 45ca332125..e3cc6f3830 100644 --- a/test/EFCore.PG.FunctionalTests/MusicStoreNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/MusicStoreNpgsqlTest.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.MusicStore; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class MusicStoreNpgsqlTest(MusicStoreNpgsqlTest.MusicStoreNpgsqlFixture fixture) : MusicStoreTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/NotificationEntitiesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/NotificationEntitiesNpgsqlTest.cs index 5adf933263..62e30d7ee7 100644 --- a/test/EFCore.PG.FunctionalTests/NotificationEntitiesNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/NotificationEntitiesNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class NotificationEntitiesNpgsqlTest(NotificationEntitiesNpgsqlTest.NotificationEntitiesNpgsqlFixture fixture) : NotificationEntitiesTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/NpgsqlApiConsistencyTest.cs b/test/EFCore.PG.FunctionalTests/NpgsqlApiConsistencyTest.cs index bb0b363e22..4479fdb828 100644 --- a/test/EFCore.PG.FunctionalTests/NpgsqlApiConsistencyTest.cs +++ b/test/EFCore.PG.FunctionalTests/NpgsqlApiConsistencyTest.cs @@ -1,7 +1,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal; -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; #nullable disable diff --git a/test/EFCore.PG.FunctionalTests/NpgsqlComplianceTest.cs b/test/EFCore.PG.FunctionalTests/NpgsqlComplianceTest.cs index f5e3546503..66e8b515b3 100644 --- a/test/EFCore.PG.FunctionalTests/NpgsqlComplianceTest.cs +++ b/test/EFCore.PG.FunctionalTests/NpgsqlComplianceTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class NpgsqlComplianceTest : RelationalComplianceTestBase { diff --git a/test/EFCore.PG.FunctionalTests/NpgsqlDatabaseCreatorTest.cs b/test/EFCore.PG.FunctionalTests/NpgsqlDatabaseCreatorTest.cs index f3fcb04c3b..f8f0ab27ba 100644 --- a/test/EFCore.PG.FunctionalTests/NpgsqlDatabaseCreatorTest.cs +++ b/test/EFCore.PG.FunctionalTests/NpgsqlDatabaseCreatorTest.cs @@ -1,11 +1,10 @@ using System.Data; using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; // ReSharper disable HeapView.CanAvoidClosure // ReSharper disable MethodHasAsyncOverload -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; #nullable disable diff --git a/test/EFCore.PG.FunctionalTests/NpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/NpgsqlFixture.cs index 21914d42cc..128093b278 100644 --- a/test/EFCore.PG.FunctionalTests/NpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/NpgsqlFixture.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class NpgsqlFixture : ServiceProviderFixtureBase { diff --git a/test/EFCore.PG.FunctionalTests/NpgsqlServiceCollectionExtensionsTest.cs b/test/EFCore.PG.FunctionalTests/NpgsqlServiceCollectionExtensionsTest.cs index 47173ca154..4c17028d63 100644 --- a/test/EFCore.PG.FunctionalTests/NpgsqlServiceCollectionExtensionsTest.cs +++ b/test/EFCore.PG.FunctionalTests/NpgsqlServiceCollectionExtensionsTest.cs @@ -1,5 +1,3 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class NpgsqlServiceCollectionExtensionsTest() : RelationalServiceCollectionExtensionsTestBase(NpgsqlTestHelpers.Instance); diff --git a/test/EFCore.PG.FunctionalTests/NpgsqlValueGenerationScenariosTest.cs b/test/EFCore.PG.FunctionalTests/NpgsqlValueGenerationScenariosTest.cs index 2768966831..9ce402dea0 100644 --- a/test/EFCore.PG.FunctionalTests/NpgsqlValueGenerationScenariosTest.cs +++ b/test/EFCore.PG.FunctionalTests/NpgsqlValueGenerationScenariosTest.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.ValueGeneration.Internal; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; #nullable disable diff --git a/test/EFCore.PG.FunctionalTests/OptimisticConcurrencyNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/OptimisticConcurrencyNpgsqlTest.cs index 4162f307d5..abadf6067b 100644 --- a/test/EFCore.PG.FunctionalTests/OptimisticConcurrencyNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/OptimisticConcurrencyNpgsqlTest.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.ConcurrencyModel; -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; #nullable disable diff --git a/test/EFCore.PG.FunctionalTests/OverzealousInitializationNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/OverzealousInitializationNpgsqlTest.cs index 103eea732e..ec0c233d60 100644 --- a/test/EFCore.PG.FunctionalTests/OverzealousInitializationNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/OverzealousInitializationNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class OverzealousInitializationNpgsqlTest(OverzealousInitializationNpgsqlTest.OverzealousInitializationNpgsqlFixture fixture) : OverzealousInitializationTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/PropertyValuesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/PropertyValuesNpgsqlTest.cs index 2f9d6bfed9..1088fba2b6 100644 --- a/test/EFCore.PG.FunctionalTests/PropertyValuesNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/PropertyValuesNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class PropertyValuesNpgsqlTest(PropertyValuesNpgsqlTest.PropertyValuesNpgsqlFixture fixture) : PropertyValuesTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/Query/AdHocAdvancedMappingsQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/AdHocAdvancedMappingsQueryNpgsqlTest.cs index a3bafed459..0683616856 100644 --- a/test/EFCore.PG.FunctionalTests/Query/AdHocAdvancedMappingsQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/AdHocAdvancedMappingsQueryNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class AdHocAdvancedMappingsQueryNpgsqlTest : AdHocAdvancedMappingsQueryRelationalTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/AdHocComplexTypeQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/AdHocComplexTypeQueryNpgsqlTest.cs index 2a8eae4750..06eacc7389 100644 --- a/test/EFCore.PG.FunctionalTests/Query/AdHocComplexTypeQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/AdHocComplexTypeQueryNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class AdHocComplexTypeQueryNpgsqlTest : AdHocComplexTypeQueryTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/AdHocJsonQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/AdHocJsonQueryNpgsqlTest.cs index 2893cc60a1..ca57346bcf 100644 --- a/test/EFCore.PG.FunctionalTests/Query/AdHocJsonQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/AdHocJsonQueryNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; #nullable disable diff --git a/test/EFCore.PG.FunctionalTests/Query/AdHocManyToManyQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/AdHocManyToManyQueryNpgsqlTest.cs index eb60e4c605..86dab276da 100644 --- a/test/EFCore.PG.FunctionalTests/Query/AdHocManyToManyQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/AdHocManyToManyQueryNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class AdHocManyToManyQueryNpgsqlTest : AdHocManyToManyQueryRelationalTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/AdHocMiscellaneousQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/AdHocMiscellaneousQueryNpgsqlTest.cs index cf497d6a5e..10c82e7eeb 100644 --- a/test/EFCore.PG.FunctionalTests/Query/AdHocMiscellaneousQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/AdHocMiscellaneousQueryNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class AdHocMiscellaneousQueryNpgsqlTest : AdHocMiscellaneousQueryRelationalTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/AdHocNavigationsQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/AdHocNavigationsQueryNpgsqlTest.cs index 90feaf0947..5e17a52f35 100644 --- a/test/EFCore.PG.FunctionalTests/Query/AdHocNavigationsQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/AdHocNavigationsQueryNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class AdHocNavigationsQueryNpgsqlTest : AdHocNavigationsQueryRelationalTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/AdHocPrecompiledQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/AdHocPrecompiledQueryNpgsqlTest.cs index 928af749b5..4fed4cbeca 100644 --- a/test/EFCore.PG.FunctionalTests/Query/AdHocPrecompiledQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/AdHocPrecompiledQueryNpgsqlTest.cs @@ -1,7 +1,6 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class AdHocPrecompiledQueryNpgsqlTest(ITestOutputHelper testOutputHelper) : AdHocPrecompiledQueryRelationalTestBase(testOutputHelper) diff --git a/test/EFCore.PG.FunctionalTests/Query/AdHocQueryFiltersQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/AdHocQueryFiltersQueryNpgsqlTest.cs index a6c0b0c17b..02238b1374 100644 --- a/test/EFCore.PG.FunctionalTests/Query/AdHocQueryFiltersQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/AdHocQueryFiltersQueryNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class AdHocQueryFiltersQueryNpgsqlTest : AdHocQueryFiltersQueryRelationalTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/AdHocQuerySplittingQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/AdHocQuerySplittingQueryNpgsqlTest.cs index d5c4a9e254..8de31fe1e2 100644 --- a/test/EFCore.PG.FunctionalTests/Query/AdHocQuerySplittingQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/AdHocQuerySplittingQueryNpgsqlTest.cs @@ -1,8 +1,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; #nullable disable diff --git a/test/EFCore.PG.FunctionalTests/Query/ArrayArrayQueryTest.cs b/test/EFCore.PG.FunctionalTests/Query/ArrayArrayQueryTest.cs index e6af296bfe..2b481dfcd5 100644 --- a/test/EFCore.PG.FunctionalTests/Query/ArrayArrayQueryTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/ArrayArrayQueryTest.cs @@ -1,6 +1,6 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestModels.Array; +using Microsoft.EntityFrameworkCore.TestModels.Array; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class ArrayArrayQueryTest(ArrayArrayQueryTest.ArrayArrayQueryFixture fixture, ITestOutputHelper testOutputHelper) : ArrayQueryTest(fixture, testOutputHelper) diff --git a/test/EFCore.PG.FunctionalTests/Query/ArrayListQueryTest.cs b/test/EFCore.PG.FunctionalTests/Query/ArrayListQueryTest.cs index 8cc4c46f78..cfe968bb5d 100644 --- a/test/EFCore.PG.FunctionalTests/Query/ArrayListQueryTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/ArrayListQueryTest.cs @@ -1,6 +1,7 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestModels.Array; +using Microsoft.EntityFrameworkCore.TestModels.Array; +using TypeExtensions = Npgsql.EntityFrameworkCore.PostgreSQL.TypeExtensions; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class ArrayListQueryTest : ArrayQueryTest { @@ -995,7 +996,7 @@ protected override Expression VisitBinary(BinaryExpression node) if (node.NodeType == ExpressionType.ArrayIndex) { var listExpression = Visit(node.Left); - if (listExpression.Type.IsGenericList()) + if (TypeExtensions.IsGenericList(listExpression.Type)) { var getItemMethod = listExpression.Type.GetMethod("get_Item", [typeof(int)])!; return Expression.Call(listExpression, getItemMethod, node.Right); diff --git a/test/EFCore.PG.FunctionalTests/Query/ArrayQueryFixture.cs b/test/EFCore.PG.FunctionalTests/Query/ArrayQueryFixture.cs index 7a0e021221..7ea9d7176d 100644 --- a/test/EFCore.PG.FunctionalTests/Query/ArrayQueryFixture.cs +++ b/test/EFCore.PG.FunctionalTests/Query/ArrayQueryFixture.cs @@ -1,7 +1,6 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestModels.Array; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; +using Microsoft.EntityFrameworkCore.TestModels.Array; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public abstract class ArrayQueryFixture : SharedStoreFixtureBase, IQueryFixtureBase, ITestSqlLoggerFactory { diff --git a/test/EFCore.PG.FunctionalTests/Query/ArrayQueryTest.cs b/test/EFCore.PG.FunctionalTests/Query/ArrayQueryTest.cs index a970c8c3fc..2ef40741da 100644 --- a/test/EFCore.PG.FunctionalTests/Query/ArrayQueryTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/ArrayQueryTest.cs @@ -1,9 +1,9 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.Internal; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestModels.Array; +using Microsoft.EntityFrameworkCore.TestModels.Array; +using Npgsql.EntityFrameworkCore.PostgreSQL.Internal; // ReSharper disable ConvertToConstant.Local -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public abstract class ArrayQueryTest : QueryTestBase where TFixture : ArrayQueryFixture, new() diff --git a/test/EFCore.PG.FunctionalTests/Query/CharacterQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/CharacterQueryNpgsqlTest.cs index 2799f008d7..f23c0e9d25 100644 --- a/test/EFCore.PG.FunctionalTests/Query/CharacterQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/CharacterQueryNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class CharacterQueryNpgsqlTest : IClassFixture { diff --git a/test/EFCore.PG.FunctionalTests/Query/CompatibilityQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/CompatibilityQueryNpgsqlTest.cs index 783644184e..236448fff4 100644 --- a/test/EFCore.PG.FunctionalTests/Query/CompatibilityQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/CompatibilityQueryNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class CompatibilityQueryNpgsqlTest : IClassFixture { diff --git a/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsCollectionsQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsCollectionsQueryNpgsqlTest.cs index 9d5928ce0f..34181c0da8 100644 --- a/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsCollectionsQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsCollectionsQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class ComplexNavigationsCollectionsQueryNpgsqlTest : ComplexNavigationsCollectionsQueryRelationalTestBase< ComplexNavigationsQueryNpgsqlFixture> diff --git a/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsCollectionsSharedTypeQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsCollectionsSharedTypeQueryNpgsqlTest.cs index 01a706c713..f9fc7a7b13 100644 --- a/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsCollectionsSharedTypeQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsCollectionsSharedTypeQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class ComplexNavigationsCollectionsSharedTypeQueryNpgsqlTest : ComplexNavigationsCollectionsSharedTypeQueryRelationalTestBase< ComplexNavigationsSharedTypeQueryNpgsqlFixture> diff --git a/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsCollectionsSplitQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsCollectionsSplitQueryNpgsqlTest.cs index 434fea4de2..915f1132b8 100644 --- a/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsCollectionsSplitQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsCollectionsSplitQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class ComplexNavigationsCollectionsSplitQueryNpgsqlTest : ComplexNavigationsCollectionsSplitQueryRelationalTestBase< ComplexNavigationsQueryNpgsqlFixture> diff --git a/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsCollectionsSplitSharedTypeQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsCollectionsSplitSharedTypeQueryNpgsqlTest.cs index 88287a1e66..4fe0eb4eb9 100644 --- a/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsCollectionsSplitSharedTypeQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsCollectionsSplitSharedTypeQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class ComplexNavigationsCollectionsSplitSharedTypeQueryNpgsqlTest : ComplexNavigationsCollectionsSplitSharedTypeQueryRelationalTestBase< diff --git a/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsQueryNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsQueryNpgsqlFixture.cs index f0e0398aa4..59cb452338 100644 --- a/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsQueryNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsQueryNpgsqlFixture.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.ComplexNavigationsModel; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class ComplexNavigationsQueryNpgsqlFixture : ComplexNavigationsQueryRelationalFixtureBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsQueryNpgsqlTest.cs index ae27cc5815..4cc5b48653 100644 --- a/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsQueryNpgsqlTest.cs @@ -1,6 +1,6 @@ using Xunit.Sdk; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class ComplexNavigationsQueryNpgsqlTest : ComplexNavigationsQueryRelationalTestBase { @@ -18,7 +18,7 @@ public override Task GroupJoin_client_method_in_OrderBy(bool async) => AssertTranslationFailedWithDetails( () => base.GroupJoin_client_method_in_OrderBy(async), CoreStrings.QueryUnableToTranslateMethod( - "Microsoft.EntityFrameworkCore.Query.ComplexNavigationsQueryTestBase", + "Microsoft.EntityFrameworkCore.Query.ComplexNavigationsQueryTestBase", "ClientMethodNullableInt")); public override Task Nested_SelectMany_correlated_with_join_table_correctly_translated_to_apply(bool async) diff --git a/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsSharedTypeQueryNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsSharedTypeQueryNpgsqlFixture.cs index 065e21dde7..ad713cbf99 100644 --- a/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsSharedTypeQueryNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsSharedTypeQueryNpgsqlFixture.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.ComplexNavigationsModel; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class ComplexNavigationsSharedTypeQueryNpgsqlFixture : ComplexNavigationsSharedTypeQueryRelationalFixtureBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsSharedTypeQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsSharedTypeQueryNpgsqlTest.cs index 69e20028d7..5cfa5cda7a 100644 --- a/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsSharedTypeQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsSharedTypeQueryNpgsqlTest.cs @@ -1,6 +1,6 @@ using Xunit.Sdk; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class ComplexNavigationsSharedTypeQueryNpgsqlTest : ComplexNavigationsSharedTypeQueryRelationalTestBase @@ -27,7 +27,7 @@ public override Task GroupJoin_client_method_in_OrderBy(bool async) => AssertTranslationFailedWithDetails( () => base.GroupJoin_client_method_in_OrderBy(async), CoreStrings.QueryUnableToTranslateMethod( - "Microsoft.EntityFrameworkCore.Query.ComplexNavigationsQueryTestBase", + "Microsoft.EntityFrameworkCore.Query.ComplexNavigationsQueryTestBase", "ClientMethodNullableInt")); public override Task Nested_SelectMany_correlated_with_join_table_correctly_translated_to_apply(bool async) diff --git a/test/EFCore.PG.FunctionalTests/Query/ComplexTypeQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/ComplexTypeQueryNpgsqlTest.cs index f6bd6a21a6..d13aa37b07 100644 --- a/test/EFCore.PG.FunctionalTests/Query/ComplexTypeQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/ComplexTypeQueryNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class ComplexTypeQueryNpgsqlTest : ComplexTypeQueryRelationalTestBase< ComplexTypeQueryNpgsqlTest.ComplexTypeQueryNpgsqlFixture> diff --git a/test/EFCore.PG.FunctionalTests/Query/CompositeKeysQueryNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/Query/CompositeKeysQueryNpgsqlFixture.cs index 385430fc3d..a826ae7303 100644 --- a/test/EFCore.PG.FunctionalTests/Query/CompositeKeysQueryNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/Query/CompositeKeysQueryNpgsqlFixture.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.CompositeKeysModel; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class CompositeKeysQueryNpgsqlFixture : CompositeKeysQueryRelationalFixtureBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/CompositeKeysQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/CompositeKeysQueryNpgsqlTest.cs index 6d9029c668..e35ded3701 100644 --- a/test/EFCore.PG.FunctionalTests/Query/CompositeKeysQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/CompositeKeysQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class CompositeKeysQueryNpgsqlTest : CompositeKeysQueryRelationalTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/CompositeKeysSplitQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/CompositeKeysSplitQueryNpgsqlTest.cs index 1eb97ddb2d..b53b2b6b90 100644 --- a/test/EFCore.PG.FunctionalTests/Query/CompositeKeysSplitQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/CompositeKeysSplitQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class CompositeKeysSplitQueryNpgsqlTest : CompositeKeysSplitQueryRelationalTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/Ef6GroupByNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/Ef6GroupByNpgsqlTest.cs index 2e7a5b46ed..8e00b4d54c 100644 --- a/test/EFCore.PG.FunctionalTests/Query/Ef6GroupByNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/Ef6GroupByNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class Ef6GroupByNpgsqlTest : Ef6GroupByTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/EntitySplittingQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/EntitySplittingQueryNpgsqlTest.cs index 012aed4265..bb1ebda321 100644 --- a/test/EFCore.PG.FunctionalTests/Query/EntitySplittingQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/EntitySplittingQueryNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class EntitySplittingQueryNpgsqlTest : EntitySplittingQueryTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/FieldsOnlyLoadNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/FieldsOnlyLoadNpgsqlTest.cs index 9e75660b07..7a8643273b 100644 --- a/test/EFCore.PG.FunctionalTests/Query/FieldsOnlyLoadNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/FieldsOnlyLoadNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class FieldsOnlyLoadNpgsqlTest(FieldsOnlyLoadNpgsqlTest.FieldsOnlyLoadNpgsqlFixture fixture) : FieldsOnlyLoadTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/Query/FiltersInheritanceQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/FiltersInheritanceQueryNpgsqlTest.cs index 2ec547d5dc..df7a258761 100644 --- a/test/EFCore.PG.FunctionalTests/Query/FiltersInheritanceQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/FiltersInheritanceQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class FiltersInheritanceQueryNpgsqlTest : FiltersInheritanceQueryTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/FromSqlQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/FromSqlQueryNpgsqlTest.cs index dc391c9930..1eaa9ea668 100644 --- a/test/EFCore.PG.FunctionalTests/Query/FromSqlQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/FromSqlQueryNpgsqlTest.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore.TestModels.Northwind; using Xunit.Sdk; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class FromSqlQueryNpgsqlTest(NorthwindQueryNpgsqlFixture fixture) : FromSqlQueryTestBase>(fixture) diff --git a/test/EFCore.PG.FunctionalTests/Query/FullTextSearchDbFunctionsNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/FullTextSearchDbFunctionsNpgsqlTest.cs index c0a368cd23..e54ea82d13 100644 --- a/test/EFCore.PG.FunctionalTests/Query/FullTextSearchDbFunctionsNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/FullTextSearchDbFunctionsNpgsqlTest.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.Northwind; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; #pragma warning disable CS0618 // NpgsqlTsVector.Parse is obsolete diff --git a/test/EFCore.PG.FunctionalTests/Query/FunkyDataQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/FunkyDataQueryNpgsqlTest.cs index 324c42bbe9..ecbf08ed77 100644 --- a/test/EFCore.PG.FunctionalTests/Query/FunkyDataQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/FunkyDataQueryNpgsqlTest.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.FunkyDataModel; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class FunkyDataQueryNpgsqlTest : FunkyDataQueryTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/FuzzyStringMatchQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/FuzzyStringMatchQueryNpgsqlTest.cs index 70fda57a9e..647336f0f9 100644 --- a/test/EFCore.PG.FunctionalTests/Query/FuzzyStringMatchQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/FuzzyStringMatchQueryNpgsqlTest.cs @@ -1,7 +1,6 @@ using System.ComponentModel.DataAnnotations; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; /// /// Provides unit tests for the fuzzystrmatch module function translations. diff --git a/test/EFCore.PG.FunctionalTests/Query/GearsOfWarFromSqlQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/GearsOfWarFromSqlQueryNpgsqlTest.cs index b8a140c27e..cb5d7bc45d 100644 --- a/test/EFCore.PG.FunctionalTests/Query/GearsOfWarFromSqlQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/GearsOfWarFromSqlQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class GearsOfWarFromSqlQueryNpgsqlTest : GearsOfWarFromSqlQueryTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/GearsOfWarQueryNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/Query/GearsOfWarQueryNpgsqlFixture.cs index 3b7987625b..acf4f1dbde 100644 --- a/test/EFCore.PG.FunctionalTests/Query/GearsOfWarQueryNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/Query/GearsOfWarQueryNpgsqlFixture.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.GearsOfWarModel; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class GearsOfWarQueryNpgsqlFixture : GearsOfWarQueryRelationalFixture diff --git a/test/EFCore.PG.FunctionalTests/Query/GearsOfWarQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/GearsOfWarQueryNpgsqlTest.cs index ce9b5378a4..c0a4d4b854 100644 --- a/test/EFCore.PG.FunctionalTests/Query/GearsOfWarQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/GearsOfWarQueryNpgsqlTest.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.GearsOfWarModel; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; // ReSharper disable once UnusedMember.Global public class GearsOfWarQueryNpgsqlTest : GearsOfWarQueryRelationalTestBase diff --git a/test/EFCore.PG.FunctionalTests/Query/IncludeNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/Query/IncludeNpgsqlFixture.cs index 58ac4df0a6..4feaf08e0e 100644 --- a/test/EFCore.PG.FunctionalTests/Query/IncludeNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/Query/IncludeNpgsqlFixture.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class IncludeNpgsqlFixture : NorthwindQueryNpgsqlFixture { diff --git a/test/EFCore.PG.FunctionalTests/Query/IncludeOneToOneNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/IncludeOneToOneNpgsqlTest.cs index d89d1a27b8..b39178b5fc 100644 --- a/test/EFCore.PG.FunctionalTests/Query/IncludeOneToOneNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/IncludeOneToOneNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; // ReSharper disable once UnusedMember.Global public class IncludeOneToOneNpgsqlTest : IncludeOneToOneTestBase diff --git a/test/EFCore.PG.FunctionalTests/Query/InheritanceRelationshipsQueryNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/Query/InheritanceRelationshipsQueryNpgsqlFixture.cs index 5a9e7b98a0..26707e113a 100644 --- a/test/EFCore.PG.FunctionalTests/Query/InheritanceRelationshipsQueryNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/Query/InheritanceRelationshipsQueryNpgsqlFixture.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class InheritanceRelationshipsQueryNpgsqlFixture : InheritanceRelationshipsQueryRelationalFixture { diff --git a/test/EFCore.PG.FunctionalTests/Query/InheritanceRelationshipsQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/InheritanceRelationshipsQueryNpgsqlTest.cs index 6fbb0e0341..819cc7338a 100644 --- a/test/EFCore.PG.FunctionalTests/Query/InheritanceRelationshipsQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/InheritanceRelationshipsQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class InheritanceRelationshipsQueryNpgsqlTest(InheritanceRelationshipsQueryNpgsqlFixture fixture) : InheritanceRelationshipsQueryTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/Query/JsonDomQueryTest.cs b/test/EFCore.PG.FunctionalTests/Query/JsonDomQueryTest.cs index 5def3a621f..cfb8de9089 100644 --- a/test/EFCore.PG.FunctionalTests/Query/JsonDomQueryTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/JsonDomQueryTest.cs @@ -1,8 +1,7 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Text.Json; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class JsonDomQueryTest : IClassFixture { diff --git a/test/EFCore.PG.FunctionalTests/Query/JsonPocoQueryTest.cs b/test/EFCore.PG.FunctionalTests/Query/JsonPocoQueryTest.cs index 34cd1d173f..feb4414e94 100644 --- a/test/EFCore.PG.FunctionalTests/Query/JsonPocoQueryTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/JsonPocoQueryTest.cs @@ -1,9 +1,8 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Text.Json; using System.Text.Json.Serialization; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class JsonPocoQueryTest : IClassFixture { @@ -73,7 +72,7 @@ LIMIT 1 """, // """ -@expected='Npgsql.EntityFrameworkCore.PostgreSQL.Query.JsonPocoQueryTest+Customer' (DbType = Object) +@expected='Microsoft.EntityFrameworkCore.Query.JsonPocoQueryTest+Customer' (DbType = Object) SELECT j."Id", j."Customer", j."ToplevelArray" FROM "JsonbEntities" AS j diff --git a/test/EFCore.PG.FunctionalTests/Query/JsonQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/JsonQueryNpgsqlTest.cs index f9fb47da7c..d530f1f357 100644 --- a/test/EFCore.PG.FunctionalTests/Query/JsonQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/JsonQueryNpgsqlTest.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.JsonQuery; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class JsonQueryNpgsqlTest : JsonQueryRelationalTestBase { @@ -902,7 +901,7 @@ public override async Task Json_collection_index_in_projection_using_untranslata Assert.Contains( CoreStrings.QueryUnableToTranslateMethod( - "Microsoft.EntityFrameworkCore.Query.JsonQueryTestBase", + "Microsoft.EntityFrameworkCore.Query.JsonQueryTestBase", "MyMethod"), message); } @@ -914,7 +913,7 @@ public override async Task Json_collection_index_in_projection_using_untranslata Assert.Contains( CoreStrings.QueryUnableToTranslateMethod( - "Microsoft.EntityFrameworkCore.Query.JsonQueryTestBase", + "Microsoft.EntityFrameworkCore.Query.JsonQueryTestBase", "MyMethod"), message); } diff --git a/test/EFCore.PG.FunctionalTests/Query/JsonStringQueryTest.cs b/test/EFCore.PG.FunctionalTests/Query/JsonStringQueryTest.cs index 7ecbcbab0d..b8b8909209 100644 --- a/test/EFCore.PG.FunctionalTests/Query/JsonStringQueryTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/JsonStringQueryTest.cs @@ -1,8 +1,7 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Text.Json; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class JsonStringQueryTest : IClassFixture { diff --git a/test/EFCore.PG.FunctionalTests/Query/LegacyNpgsqlNodaTimeTypeMappingTest.cs b/test/EFCore.PG.FunctionalTests/Query/LegacyNpgsqlNodaTimeTypeMappingTest.cs index 2a99bbcd5f..c5f228d856 100644 --- a/test/EFCore.PG.FunctionalTests/Query/LegacyNpgsqlNodaTimeTypeMappingTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/LegacyNpgsqlNodaTimeTypeMappingTest.cs @@ -6,7 +6,7 @@ #if DEBUG -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query +namespace Microsoft.EntityFrameworkCore.Query { [Collection("LegacyNodaTimeTest")] public class LegacyNpgsqlNodaTimeTypeMappingTest diff --git a/test/EFCore.PG.FunctionalTests/Query/LegacyTimestampQueryTest.cs b/test/EFCore.PG.FunctionalTests/Query/LegacyTimestampQueryTest.cs index 57f97fbb13..1f64419401 100644 --- a/test/EFCore.PG.FunctionalTests/Query/LegacyTimestampQueryTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/LegacyTimestampQueryTest.cs @@ -1,10 +1,9 @@ using System.ComponentModel.DataAnnotations.Schema; using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; #if DEBUG -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query +namespace Microsoft.EntityFrameworkCore.Query { // Because we can't play around with the LegacyTimestampBehavior flag at the ADO level (different assembly already compile in // RELEASE), this test suite is limited to playing around at the EF Core level only. diff --git a/test/EFCore.PG.FunctionalTests/Query/ManyToManyNoTrackingQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/ManyToManyNoTrackingQueryNpgsqlTest.cs index 5c26e46df0..efb6c3a87c 100644 --- a/test/EFCore.PG.FunctionalTests/Query/ManyToManyNoTrackingQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/ManyToManyNoTrackingQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; internal class ManyToManyNoTrackingQueryNpgsqlTest : ManyToManyNoTrackingQueryRelationalTestBase diff --git a/test/EFCore.PG.FunctionalTests/Query/ManyToManyQueryNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/Query/ManyToManyQueryNpgsqlFixture.cs index fd5b8398ad..6eea1a665b 100644 --- a/test/EFCore.PG.FunctionalTests/Query/ManyToManyQueryNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/Query/ManyToManyQueryNpgsqlFixture.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.ManyToManyModel; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class ManyToManyQueryNpgsqlFixture : ManyToManyQueryRelationalFixture { diff --git a/test/EFCore.PG.FunctionalTests/Query/ManyToManyQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/ManyToManyQueryNpgsqlTest.cs index f48a35f77e..6a1ee1b528 100644 --- a/test/EFCore.PG.FunctionalTests/Query/ManyToManyQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/ManyToManyQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; internal class ManyToManyQueryNpgsqlTest : ManyToManyQueryRelationalTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/MappingQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/MappingQueryNpgsqlTest.cs index 92d3c9efaa..dbe42cee60 100644 --- a/test/EFCore.PG.FunctionalTests/Query/MappingQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/MappingQueryNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; // ReSharper disable once UnusedMember.Global public class MappingQueryNpgsqlTest : MappingQueryTestBase diff --git a/test/EFCore.PG.FunctionalTests/Query/NavigationTest.cs b/test/EFCore.PG.FunctionalTests/Query/NavigationTest.cs index eadfaf07cd..3d0be38023 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NavigationTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NavigationTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; #nullable disable diff --git a/test/EFCore.PG.FunctionalTests/Query/NonSharedPrimitiveCollectionsQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NonSharedPrimitiveCollectionsQueryNpgsqlTest.cs index b4ffa354e0..1ab90888bd 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NonSharedPrimitiveCollectionsQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NonSharedPrimitiveCollectionsQueryNpgsqlTest.cs @@ -1,7 +1,6 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class NonSharedPrimitiveCollectionsQueryNpgsqlTest : NonSharedPrimitiveCollectionsQueryRelationalTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindAggregateOperatorsQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindAggregateOperatorsQueryNpgsqlTest.cs index 40ac10e5ff..2e6d826e15 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindAggregateOperatorsQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindAggregateOperatorsQueryNpgsqlTest.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.Northwind; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindAggregateOperatorsQueryNpgsqlTest : NorthwindAggregateOperatorsQueryRelationalTestBase< NorthwindQueryNpgsqlFixture> diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindAsNoTrackingQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindAsNoTrackingQueryNpgsqlTest.cs index b0bede4158..e16b0990df 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindAsNoTrackingQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindAsNoTrackingQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindAsNoTrackingQueryNpgsqlTest : NorthwindAsNoTrackingQueryTestBase> { diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindAsTrackingQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindAsTrackingQueryNpgsqlTest.cs index 1f6bd647c9..68f5b20197 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindAsTrackingQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindAsTrackingQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindAsTrackingQueryNpgsqlTest : NorthwindAsTrackingQueryTestBase> { diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindChangeTrackingQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindChangeTrackingQueryNpgsqlTest.cs index b9eb46c45a..2a39e1d16b 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindChangeTrackingQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindChangeTrackingQueryNpgsqlTest.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.Northwind; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestModels.Northwind; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindChangeTrackingQueryNpgsqlTest : NorthwindChangeTrackingQueryTestBase> { diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindCompiledQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindCompiledQueryNpgsqlTest.cs index a83b26fc4a..ba9d574530 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindCompiledQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindCompiledQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindCompiledQueryNpgsqlTest : NorthwindCompiledQueryTestBase> { diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindDbFunctionsQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindDbFunctionsQueryNpgsqlTest.cs index 2a3f2d6139..b6116abf2b 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindDbFunctionsQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindDbFunctionsQueryNpgsqlTest.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.Northwind; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; #nullable disable @@ -128,7 +127,7 @@ WHERE c."ContactName" NOT ILIKE '%M%' OR c."ContactName" IS NULL #region Collation [MinimumPostgresVersion(12, 0)] - [PlatformSkipCondition(TestPlatform.Windows, SkipReason = "ICU non-deterministic doesn't seem to work on Windows?")] + [PlatformSkipCondition(TestUtilities.Xunit.TestPlatform.Windows, SkipReason = "ICU non-deterministic doesn't seem to work on Windows?")] public override async Task Collate_case_insensitive(bool async) { await base.Collate_case_insensitive(async); diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindEFPropertyIncludeQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindEFPropertyIncludeQueryNpgsqlTest.cs index c5c800a7e5..576cfdf768 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindEFPropertyIncludeQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindEFPropertyIncludeQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindEFPropertyIncludeQueryNpgsqlTest : NorthwindEFPropertyIncludeQueryTestBase< NorthwindQueryNpgsqlFixture> diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindFunctionsQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindFunctionsQueryNpgsqlTest.cs index 25d15646d3..fe360fda2d 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindFunctionsQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindFunctionsQueryNpgsqlTest.cs @@ -1,9 +1,8 @@ using System.Text.Json; using System.Text.RegularExpressions; using Microsoft.EntityFrameworkCore.TestModels.Northwind; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; #nullable disable diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindGroupByQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindGroupByQueryNpgsqlTest.cs index 5d963e9bfe..732bff2e0a 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindGroupByQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindGroupByQueryNpgsqlTest.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.Northwind; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindGroupByQueryNpgsqlTest : NorthwindGroupByQueryRelationalTestBase> { diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindIncludeNoTrackingQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindIncludeNoTrackingQueryNpgsqlTest.cs index a61bfdf1c6..8b87c833c6 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindIncludeNoTrackingQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindIncludeNoTrackingQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindIncludeNoTrackingQueryNpgsqlTest : NorthwindIncludeNoTrackingQueryTestBase< NorthwindQueryNpgsqlFixture> diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindIncludeQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindIncludeQueryNpgsqlTest.cs index 681d7e7ddf..64cdef5736 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindIncludeQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindIncludeQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindIncludeQueryNpgsqlTest : NorthwindIncludeQueryRelationalTestBase> { diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindJoinQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindJoinQueryNpgsqlTest.cs index ebdba63ea6..3d9cbb7e68 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindJoinQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindJoinQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindJoinQueryNpgsqlTest : NorthwindJoinQueryRelationalTestBase> { diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindKeylessEntitiesQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindKeylessEntitiesQueryNpgsqlTest.cs index 06812edfff..88ba01178f 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindKeylessEntitiesQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindKeylessEntitiesQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindKeylessEntitiesQueryNpgsqlTest : NorthwindKeylessEntitiesQueryRelationalTestBase< NorthwindQueryNpgsqlFixture> diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindMiscellaneousQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindMiscellaneousQueryNpgsqlTest.cs index 08dcc031e1..d4d4eca64b 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindMiscellaneousQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindMiscellaneousQueryNpgsqlTest.cs @@ -1,7 +1,7 @@ using Microsoft.EntityFrameworkCore.TestModels.Northwind; using Xunit.Sdk; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; #nullable disable @@ -112,7 +112,7 @@ public override async Task Client_code_using_instance_method_throws(bool async) { Assert.Equal( CoreStrings.ClientProjectionCapturingConstantInMethodInstance( - "Npgsql.EntityFrameworkCore.PostgreSQL.Query.NorthwindMiscellaneousQueryNpgsqlTest", + "Microsoft.EntityFrameworkCore.Query.NorthwindMiscellaneousQueryNpgsqlTest", "InstanceMethod"), (await Assert.ThrowsAsync( () => base.Client_code_using_instance_method_throws(async))).Message); @@ -124,7 +124,7 @@ public override async Task Client_code_using_instance_in_static_method(bool asyn { Assert.Equal( CoreStrings.ClientProjectionCapturingConstantInMethodArgument( - "Npgsql.EntityFrameworkCore.PostgreSQL.Query.NorthwindMiscellaneousQueryNpgsqlTest", + "Microsoft.EntityFrameworkCore.Query.NorthwindMiscellaneousQueryNpgsqlTest", "StaticMethod"), (await Assert.ThrowsAsync( () => base.Client_code_using_instance_in_static_method(async))).Message); @@ -136,7 +136,7 @@ public override async Task Client_code_using_instance_in_anonymous_type(bool asy { Assert.Equal( CoreStrings.ClientProjectionCapturingConstantInTree( - "Npgsql.EntityFrameworkCore.PostgreSQL.Query.NorthwindMiscellaneousQueryNpgsqlTest"), + "Microsoft.EntityFrameworkCore.Query.NorthwindMiscellaneousQueryNpgsqlTest"), (await Assert.ThrowsAsync( () => base.Client_code_using_instance_in_anonymous_type(async))).Message); @@ -148,7 +148,7 @@ public override async Task Client_code_unknown_method(bool async) await AssertTranslationFailedWithDetails( () => base.Client_code_unknown_method(async), CoreStrings.QueryUnableToTranslateMethod( - "Microsoft.EntityFrameworkCore.Query.NorthwindMiscellaneousQueryTestBase>", + "Microsoft.EntityFrameworkCore.Query.NorthwindMiscellaneousQueryTestBase>", nameof(UnknownMethod))); AssertSql(); diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindNavigationsQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindNavigationsQueryNpgsqlTest.cs index 15216b3abb..2c2c913e02 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindNavigationsQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindNavigationsQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindNavigationsQueryNpgsqlTest : NorthwindNavigationsQueryRelationalTestBase< NorthwindQueryNpgsqlFixture> diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindQueryFiltersQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindQueryFiltersQueryNpgsqlTest.cs index 09da464311..62fe544506 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindQueryFiltersQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindQueryFiltersQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindQueryFiltersQueryNpgsqlTest : NorthwindQueryFiltersQueryTestBase< NorthwindQueryNpgsqlFixture> diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindQueryNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindQueryNpgsqlFixture.cs index e8d412e212..891ce2f056 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindQueryNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindQueryNpgsqlFixture.cs @@ -1,9 +1,7 @@ using Microsoft.EntityFrameworkCore.TestModels.Northwind; using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestModels.Northwind; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindQueryNpgsqlFixture : NorthwindQueryRelationalFixture where TModelCustomizer : ITestModelCustomizer, new() diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindQueryTaggingQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindQueryTaggingQueryNpgsqlTest.cs index 5b38875398..911afe2082 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindQueryTaggingQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindQueryTaggingQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindQueryTaggingQueryNpgsqlTest : NorthwindQueryTaggingQueryTestBase> { diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindSelectQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindSelectQueryNpgsqlTest.cs index 2173b0cdc9..6b04993092 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindSelectQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindSelectQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindSelectQueryNpgsqlTest : NorthwindSelectQueryRelationalTestBase> { diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindSetOperationsQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindSetOperationsQueryNpgsqlTest.cs index 316ffb4a90..bf651e663d 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindSetOperationsQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindSetOperationsQueryNpgsqlTest.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.Northwind; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindSetOperationsQueryNpgsqlTest : NorthwindSetOperationsQueryRelationalTestBase> diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindSplitIncludeNoTrackingQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindSplitIncludeNoTrackingQueryNpgsqlTest.cs index e34ae9c50b..daa9f53184 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindSplitIncludeNoTrackingQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindSplitIncludeNoTrackingQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindSplitIncludeNoTrackingQueryNpgsqlTest : NorthwindSplitIncludeNoTrackingQueryTestBase< NorthwindQueryNpgsqlFixture> diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindSplitIncludeQueryNpgsqleTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindSplitIncludeQueryNpgsqleTest.cs index f74bece6f8..221785b5b7 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindSplitIncludeQueryNpgsqleTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindSplitIncludeQueryNpgsqleTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindSplitIncludeQueryNpgsqlTest : NorthwindSplitIncludeQueryTestBase> { diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindSqlQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindSqlQueryNpgsqlTest.cs index d9f1bdd927..6689159f8d 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindSqlQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindSqlQueryNpgsqlTest.cs @@ -1,6 +1,6 @@ using System.Data.Common; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindSqlQueryNpgsqlTest : NorthwindSqlQueryTestBase> { diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindStringIncludeQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindStringIncludeQueryNpgsqlTest.cs index 70fe3cb7cc..68f49f44e4 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindStringIncludeQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindStringIncludeQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindStringIncludeQueryNpgsqlTest : NorthwindStringIncludeQueryTestBase> diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindWhereQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindWhereQueryNpgsqlTest.cs index f1a26d8519..dfabc66ddd 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NorthwindWhereQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NorthwindWhereQueryNpgsqlTest.cs @@ -1,7 +1,7 @@ using Microsoft.EntityFrameworkCore.TestModels.Northwind; using Npgsql.EntityFrameworkCore.PostgreSQL.Internal; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class NorthwindWhereQueryNpgsqlTest : NorthwindWhereQueryRelationalTestBase> { diff --git a/test/EFCore.PG.FunctionalTests/Query/NullKeysNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NullKeysNpgsqlTest.cs index 5a7e3dadf5..d9bf342ffe 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NullKeysNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NullKeysNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class NullKeysNpgsqlTest(NullKeysNpgsqlTest.NullKeysNpgsqlFixture fixture) : NullKeysTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/Query/NullSemanticsQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NullSemanticsQueryNpgsqlTest.cs index eb0ba354a3..8e88dc16f4 100644 --- a/test/EFCore.PG.FunctionalTests/Query/NullSemanticsQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/NullSemanticsQueryNpgsqlTest.cs @@ -1,9 +1,8 @@ using Microsoft.EntityFrameworkCore.TestModels.NullSemanticsModel; using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal.Mapping; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; // ReSharper disable once UnusedMember.Global public class NullSemanticsQueryNpgsqlTest : NullSemanticsQueryTestBase diff --git a/test/EFCore.PG.FunctionalTests/Query/OperatorsQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/OperatorsQueryNpgsqlTest.cs index 97bdda4124..67797915ca 100644 --- a/test/EFCore.PG.FunctionalTests/Query/OperatorsQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/OperatorsQueryNpgsqlTest.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.Operators; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class OperatorsQueryNpgsqlTest : OperatorsQueryTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/OptionalDependentQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/OptionalDependentQueryNpgsqlTest.cs index eb4db94bb2..fec4dbf935 100644 --- a/test/EFCore.PG.FunctionalTests/Query/OptionalDependentQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/OptionalDependentQueryNpgsqlTest.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.OptionalDependent; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class OptionalDependentQueryNpgsqlTest : OptionalDependentQueryTestBase< OptionalDependentQueryNpgsqlTest.OptionalDependentQueryNpgsqlFixture> diff --git a/test/EFCore.PG.FunctionalTests/Query/OwnedEntityQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/OwnedEntityQueryNpgsqlTest.cs index 8422cae481..d99acaa34d 100644 --- a/test/EFCore.PG.FunctionalTests/Query/OwnedEntityQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/OwnedEntityQueryNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class OwnedEntityQueryNpgsqlTest : OwnedEntityQueryRelationalTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/OwnedQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/OwnedQueryNpgsqlTest.cs index fd15a36212..33349f8237 100644 --- a/test/EFCore.PG.FunctionalTests/Query/OwnedQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/OwnedQueryNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class OwnedQueryNpgsqlTest(OwnedQueryNpgsqlTest.OwnedQueryNpgsqlFixture fixture) : OwnedQueryRelationalTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/Query/PrecompiledQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/PrecompiledQueryNpgsqlTest.cs index f9ac21c3d0..02e901d8b4 100644 --- a/test/EFCore.PG.FunctionalTests/Query/PrecompiledQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/PrecompiledQueryNpgsqlTest.cs @@ -1,7 +1,6 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class PrecompiledQueryNpgsqlTest( PrecompiledQueryNpgsqlTest.PrecompiledQueryNpgsqlFixture fixture, diff --git a/test/EFCore.PG.FunctionalTests/Query/PrecompiledSqlPregenerationQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/PrecompiledSqlPregenerationQueryNpgsqlTest.cs index 21d3a2ac5b..8131fada70 100644 --- a/test/EFCore.PG.FunctionalTests/Query/PrecompiledSqlPregenerationQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/PrecompiledSqlPregenerationQueryNpgsqlTest.cs @@ -1,8 +1,6 @@ -using Microsoft.EntityFrameworkCore.Query.Internal; using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; // ReSharper disable InconsistentNaming diff --git a/test/EFCore.PG.FunctionalTests/Query/PrimitiveCollectionsQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/PrimitiveCollectionsQueryNpgsqlTest.cs index 0d76c0925e..a976e722b8 100644 --- a/test/EFCore.PG.FunctionalTests/Query/PrimitiveCollectionsQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/PrimitiveCollectionsQueryNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class PrimitiveCollectionsQueryNpgsqlTest : PrimitiveCollectionsQueryRelationalTestBase< PrimitiveCollectionsQueryNpgsqlTest.PrimitiveCollectionsQueryNpgsqlFixture> diff --git a/test/EFCore.PG.FunctionalTests/Query/QueryBugTest.cs b/test/EFCore.PG.FunctionalTests/Query/QueryBugTest.cs index 118c30c857..9d5aa20425 100644 --- a/test/EFCore.PG.FunctionalTests/Query/QueryBugTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/QueryBugTest.cs @@ -1,9 +1,8 @@ using System.ComponentModel.DataAnnotations.Schema; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; // ReSharper disable UnusedAutoPropertyAccessor.Local -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; #nullable disable diff --git a/test/EFCore.PG.FunctionalTests/Query/QueryFilterFuncletizationNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/QueryFilterFuncletizationNpgsqlTest.cs index 4c820b3ef3..6f9ee42db0 100644 --- a/test/EFCore.PG.FunctionalTests/Query/QueryFilterFuncletizationNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/QueryFilterFuncletizationNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class QueryFilterFuncletizationNpgsqlTest : QueryFilterFuncletizationTestBase diff --git a/test/EFCore.PG.FunctionalTests/Query/QueryNoClientEvalNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/Query/QueryNoClientEvalNpgsqlFixture.cs index 1e31adfbde..709aac3036 100644 --- a/test/EFCore.PG.FunctionalTests/Query/QueryNoClientEvalNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/Query/QueryNoClientEvalNpgsqlFixture.cs @@ -1,3 +1,3 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class QueryNoClientEvalNpgsqlFixture : NorthwindQueryNpgsqlFixture; diff --git a/test/EFCore.PG.FunctionalTests/Query/QueryNoClientEvalNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/QueryNoClientEvalNpgsqlTest.cs index d33862cdca..de88a58336 100644 --- a/test/EFCore.PG.FunctionalTests/Query/QueryNoClientEvalNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/QueryNoClientEvalNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class QueryNoClientEvalNpgsqlTest(QueryNoClientEvalNpgsqlFixture fixture) : QueryNoClientEvalTestBase(fixture); diff --git a/test/EFCore.PG.FunctionalTests/Query/SharedTypeQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/SharedTypeQueryNpgsqlTest.cs index 91ef5653a9..f77b5c0d1e 100644 --- a/test/EFCore.PG.FunctionalTests/Query/SharedTypeQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/SharedTypeQueryNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class SharedTypeQueryNpgsqlTest : SharedTypeQueryRelationalTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/SpatialQueryNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/Query/SpatialQueryNpgsqlFixture.cs index 05f61b9363..6395b7b506 100644 --- a/test/EFCore.PG.FunctionalTests/Query/SpatialQueryNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/Query/SpatialQueryNpgsqlFixture.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class SpatialQueryNpgsqlFixture : SpatialQueryRelationalFixture { diff --git a/test/EFCore.PG.FunctionalTests/Query/SpatialQueryNpgsqlGeographyTest.cs b/test/EFCore.PG.FunctionalTests/Query/SpatialQueryNpgsqlGeographyTest.cs index db42449b4b..3e3bd42b10 100644 --- a/test/EFCore.PG.FunctionalTests/Query/SpatialQueryNpgsqlGeographyTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/SpatialQueryNpgsqlGeographyTest.cs @@ -2,9 +2,8 @@ using NetTopologySuite; using NetTopologySuite.Geometries; using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; #nullable disable diff --git a/test/EFCore.PG.FunctionalTests/Query/SpatialQueryNpgsqlGeometryTest.cs b/test/EFCore.PG.FunctionalTests/Query/SpatialQueryNpgsqlGeometryTest.cs index 8d3c105579..8f3eb1d612 100644 --- a/test/EFCore.PG.FunctionalTests/Query/SpatialQueryNpgsqlGeometryTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/SpatialQueryNpgsqlGeometryTest.cs @@ -1,9 +1,8 @@ using Microsoft.EntityFrameworkCore.TestModels.SpatialModel; using NetTopologySuite.Geometries; using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; #nullable disable diff --git a/test/EFCore.PG.FunctionalTests/Query/SqlExecutorNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/SqlExecutorNpgsqlTest.cs index d761b5586c..ae750d7819 100644 --- a/test/EFCore.PG.FunctionalTests/Query/SqlExecutorNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/SqlExecutorNpgsqlTest.cs @@ -1,6 +1,6 @@ using System.Data.Common; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class SqlExecutorNpgsqlTest : SqlExecutorTestBase> { diff --git a/test/EFCore.PG.FunctionalTests/Query/SqlQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/SqlQueryNpgsqlTest.cs index 99b7ab1d72..06d397871b 100644 --- a/test/EFCore.PG.FunctionalTests/Query/SqlQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/SqlQueryNpgsqlTest.cs @@ -1,7 +1,7 @@ using System.Data.Common; using Xunit.Sdk; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class SqlQueryNpgsqlTest : SqlQueryTestBase> { diff --git a/test/EFCore.PG.FunctionalTests/Query/TPCFiltersInheritanceQueryNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/Query/TPCFiltersInheritanceQueryNpgsqlFixture.cs index 9d2de93064..8efe70c7d1 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPCFiltersInheritanceQueryNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPCFiltersInheritanceQueryNpgsqlFixture.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class TPCFiltersInheritanceQueryNpgsqlFixture : TPCInheritanceQueryNpgsqlFixture { diff --git a/test/EFCore.PG.FunctionalTests/Query/TPCFiltersInheritanceQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/TPCFiltersInheritanceQueryNpgsqlTest.cs index ac1e24fcb2..26a0f386a0 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPCFiltersInheritanceQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPCFiltersInheritanceQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class TPCFiltersInheritanceQueryNpgsqlTest(TPCFiltersInheritanceQueryNpgsqlFixture fixture) : TPCFiltersInheritanceQueryTestBase(fixture); diff --git a/test/EFCore.PG.FunctionalTests/Query/TPCGearsOfWarQueryNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/Query/TPCGearsOfWarQueryNpgsqlFixture.cs index d59268cc3b..075c16d7e8 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPCGearsOfWarQueryNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPCGearsOfWarQueryNpgsqlFixture.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.GearsOfWarModel; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class TPCGearsOfWarQueryNpgsqlFixture : TPCGearsOfWarQueryRelationalFixture { diff --git a/test/EFCore.PG.FunctionalTests/Query/TPCGearsOfWarQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/TPCGearsOfWarQueryNpgsqlTest.cs index 83eec69897..0ada4522f5 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPCGearsOfWarQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPCGearsOfWarQueryNpgsqlTest.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.GearsOfWarModel; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class TPCGearsOfWarQueryNpgsqlTest : TPCGearsOfWarQueryRelationalTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/TPCInheritanceQueryNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/Query/TPCInheritanceQueryNpgsqlFixture.cs index 69bb5d83ef..32c62cd2d5 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPCInheritanceQueryNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPCInheritanceQueryNpgsqlFixture.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class TPCInheritanceQueryNpgsqlFixture : TPCInheritanceQueryFixture { diff --git a/test/EFCore.PG.FunctionalTests/Query/TPCInheritanceQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/TPCInheritanceQueryNpgsqlTest.cs index 6804a75a84..c947da6058 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPCInheritanceQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPCInheritanceQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class TPCInheritanceQueryNpgsqlTest(TPCInheritanceQueryNpgsqlFixture fixture, ITestOutputHelper testOutputHelper) : TPCInheritanceQueryTestBase(fixture, testOutputHelper) diff --git a/test/EFCore.PG.FunctionalTests/Query/TPCManyToManyNoTrackingQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/TPCManyToManyNoTrackingQueryNpgsqlTest.cs index 43428963a6..f9b4ae230a 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPCManyToManyNoTrackingQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPCManyToManyNoTrackingQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class TPCManyToManyNoTrackingQueryNpgsqlTest : TPCManyToManyNoTrackingQueryRelationalTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/TPCManyToManyQueryNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/Query/TPCManyToManyQueryNpgsqlFixture.cs index d513b416fe..cdccbb8a48 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPCManyToManyQueryNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPCManyToManyQueryNpgsqlFixture.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.ManyToManyModel; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class TPCManyToManyQueryNpgsqlFixture : TPCManyToManyQueryRelationalFixture { diff --git a/test/EFCore.PG.FunctionalTests/Query/TPCManyToManyQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/TPCManyToManyQueryNpgsqlTest.cs index 3e2f83e235..e275cee9f9 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPCManyToManyQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPCManyToManyQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class TPCManyToManyQueryNpgsqlTest : TPCManyToManyQueryRelationalTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/TPCRelationshipsQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/TPCRelationshipsQueryNpgsqlTest.cs index c973937541..c39506cb76 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPCRelationshipsQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPCRelationshipsQueryNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class TPCRelationshipsQueryNpgsqlTest : TPCRelationshipsQueryTestBase diff --git a/test/EFCore.PG.FunctionalTests/Query/TPHFiltersInheritanceQueryNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/Query/TPHFiltersInheritanceQueryNpgsqlFixture.cs index e2aeb78ce1..63e19c296d 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPHFiltersInheritanceQueryNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPHFiltersInheritanceQueryNpgsqlFixture.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class TPHFiltersInheritanceQueryNpgsqlFixture : TPHInheritanceQueryNpgsqlFixture { diff --git a/test/EFCore.PG.FunctionalTests/Query/TPHInheritanceQueryNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/Query/TPHInheritanceQueryNpgsqlFixture.cs index eedc4427ea..8bae413c12 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPHInheritanceQueryNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPHInheritanceQueryNpgsqlFixture.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.InheritanceModel; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class TPHInheritanceQueryNpgsqlFixture : TPHInheritanceQueryFixture { diff --git a/test/EFCore.PG.FunctionalTests/Query/TPHInheritanceQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/TPHInheritanceQueryNpgsqlTest.cs index 1eb0856077..6e49fc9f3d 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPHInheritanceQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPHInheritanceQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class TPHInheritanceQueryNpgsqlTest(TPHInheritanceQueryNpgsqlFixture fixture, ITestOutputHelper testOutputHelper) : TPHInheritanceQueryTestBase(fixture, testOutputHelper); diff --git a/test/EFCore.PG.FunctionalTests/Query/TPTFiltersInheritanceQueryNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/Query/TPTFiltersInheritanceQueryNpgsqlFixture.cs index 603a46f69d..1ce235de0d 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPTFiltersInheritanceQueryNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPTFiltersInheritanceQueryNpgsqlFixture.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class TPTFiltersInheritanceQuerySqlServerFixture : TPTInheritanceQueryNpgsqlFixture { diff --git a/test/EFCore.PG.FunctionalTests/Query/TPTFiltersInheritanceQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/TPTFiltersInheritanceQueryNpgsqlTest.cs index d5c883d16a..cf797747ba 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPTFiltersInheritanceQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPTFiltersInheritanceQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class TPTFiltersInheritanceQuerySqlServerTest : TPTFiltersInheritanceQueryTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/TPTGearsOfWarQueryNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/Query/TPTGearsOfWarQueryNpgsqlFixture.cs index a55022b0a7..40d55c7a7e 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPTGearsOfWarQueryNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPTGearsOfWarQueryNpgsqlFixture.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.GearsOfWarModel; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class TPTGearsOfWarQueryNpgsqlFixture : TPTGearsOfWarQueryRelationalFixture { diff --git a/test/EFCore.PG.FunctionalTests/Query/TPTGearsOfWarQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/TPTGearsOfWarQueryNpgsqlTest.cs index e2512a42c8..ae01851071 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPTGearsOfWarQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPTGearsOfWarQueryNpgsqlTest.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.GearsOfWarModel; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class TPTGearsOfWarQueryNpgsqlTest : TPTGearsOfWarQueryRelationalTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/TPTInheritanceQueryNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/Query/TPTInheritanceQueryNpgsqlFixture.cs index 524d214e8f..a3330b63f3 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPTInheritanceQueryNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPTInheritanceQueryNpgsqlFixture.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class TPTInheritanceQueryNpgsqlFixture : TPTInheritanceQueryFixture { diff --git a/test/EFCore.PG.FunctionalTests/Query/TPTInheritanceQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/TPTInheritanceQueryNpgsqlTest.cs index 8ddc461034..0639ec8967 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPTInheritanceQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPTInheritanceQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class TPTInheritanceQueryNpgsqlTest(TPTInheritanceQueryNpgsqlFixture fixture, ITestOutputHelper testOutputHelper) : TPTInheritanceQueryTestBase(fixture, testOutputHelper); diff --git a/test/EFCore.PG.FunctionalTests/Query/TPTManyToManyNoTrackingQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/TPTManyToManyNoTrackingQueryNpgsqlTest.cs index ed91d2737a..89c59d3e1e 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPTManyToManyNoTrackingQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPTManyToManyNoTrackingQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class TPTManyToManyNoTrackingQueryNpgsqlTest : TPTManyToManyNoTrackingQueryRelationalTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/TPTManyToManyQueryNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/Query/TPTManyToManyQueryNpgsqlFixture.cs index a53db57d52..686f9efc0a 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPTManyToManyQueryNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPTManyToManyQueryNpgsqlFixture.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.ManyToManyModel; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class TPTManyToManyQueryNpgsqlFixture : TPTManyToManyQueryRelationalFixture { diff --git a/test/EFCore.PG.FunctionalTests/Query/TPTManyToManyQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/TPTManyToManyQueryNpgsqlTest.cs index 76df3404ee..e11210b0b7 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPTManyToManyQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPTManyToManyQueryNpgsqlTest.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class TPTManyToManyQueryNpgsqlTest : TPTManyToManyQueryRelationalTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/TPTRelationshipsQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/TPTRelationshipsQueryNpgsqlTest.cs index e5e065ede4..c656932398 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPTRelationshipsQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPTRelationshipsQueryNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class TPTRelationshipsQueryNpgsqlTest : TPTRelationshipsQueryTestBase diff --git a/test/EFCore.PG.FunctionalTests/Query/ToSqlQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/ToSqlQueryNpgsqlTest.cs index 74d1043ebc..5caf912d05 100644 --- a/test/EFCore.PG.FunctionalTests/Query/ToSqlQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/ToSqlQueryNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class ToSqlQuerySqlServerTest : ToSqlQueryTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Query/Translations/BasicTypesQueryNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/Query/Translations/BasicTypesQueryNpgsqlFixture.cs index ae2b49f1ed..e3c5dcccfd 100644 --- a/test/EFCore.PG.FunctionalTests/Query/Translations/BasicTypesQueryNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/Query/Translations/BasicTypesQueryNpgsqlFixture.cs @@ -1,6 +1,5 @@ using Microsoft.EntityFrameworkCore.TestModels.BasicTypesModel; using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; namespace Microsoft.EntityFrameworkCore.Query.Translations; diff --git a/test/EFCore.PG.FunctionalTests/Query/Translations/BigIntegerTranslationsTest.cs b/test/EFCore.PG.FunctionalTests/Query/Translations/BigIntegerTranslationsTest.cs index 820436f631..23f3f8aaf0 100644 --- a/test/EFCore.PG.FunctionalTests/Query/Translations/BigIntegerTranslationsTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/Translations/BigIntegerTranslationsTest.cs @@ -1,5 +1,4 @@ using System.Numerics; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; namespace Microsoft.EntityFrameworkCore.Query.Translations; diff --git a/test/EFCore.PG.FunctionalTests/Query/Translations/CitextTranslationsTest.cs b/test/EFCore.PG.FunctionalTests/Query/Translations/CitextTranslationsTest.cs index a8d515923d..06673f0109 100644 --- a/test/EFCore.PG.FunctionalTests/Query/Translations/CitextTranslationsTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/Translations/CitextTranslationsTest.cs @@ -1,5 +1,4 @@ using System.ComponentModel.DataAnnotations.Schema; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; namespace Microsoft.EntityFrameworkCore.Query.Translations; diff --git a/test/EFCore.PG.FunctionalTests/Query/Translations/EnumTranslationsTest.cs b/test/EFCore.PG.FunctionalTests/Query/Translations/EnumTranslationsTest.cs index 9df8543893..bec6dfe485 100644 --- a/test/EFCore.PG.FunctionalTests/Query/Translations/EnumTranslationsTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/Translations/EnumTranslationsTest.cs @@ -1,5 +1,4 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; namespace Microsoft.EntityFrameworkCore.Query.Translations; diff --git a/test/EFCore.PG.FunctionalTests/Query/Translations/LTreeTranslationsTest.cs b/test/EFCore.PG.FunctionalTests/Query/Translations/LTreeTranslationsTest.cs index 6645ef7684..15060a5b55 100644 --- a/test/EFCore.PG.FunctionalTests/Query/Translations/LTreeTranslationsTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/Translations/LTreeTranslationsTest.cs @@ -1,6 +1,5 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; namespace Microsoft.EntityFrameworkCore.Query.Translations; diff --git a/test/EFCore.PG.FunctionalTests/Query/Translations/MiscellaneousTranslationsNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/Translations/MiscellaneousTranslationsNpgsqlTest.cs index c67594a823..4c184750c4 100644 --- a/test/EFCore.PG.FunctionalTests/Query/Translations/MiscellaneousTranslationsNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/Translations/MiscellaneousTranslationsNpgsqlTest.cs @@ -1,5 +1,4 @@ using Microsoft.EntityFrameworkCore.TestModels.BasicTypesModel; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; namespace Microsoft.EntityFrameworkCore.Query.Translations; diff --git a/test/EFCore.PG.FunctionalTests/Query/Translations/MultirangeTranslationsTest.cs b/test/EFCore.PG.FunctionalTests/Query/Translations/MultirangeTranslationsTest.cs index 33ed28771b..e1621c8a95 100644 --- a/test/EFCore.PG.FunctionalTests/Query/Translations/MultirangeTranslationsTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/Translations/MultirangeTranslationsTest.cs @@ -1,5 +1,4 @@ using System.ComponentModel.DataAnnotations.Schema; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; namespace Microsoft.EntityFrameworkCore.Query.Translations; diff --git a/test/EFCore.PG.FunctionalTests/Query/Translations/NetworkTranslationsNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/Translations/NetworkTranslationsNpgsqlTest.cs index 214c8fa13b..8379693afc 100644 --- a/test/EFCore.PG.FunctionalTests/Query/Translations/NetworkTranslationsNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/Translations/NetworkTranslationsNpgsqlTest.cs @@ -2,7 +2,6 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Net; using System.Net.NetworkInformation; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; // ReSharper disable ConvertToConstant.Local diff --git a/test/EFCore.PG.FunctionalTests/Query/Translations/NodaTime/DateIntervalTranslationsTest.cs b/test/EFCore.PG.FunctionalTests/Query/Translations/NodaTime/DateIntervalTranslationsTest.cs index a7cbeed204..35fc4cf586 100644 --- a/test/EFCore.PG.FunctionalTests/Query/Translations/NodaTime/DateIntervalTranslationsTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/Translations/NodaTime/DateIntervalTranslationsTest.cs @@ -1,6 +1,5 @@ using Microsoft.EntityFrameworkCore.TestModels.NodaTime; using NodaTime; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; namespace Microsoft.EntityFrameworkCore.Query.Translations.NodaTime; diff --git a/test/EFCore.PG.FunctionalTests/Query/Translations/NodaTime/IntervalTranslationsTest.cs b/test/EFCore.PG.FunctionalTests/Query/Translations/NodaTime/IntervalTranslationsTest.cs index e794a036df..5a897eb5af 100644 --- a/test/EFCore.PG.FunctionalTests/Query/Translations/NodaTime/IntervalTranslationsTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/Translations/NodaTime/IntervalTranslationsTest.cs @@ -1,6 +1,5 @@ using Microsoft.EntityFrameworkCore.TestModels.NodaTime; using NodaTime; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; namespace Microsoft.EntityFrameworkCore.Query.Translations.NodaTime; diff --git a/test/EFCore.PG.FunctionalTests/Query/Translations/NodaTime/NodaTimeQueryNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/Query/Translations/NodaTime/NodaTimeQueryNpgsqlFixture.cs index 5930b34e49..2903114543 100644 --- a/test/EFCore.PG.FunctionalTests/Query/Translations/NodaTime/NodaTimeQueryNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/Query/Translations/NodaTime/NodaTimeQueryNpgsqlFixture.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.NodaTime; using NodaTime; using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; namespace Microsoft.EntityFrameworkCore.Query.Translations.NodaTime; diff --git a/test/EFCore.PG.FunctionalTests/Query/Translations/RangeTranslationsTest.cs b/test/EFCore.PG.FunctionalTests/Query/Translations/RangeTranslationsTest.cs index e50c963e44..9c5d53b176 100644 --- a/test/EFCore.PG.FunctionalTests/Query/Translations/RangeTranslationsTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/Translations/RangeTranslationsTest.cs @@ -1,6 +1,5 @@ using System.ComponentModel.DataAnnotations.Schema; using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; // ReSharper disable InconsistentNaming diff --git a/test/EFCore.PG.FunctionalTests/Query/Translations/TimestampTranslationsTest.cs b/test/EFCore.PG.FunctionalTests/Query/Translations/TimestampTranslationsTest.cs index bd62f8ec68..e67bf09db2 100644 --- a/test/EFCore.PG.FunctionalTests/Query/Translations/TimestampTranslationsTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/Translations/TimestampTranslationsTest.cs @@ -1,5 +1,4 @@ using System.ComponentModel.DataAnnotations.Schema; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; // The EF Core specification test suite has: // diff --git a/test/EFCore.PG.FunctionalTests/Query/Translations/TrigramsTranslationsTest.cs b/test/EFCore.PG.FunctionalTests/Query/Translations/TrigramsTranslationsTest.cs index ff527c2655..3be6eed489 100644 --- a/test/EFCore.PG.FunctionalTests/Query/Translations/TrigramsTranslationsTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/Translations/TrigramsTranslationsTest.cs @@ -1,5 +1,4 @@ using System.ComponentModel.DataAnnotations; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; namespace Microsoft.EntityFrameworkCore.Query.Translations; diff --git a/test/EFCore.PG.FunctionalTests/Query/UdfDbFunctionNpgsqlTests.cs b/test/EFCore.PG.FunctionalTests/Query/UdfDbFunctionNpgsqlTests.cs index 38f70731eb..334ec25b9c 100644 --- a/test/EFCore.PG.FunctionalTests/Query/UdfDbFunctionNpgsqlTests.cs +++ b/test/EFCore.PG.FunctionalTests/Query/UdfDbFunctionNpgsqlTests.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; #nullable disable diff --git a/test/EFCore.PG.FunctionalTests/Query/WarningsNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/WarningsNpgsqlTest.cs index 2e10b22e05..1956bf82e1 100644 --- a/test/EFCore.PG.FunctionalTests/Query/WarningsNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/WarningsNpgsqlTest.cs @@ -1,3 +1,3 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query; +namespace Microsoft.EntityFrameworkCore.Query; public class WarningsNpgsqlTest(QueryNoClientEvalNpgsqlFixture fixture) : WarningsTestBase(fixture); diff --git a/test/EFCore.PG.FunctionalTests/QueryExpressionInterceptionNpgsqlTestBase.cs b/test/EFCore.PG.FunctionalTests/QueryExpressionInterceptionNpgsqlTestBase.cs index 8ce7a886dd..db4f15a9ec 100644 --- a/test/EFCore.PG.FunctionalTests/QueryExpressionInterceptionNpgsqlTestBase.cs +++ b/test/EFCore.PG.FunctionalTests/QueryExpressionInterceptionNpgsqlTestBase.cs @@ -1,8 +1,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public abstract class QueryExpressionInterceptionNpgsqlTestBase( QueryExpressionInterceptionNpgsqlTestBase.InterceptionNpgsqlFixtureBase fixture) diff --git a/test/EFCore.PG.FunctionalTests/SaveChangesInterceptionNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/SaveChangesInterceptionNpgsqlTest.cs index c62c896b95..4c3830766a 100644 --- a/test/EFCore.PG.FunctionalTests/SaveChangesInterceptionNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/SaveChangesInterceptionNpgsqlTest.cs @@ -1,8 +1,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public abstract class SaveChangesInterceptionNpgsqlTestBase(SaveChangesInterceptionNpgsqlTestBase.InterceptionNpgsqlFixtureBase fixture) : SaveChangesInterceptionTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/Scaffolding/NpgsqlDatabaseModelFactoryTest.cs b/test/EFCore.PG.FunctionalTests/Scaffolding/NpgsqlDatabaseModelFactoryTest.cs index 79b6062cfe..7d55c9a89f 100644 --- a/test/EFCore.PG.FunctionalTests/Scaffolding/NpgsqlDatabaseModelFactoryTest.cs +++ b/test/EFCore.PG.FunctionalTests/Scaffolding/NpgsqlDatabaseModelFactoryTest.cs @@ -6,11 +6,10 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata.Internal; using Npgsql.EntityFrameworkCore.PostgreSQL.Scaffolding.Internal; using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; // ReSharper disable InconsistentNaming // ReSharper disable StringLiteralTypo -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Scaffolding; +namespace Microsoft.EntityFrameworkCore.Scaffolding; public class NpgsqlDatabaseModelFactoryTest : IClassFixture { diff --git a/test/EFCore.PG.FunctionalTests/SeedingNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/SeedingNpgsqlTest.cs index 90df831ea2..9a8d29e32e 100644 --- a/test/EFCore.PG.FunctionalTests/SeedingNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/SeedingNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class SeedingNpgsqlTest : SeedingTestBase { diff --git a/test/EFCore.PG.FunctionalTests/SequenceEndToEndTest.cs b/test/EFCore.PG.FunctionalTests/SequenceEndToEndTest.cs index bc6147a55e..7fea096121 100644 --- a/test/EFCore.PG.FunctionalTests/SequenceEndToEndTest.cs +++ b/test/EFCore.PG.FunctionalTests/SequenceEndToEndTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; #nullable disable diff --git a/test/EFCore.PG.FunctionalTests/SerializationNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/SerializationNpgsqlTest.cs index c0f16c72e2..ce9a2d6751 100644 --- a/test/EFCore.PG.FunctionalTests/SerializationNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/SerializationNpgsqlTest.cs @@ -1,3 +1,3 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class SerializationNpgsqlTest(F1BytesNpgsqlFixture fixture) : SerializationTestBase(fixture); diff --git a/test/EFCore.PG.FunctionalTests/SpatialNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/SpatialNpgsqlFixture.cs index 71a311908b..8b255aa533 100644 --- a/test/EFCore.PG.FunctionalTests/SpatialNpgsqlFixture.cs +++ b/test/EFCore.PG.FunctionalTests/SpatialNpgsqlFixture.cs @@ -1,7 +1,6 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class SpatialNpgsqlFixture : SpatialFixtureBase { diff --git a/test/EFCore.PG.FunctionalTests/SpatialNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/SpatialNpgsqlTest.cs index dc949e01d2..aabac3ab23 100644 --- a/test/EFCore.PG.FunctionalTests/SpatialNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/SpatialNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; [RequiresPostgis] public class SpatialNpgsqlTest(SpatialNpgsqlFixture fixture) : SpatialTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/StoreGeneratedFixupNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/StoreGeneratedFixupNpgsqlTest.cs index c290140b11..51391ef591 100644 --- a/test/EFCore.PG.FunctionalTests/StoreGeneratedFixupNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/StoreGeneratedFixupNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class StoreGeneratedFixupNpgsqlTest(StoreGeneratedFixupNpgsqlTest.StoreGeneratedFixupNpgsqlFixture fixture) : StoreGeneratedFixupRelationalTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/StoreGeneratedNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/StoreGeneratedNpgsqlTest.cs index bef3d8b235..d927da61fc 100644 --- a/test/EFCore.PG.FunctionalTests/StoreGeneratedNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/StoreGeneratedNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class StoreGeneratedNpgsqlTest(StoreGeneratedNpgsqlTest.StoreGeneratedNpgsqlFixture fixture) : StoreGeneratedTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/SystemColumnTest.cs b/test/EFCore.PG.FunctionalTests/SystemColumnTest.cs index d8e949688d..7165775eca 100644 --- a/test/EFCore.PG.FunctionalTests/SystemColumnTest.cs +++ b/test/EFCore.PG.FunctionalTests/SystemColumnTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class SystemColumnTest : IClassFixture { diff --git a/test/EFCore.PG.FunctionalTests/TPTTableSplittingNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/TPTTableSplittingNpgsqlTest.cs index c89e21ae63..8276866fd4 100644 --- a/test/EFCore.PG.FunctionalTests/TPTTableSplittingNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/TPTTableSplittingNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class TPTTableSplittingNpgsqlTest(ITestOutputHelper testOutputHelper) : TPTTableSplittingTestBase(testOutputHelper) { diff --git a/test/EFCore.PG.FunctionalTests/TableSplittingNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/TableSplittingNpgsqlTest.cs index d477767663..ba9f25e1a1 100644 --- a/test/EFCore.PG.FunctionalTests/TableSplittingNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/TableSplittingNpgsqlTest.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.TransportationModel; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; [MinimumPostgresVersion(12, 0)] // Test suite uses computed columns public class TableSplittingNpgsqlTest(ITestOutputHelper testOutputHelper) : TableSplittingTestBase(testOutputHelper) diff --git a/test/EFCore.PG.FunctionalTests/TestModels/Array/ArrayContainerEntity.cs b/test/EFCore.PG.FunctionalTests/TestModels/Array/ArrayContainerEntity.cs index 7d65701f1a..34bd83b2d5 100644 --- a/test/EFCore.PG.FunctionalTests/TestModels/Array/ArrayContainerEntity.cs +++ b/test/EFCore.PG.FunctionalTests/TestModels/Array/ArrayContainerEntity.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.TestModels.Array; +namespace Microsoft.EntityFrameworkCore.TestModels.Array; public class ArrayContainerEntity { diff --git a/test/EFCore.PG.FunctionalTests/TestModels/Array/ArrayEntity.cs b/test/EFCore.PG.FunctionalTests/TestModels/Array/ArrayEntity.cs index 1a79914d8b..1121dd949e 100644 --- a/test/EFCore.PG.FunctionalTests/TestModels/Array/ArrayEntity.cs +++ b/test/EFCore.PG.FunctionalTests/TestModels/Array/ArrayEntity.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.TestModels.Array; +namespace Microsoft.EntityFrameworkCore.TestModels.Array; public class ArrayEntity { diff --git a/test/EFCore.PG.FunctionalTests/TestModels/Array/ArrayQueryContext.cs b/test/EFCore.PG.FunctionalTests/TestModels/Array/ArrayQueryContext.cs index 68b02923da..7d318208a2 100644 --- a/test/EFCore.PG.FunctionalTests/TestModels/Array/ArrayQueryContext.cs +++ b/test/EFCore.PG.FunctionalTests/TestModels/Array/ArrayQueryContext.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.TestModels.Array; +namespace Microsoft.EntityFrameworkCore.TestModels.Array; public class ArrayQueryContext(DbContextOptions options) : PoolableDbContext(options) { diff --git a/test/EFCore.PG.FunctionalTests/TestModels/Array/ArrayQueryData.cs b/test/EFCore.PG.FunctionalTests/TestModels/Array/ArrayQueryData.cs index 32e5a6c3a1..4f590000ed 100644 --- a/test/EFCore.PG.FunctionalTests/TestModels/Array/ArrayQueryData.cs +++ b/test/EFCore.PG.FunctionalTests/TestModels/Array/ArrayQueryData.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.TestModels.Array; +namespace Microsoft.EntityFrameworkCore.TestModels.Array; public class ArrayQueryData : ISetSource { diff --git a/test/EFCore.PG.FunctionalTests/TestModels/Array/SomeEnum.cs b/test/EFCore.PG.FunctionalTests/TestModels/Array/SomeEnum.cs index b08de2eb8f..787409364d 100644 --- a/test/EFCore.PG.FunctionalTests/TestModels/Array/SomeEnum.cs +++ b/test/EFCore.PG.FunctionalTests/TestModels/Array/SomeEnum.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.TestModels.Array; +namespace Microsoft.EntityFrameworkCore.TestModels.Array; public enum SomeEnum { diff --git a/test/EFCore.PG.FunctionalTests/TestModels/Northwind/NorthwindNpgsqlContext.cs b/test/EFCore.PG.FunctionalTests/TestModels/Northwind/NorthwindNpgsqlContext.cs index fd80fe1078..fa5de8a1e0 100644 --- a/test/EFCore.PG.FunctionalTests/TestModels/Northwind/NorthwindNpgsqlContext.cs +++ b/test/EFCore.PG.FunctionalTests/TestModels/Northwind/NorthwindNpgsqlContext.cs @@ -1,6 +1,4 @@ -using Microsoft.EntityFrameworkCore.TestModels.Northwind; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.TestModels.Northwind; +namespace Microsoft.EntityFrameworkCore.TestModels.Northwind; public class NorthwindNpgsqlContext(DbContextOptions options) : NorthwindRelationalContext(options) { diff --git a/test/EFCore.PG.FunctionalTests/TestUtilities/CollectionExtensions.cs b/test/EFCore.PG.FunctionalTests/TestUtilities/CollectionExtensions.cs index 36854a0b21..deaa4814ad 100644 --- a/test/EFCore.PG.FunctionalTests/TestUtilities/CollectionExtensions.cs +++ b/test/EFCore.PG.FunctionalTests/TestUtilities/CollectionExtensions.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; +namespace Microsoft.EntityFrameworkCore.TestUtilities; public static class CollectionExtensions { diff --git a/test/EFCore.PG.FunctionalTests/TestUtilities/MinimumPostgresVersionAttribute.cs b/test/EFCore.PG.FunctionalTests/TestUtilities/MinimumPostgresVersionAttribute.cs index 86e224e7da..134331d743 100644 --- a/test/EFCore.PG.FunctionalTests/TestUtilities/MinimumPostgresVersionAttribute.cs +++ b/test/EFCore.PG.FunctionalTests/TestUtilities/MinimumPostgresVersionAttribute.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; +namespace Microsoft.EntityFrameworkCore.TestUtilities; [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class)] public sealed class MinimumPostgresVersionAttribute(int major, int minor) : Attribute, ITestCondition diff --git a/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlDatabaseCleaner.cs b/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlDatabaseCleaner.cs index 5698435e0b..73f624818e 100644 --- a/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlDatabaseCleaner.cs +++ b/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlDatabaseCleaner.cs @@ -5,7 +5,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Scaffolding.Internal; using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; +namespace Microsoft.EntityFrameworkCore.TestUtilities; public class NpgsqlDatabaseCleaner : RelationalDatabaseCleaner { diff --git a/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlDatabaseFacadeExtensions.cs b/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlDatabaseFacadeExtensions.cs index bc25dfb3c8..838c27ab42 100644 --- a/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlDatabaseFacadeExtensions.cs +++ b/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlDatabaseFacadeExtensions.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; +namespace Microsoft.EntityFrameworkCore.TestUtilities; public static class NpgsqlDatabaseFacadeExtensions { diff --git a/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlDbContextOptionsBuilderExtensions.cs b/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlDbContextOptionsBuilderExtensions.cs index 1483b35cda..107d33c8c8 100644 --- a/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlDbContextOptionsBuilderExtensions.cs +++ b/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlDbContextOptionsBuilderExtensions.cs @@ -1,6 +1,6 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; +namespace Microsoft.EntityFrameworkCore.TestUtilities; public static class NpgsqlDbContextOptionsBuilderExtensions { diff --git a/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlNorthwindTestStoreFactory.cs b/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlNorthwindTestStoreFactory.cs index 8feb4a2b49..f2f2e43bad 100644 --- a/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlNorthwindTestStoreFactory.cs +++ b/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlNorthwindTestStoreFactory.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; +namespace Microsoft.EntityFrameworkCore.TestUtilities; public class NpgsqlNorthwindTestStoreFactory : NpgsqlTestStoreFactory { diff --git a/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlPrecompiledQueryTestHelpers.cs b/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlPrecompiledQueryTestHelpers.cs index 104096b412..f81f948601 100644 --- a/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlPrecompiledQueryTestHelpers.cs +++ b/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlPrecompiledQueryTestHelpers.cs @@ -1,7 +1,7 @@ using Microsoft.CodeAnalysis; using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; +namespace Microsoft.EntityFrameworkCore.TestUtilities; public class NpgsqlPrecompiledQueryTestHelpers : PrecompiledQueryTestHelpers { diff --git a/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlTestHelpers.cs b/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlTestHelpers.cs index 91b902c210..6b2751f733 100644 --- a/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlTestHelpers.cs +++ b/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlTestHelpers.cs @@ -1,6 +1,6 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Diagnostics.Internal; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; +namespace Microsoft.EntityFrameworkCore.TestUtilities; public class NpgsqlTestHelpers : RelationalTestHelpers { diff --git a/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlTestStore.cs b/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlTestStore.cs index 2831aa598c..9bfe6413f9 100644 --- a/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlTestStore.cs +++ b/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlTestStore.cs @@ -3,7 +3,7 @@ using System.Text.RegularExpressions; using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; +namespace Microsoft.EntityFrameworkCore.TestUtilities; public class NpgsqlTestStore : RelationalTestStore { diff --git a/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlTestStoreFactory.cs b/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlTestStoreFactory.cs index 3b3c5667be..59756e26ed 100644 --- a/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlTestStoreFactory.cs +++ b/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlTestStoreFactory.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; +namespace Microsoft.EntityFrameworkCore.TestUtilities; public class NpgsqlTestStoreFactory( string? scriptPath = null, diff --git a/test/EFCore.PG.FunctionalTests/TestUtilities/RequiresPostgisAttribute.cs b/test/EFCore.PG.FunctionalTests/TestUtilities/RequiresPostgisAttribute.cs index 65df7c2043..ca905bf8e9 100644 --- a/test/EFCore.PG.FunctionalTests/TestUtilities/RequiresPostgisAttribute.cs +++ b/test/EFCore.PG.FunctionalTests/TestUtilities/RequiresPostgisAttribute.cs @@ -1,4 +1,4 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; +namespace Microsoft.EntityFrameworkCore.TestUtilities; [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class)] public sealed class RequiresPostgisAttribute : Attribute, ITestCondition diff --git a/test/EFCore.PG.FunctionalTests/TestUtilities/TestEnvironment.cs b/test/EFCore.PG.FunctionalTests/TestUtilities/TestEnvironment.cs index f11ffb5097..3887eb2ecc 100644 --- a/test/EFCore.PG.FunctionalTests/TestUtilities/TestEnvironment.cs +++ b/test/EFCore.PG.FunctionalTests/TestUtilities/TestEnvironment.cs @@ -1,7 +1,7 @@ using System.Globalization; using Microsoft.Extensions.Configuration; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; +namespace Microsoft.EntityFrameworkCore.TestUtilities; public static class TestEnvironment { diff --git a/test/EFCore.PG.FunctionalTests/TestUtilities/TestNpgsqlConnection.cs b/test/EFCore.PG.FunctionalTests/TestUtilities/TestNpgsqlConnection.cs index 737b8bd33d..2d5e364d40 100644 --- a/test/EFCore.PG.FunctionalTests/TestUtilities/TestNpgsqlConnection.cs +++ b/test/EFCore.PG.FunctionalTests/TestUtilities/TestNpgsqlConnection.cs @@ -2,7 +2,7 @@ using System.Data.Common; using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; +namespace Microsoft.EntityFrameworkCore.TestUtilities; public class TestNpgsqlConnection(RelationalConnectionDependencies dependencies, DbDataSource? dataSource = null) : NpgsqlRelationalConnection(dependencies, dataSource) diff --git a/test/EFCore.PG.FunctionalTests/TestUtilities/TestNpgsqlRetryingExecutionStrategy.cs b/test/EFCore.PG.FunctionalTests/TestUtilities/TestNpgsqlRetryingExecutionStrategy.cs index f1448bfd1e..6b572da0ae 100644 --- a/test/EFCore.PG.FunctionalTests/TestUtilities/TestNpgsqlRetryingExecutionStrategy.cs +++ b/test/EFCore.PG.FunctionalTests/TestUtilities/TestNpgsqlRetryingExecutionStrategy.cs @@ -1,4 +1,6 @@ -namespace Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; +using Npgsql.EntityFrameworkCore.PostgreSQL; + +namespace Microsoft.EntityFrameworkCore.TestUtilities; public class TestNpgsqlRetryingExecutionStrategy : NpgsqlRetryingExecutionStrategy { diff --git a/test/EFCore.PG.FunctionalTests/TestUtilities/TestRelationalCommandBuilderFactory.cs b/test/EFCore.PG.FunctionalTests/TestUtilities/TestRelationalCommandBuilderFactory.cs index 16a678ae12..8070dec02c 100644 --- a/test/EFCore.PG.FunctionalTests/TestUtilities/TestRelationalCommandBuilderFactory.cs +++ b/test/EFCore.PG.FunctionalTests/TestUtilities/TestRelationalCommandBuilderFactory.cs @@ -1,6 +1,6 @@ using System.Data.Common; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; +namespace Microsoft.EntityFrameworkCore.TestUtilities; public class TestRelationalCommandBuilderFactory(RelationalCommandBuilderDependencies dependencies) : IRelationalCommandBuilderFactory { diff --git a/test/EFCore.PG.FunctionalTests/TestUtilities/TestRelationalTransaction.cs b/test/EFCore.PG.FunctionalTests/TestUtilities/TestRelationalTransaction.cs index 89cfb1b936..b3d1b74d1c 100644 --- a/test/EFCore.PG.FunctionalTests/TestUtilities/TestRelationalTransaction.cs +++ b/test/EFCore.PG.FunctionalTests/TestUtilities/TestRelationalTransaction.cs @@ -1,6 +1,6 @@ using System.Data.Common; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; +namespace Microsoft.EntityFrameworkCore.TestUtilities; public class TestRelationalTransactionFactory(RelationalTransactionFactoryDependencies dependencies) : IRelationalTransactionFactory { diff --git a/test/EFCore.PG.FunctionalTests/TransactionInterceptionNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/TransactionInterceptionNpgsqlTest.cs index 7fe19ba508..0c69583c96 100644 --- a/test/EFCore.PG.FunctionalTests/TransactionInterceptionNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/TransactionInterceptionNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public abstract class TransactionInterceptionNpgsqlTestBase(TransactionInterceptionNpgsqlTestBase.InterceptionNpgsqlFixtureBase fixture) : TransactionInterceptionTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/TransactionNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/TransactionNpgsqlTest.cs index 0eb3c9bc3b..5fd149f03b 100644 --- a/test/EFCore.PG.FunctionalTests/TransactionNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/TransactionNpgsqlTest.cs @@ -1,8 +1,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure; using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class TransactionNpgsqlTest(TransactionNpgsqlTest.TransactionNpgsqlFixture fixture) : TransactionTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/TwoDatabasesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/TwoDatabasesNpgsqlTest.cs index 8e6f774174..3146478e62 100644 --- a/test/EFCore.PG.FunctionalTests/TwoDatabasesNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/TwoDatabasesNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class TwoDatabasesNpgsqlTest(NpgsqlFixture fixture) : TwoDatabasesTestBase(fixture), IClassFixture { diff --git a/test/EFCore.PG.FunctionalTests/Update/JsonUpdateNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Update/JsonUpdateNpgsqlTest.cs index e3c8a983ad..e2fbb95be0 100644 --- a/test/EFCore.PG.FunctionalTests/Update/JsonUpdateNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Update/JsonUpdateNpgsqlTest.cs @@ -1,8 +1,7 @@ using Microsoft.EntityFrameworkCore.TestModels.JsonQuery; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; using Xunit.Sdk; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Update; +namespace Microsoft.EntityFrameworkCore.Update; public class JsonUpdateNpgsqlTest : JsonUpdateTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Update/NonSharedModelUpdatesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Update/NonSharedModelUpdatesNpgsqlTest.cs index c027572491..3aae00faff 100644 --- a/test/EFCore.PG.FunctionalTests/Update/NonSharedModelUpdatesNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Update/NonSharedModelUpdatesNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Update; +namespace Microsoft.EntityFrameworkCore.Update; public class NonSharedModelUpdatesNpgsqlTest : NonSharedModelUpdatesTestBase { diff --git a/test/EFCore.PG.FunctionalTests/Update/StoreValueGenerationNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Update/StoreValueGenerationNpgsqlTest.cs index 041b72d953..5c6d43fc87 100644 --- a/test/EFCore.PG.FunctionalTests/Update/StoreValueGenerationNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Update/StoreValueGenerationNpgsqlTest.cs @@ -1,8 +1,7 @@ using System.Text; using Microsoft.EntityFrameworkCore.TestModels.StoreValueGenerationModel; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Update; +namespace Microsoft.EntityFrameworkCore.Update; public class StoreValueGenerationNpgsqlTest : StoreValueGenerationTestBase< StoreValueGenerationNpgsqlTest.StoreValueGenerationNpgsqlFixture> diff --git a/test/EFCore.PG.FunctionalTests/Update/StoredProcedureUpdateNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Update/StoredProcedureUpdateNpgsqlTest.cs index 4785309a40..f17781363a 100644 --- a/test/EFCore.PG.FunctionalTests/Update/StoredProcedureUpdateNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Update/StoredProcedureUpdateNpgsqlTest.cs @@ -1,7 +1,6 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Internal; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.Update; +namespace Microsoft.EntityFrameworkCore.Update; [MinimumPostgresVersion(14, 0)] public class StoredProcedureUpdateNpgsqlTest : StoredProcedureUpdateTestBase diff --git a/test/EFCore.PG.FunctionalTests/UpdatesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/UpdatesNpgsqlTest.cs index e49c762526..87e2bc634e 100644 --- a/test/EFCore.PG.FunctionalTests/UpdatesNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/UpdatesNpgsqlTest.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore.TestModels.UpdatesModel; -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class UpdatesNpgsqlTest : UpdatesRelationalTestBase { diff --git a/test/EFCore.PG.FunctionalTests/ValueConvertersEndToEndNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/ValueConvertersEndToEndNpgsqlTest.cs index 89de834605..7fa28f4e15 100644 --- a/test/EFCore.PG.FunctionalTests/ValueConvertersEndToEndNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/ValueConvertersEndToEndNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class ValueConvertersEndToEndNpgsqlTest(ValueConvertersEndToEndNpgsqlTest.ValueConvertersEndToEndNpgsqlFixture fixture) : ValueConvertersEndToEndTestBase(fixture) diff --git a/test/EFCore.PG.FunctionalTests/WithConstructorsNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/WithConstructorsNpgsqlTest.cs index 14ce4b0b46..5c0a677971 100644 --- a/test/EFCore.PG.FunctionalTests/WithConstructorsNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/WithConstructorsNpgsqlTest.cs @@ -1,6 +1,4 @@ -using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; - -namespace Npgsql.EntityFrameworkCore.PostgreSQL; +namespace Microsoft.EntityFrameworkCore; public class WithConstructorsNpgsqlTest(WithConstructorsNpgsqlTest.WithConstructorsNpgsqlFixture fixture) : WithConstructorsTestBase(fixture)