diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsCollectionCosmosTest.cs similarity index 98% rename from test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionCosmosTest.cs rename to test/EFCore.Cosmos.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsCollectionCosmosTest.cs index 1c9556fda96..d7b0662edfc 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsCollectionCosmosTest.cs @@ -3,7 +3,7 @@ using Microsoft.Azure.Cosmos; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public class OwnedNavigationsCollectionCosmosTest : OwnedNavigationsCollectionTestBase { diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCosmosFixture.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsCosmosFixture.cs similarity index 98% rename from test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCosmosFixture.cs rename to test/EFCore.Cosmos.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsCosmosFixture.cs index ffc9a3a4e31..a6a028e11f3 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCosmosFixture.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsCosmosFixture.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public class OwnedNavigationsCosmosFixture : OwnedNavigationsFixtureBase { diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsMiscellaneousCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsMiscellaneousCosmosTest.cs similarity index 95% rename from test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsMiscellaneousCosmosTest.cs rename to test/EFCore.Cosmos.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsMiscellaneousCosmosTest.cs index 00135662873..858bdaa2b1d 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsMiscellaneousCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsMiscellaneousCosmosTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public class OwnedNavigationsMiscellaneousCosmosTest : OwnedNavigationsMiscellaneousTestBase { diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsProjectionCosmosTest.cs similarity index 99% rename from test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionCosmosTest.cs rename to test/EFCore.Cosmos.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsProjectionCosmosTest.cs index aab7474a7cb..6e2fe7bf4ba 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsProjectionCosmosTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public class OwnedNavigationsProjectionCosmosTest : OwnedNavigationsProjectionTestBase { diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsSetOperationsCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsSetOperationsCosmosTest.cs similarity index 96% rename from test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsSetOperationsCosmosTest.cs rename to test/EFCore.Cosmos.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsSetOperationsCosmosTest.cs index 2be59529264..9ee07a8d188 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsSetOperationsCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsSetOperationsCosmosTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public class OwnedNavigationsSetOperationsCosmosTest : OwnedNavigationsSetOperationsTestBase { diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualityCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsStructuralEqualityCosmosTest.cs similarity index 97% rename from test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualityCosmosTest.cs rename to test/EFCore.Cosmos.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsStructuralEqualityCosmosTest.cs index 0a13f17a792..af0b40e813d 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualityCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsStructuralEqualityCosmosTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public class OwnedNavigationsStructuralEqualityCosmosTest : OwnedNavigationsStructuralEqualityTestBase { diff --git a/test/EFCore.InMemory.FunctionalTests/InMemoryComplianceTest.cs b/test/EFCore.InMemory.FunctionalTests/InMemoryComplianceTest.cs index 7b9bef673e2..e1ffd3efedc 100644 --- a/test/EFCore.InMemory.FunctionalTests/InMemoryComplianceTest.cs +++ b/test/EFCore.InMemory.FunctionalTests/InMemoryComplianceTest.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.EntityFrameworkCore.BulkUpdates; -using Microsoft.EntityFrameworkCore.Query.Relationships; -using Microsoft.EntityFrameworkCore.Query.Relationships.ComplexProperties; -using Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; -using Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +using Microsoft.EntityFrameworkCore.Query.Associations; +using Microsoft.EntityFrameworkCore.Query.Associations.ComplexProperties; +using Microsoft.EntityFrameworkCore.Query.Associations.Navigations; +using Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; namespace Microsoft.EntityFrameworkCore; @@ -32,11 +32,11 @@ public class InMemoryComplianceTest : ComplianceTestBase typeof(AdHocJsonQueryTestBase), // Relationships tests - not implemented for InMemory - typeof(RelationshipsProjectionTestBase<>), - typeof(RelationshipsCollectionTestBase<>), - typeof(RelationshipsMiscellaneousTestBase<>), - typeof(RelationshipsStructuralEqualityTestBase<>), - typeof(RelationshipsSetOperationsTestBase<>), + typeof(AssociationsProjectionTestBase<>), + typeof(AssociationsCollectionTestBase<>), + typeof(AssociationsMiscellaneousTestBase<>), + typeof(AssociationsStructuralEqualityTestBase<>), + typeof(AssociationsSetOperationsTestBase<>), typeof(NavigationsIncludeTestBase<>), typeof(NavigationsProjectionTestBase<>), typeof(NavigationsCollectionTestBase<>), diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexJson/ComplexJsonCollectionRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexJson/ComplexJsonCollectionRelationalTestBase.cs similarity index 90% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexJson/ComplexJsonCollectionRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexJson/ComplexJsonCollectionRelationalTestBase.cs index 68302aadf2b..613dfd713f9 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexJson/ComplexJsonCollectionRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexJson/ComplexJsonCollectionRelationalTestBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.EntityFrameworkCore.Query.Relationships.ComplexProperties; +using Microsoft.EntityFrameworkCore.Query.Associations.ComplexProperties; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson; public abstract class ComplexJsonCollectionRelationalTestBase : ComplexPropertiesCollectionTestBase where TFixture : ComplexJsonRelationalFixtureBase, new() diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexJson/ComplexJsonMiscellaneousRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexJson/ComplexJsonMiscellaneousRelationalTestBase.cs similarity index 82% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexJson/ComplexJsonMiscellaneousRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexJson/ComplexJsonMiscellaneousRelationalTestBase.cs index 314bd132141..eefbf36c7e0 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexJson/ComplexJsonMiscellaneousRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexJson/ComplexJsonMiscellaneousRelationalTestBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.EntityFrameworkCore.Query.Relationships.ComplexProperties; +using Microsoft.EntityFrameworkCore.Query.Associations.ComplexProperties; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson; public abstract class ComplexJsonMiscellaneousRelationalTestBase : ComplexPropertiesMiscellaneousTestBase where TFixture : ComplexJsonRelationalFixtureBase, new() diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexJson/ComplexJsonProjectionRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexJson/ComplexJsonProjectionRelationalTestBase.cs similarity index 82% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexJson/ComplexJsonProjectionRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexJson/ComplexJsonProjectionRelationalTestBase.cs index e02db1b3b48..10b1ffcc41b 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexJson/ComplexJsonProjectionRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexJson/ComplexJsonProjectionRelationalTestBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.EntityFrameworkCore.Query.Relationships.ComplexProperties; +using Microsoft.EntityFrameworkCore.Query.Associations.ComplexProperties; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson; public abstract class ComplexJsonProjectionRelationalTestBase : ComplexPropertiesProjectionTestBase where TFixture : ComplexJsonRelationalFixtureBase, new() diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexJson/ComplexJsonRelationalFixtureBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexJson/ComplexJsonRelationalFixtureBase.cs similarity index 90% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexJson/ComplexJsonRelationalFixtureBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexJson/ComplexJsonRelationalFixtureBase.cs index e232c354de7..185e58b7ac0 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexJson/ComplexJsonRelationalFixtureBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexJson/ComplexJsonRelationalFixtureBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.EntityFrameworkCore.Query.Relationships.ComplexProperties; +using Microsoft.EntityFrameworkCore.Query.Associations.ComplexProperties; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson; public abstract class ComplexJsonRelationalFixtureBase : ComplexPropertiesFixtureBase, ITestSqlLoggerFactory { diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexJson/ComplexJsonSetOperationsRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexJson/ComplexJsonSetOperationsRelationalTestBase.cs similarity index 93% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexJson/ComplexJsonSetOperationsRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexJson/ComplexJsonSetOperationsRelationalTestBase.cs index 3047257822d..0162ee8a31e 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexJson/ComplexJsonSetOperationsRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexJson/ComplexJsonSetOperationsRelationalTestBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.EntityFrameworkCore.Query.Relationships.ComplexProperties; +using Microsoft.EntityFrameworkCore.Query.Associations.ComplexProperties; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson; public abstract class ComplexJsonSetOperationsRelationalTestBase : ComplexPropertiesSetOperationsTestBase where TFixture : ComplexJsonRelationalFixtureBase, new() diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexJson/ComplexJsonStructuralEqualityRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexJson/ComplexJsonStructuralEqualityRelationalTestBase.cs similarity index 83% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexJson/ComplexJsonStructuralEqualityRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexJson/ComplexJsonStructuralEqualityRelationalTestBase.cs index 3e4e738aead..e1a25584e74 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexJson/ComplexJsonStructuralEqualityRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexJson/ComplexJsonStructuralEqualityRelationalTestBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.EntityFrameworkCore.Query.Relationships.ComplexProperties; +using Microsoft.EntityFrameworkCore.Query.Associations.ComplexProperties; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson; public abstract class ComplexJsonStructuralEqualityRelationalTestBase : ComplexPropertiesStructuralEqualityTestBase where TFixture : ComplexJsonRelationalFixtureBase, new() diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingMiscellaneousRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingMiscellaneousRelationalTestBase.cs similarity index 82% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingMiscellaneousRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingMiscellaneousRelationalTestBase.cs index b781ff85492..385eb0e79e0 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingMiscellaneousRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingMiscellaneousRelationalTestBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.EntityFrameworkCore.Query.Relationships.ComplexProperties; +using Microsoft.EntityFrameworkCore.Query.Associations.ComplexProperties; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexTableSplitting; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexTableSplitting; public abstract class ComplexTableSplittingMiscellaneousRelationalTestBase : ComplexPropertiesMiscellaneousTestBase where TFixture : ComplexTableSplittingRelationalFixtureBase, new() diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingProjectionRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingProjectionRelationalTestBase.cs similarity index 93% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingProjectionRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingProjectionRelationalTestBase.cs index 9fbb436ee7e..086f1699ec5 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingProjectionRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingProjectionRelationalTestBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.EntityFrameworkCore.Query.Relationships.ComplexProperties; +using Microsoft.EntityFrameworkCore.Query.Associations.ComplexProperties; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexTableSplitting; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexTableSplitting; public abstract class ComplexTableSplittingProjectionRelationalTestBase : ComplexPropertiesProjectionTestBase where TFixture : ComplexTableSplittingRelationalFixtureBase, new() diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingRelationalFixtureBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingRelationalFixtureBase.cs similarity index 91% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingRelationalFixtureBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingRelationalFixtureBase.cs index cf20901ebb9..77adcc5b852 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingRelationalFixtureBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingRelationalFixtureBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.EntityFrameworkCore.Query.Relationships.ComplexProperties; +using Microsoft.EntityFrameworkCore.Query.Associations.ComplexProperties; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexTableSplitting; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexTableSplitting; /// /// Base fixture for tests exercising table splitting, where the entity and its contained complex type are mapped to the same @@ -39,7 +39,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con }); } - protected override RelationshipsData CreateData() + protected override AssociationsData CreateData() { var data = base.CreateData(); diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingStructuralEqualityRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingStructuralEqualityRelationalTestBase.cs similarity index 94% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingStructuralEqualityRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingStructuralEqualityRelationalTestBase.cs index 7a3e5b1d8a9..a2d2c2df726 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingStructuralEqualityRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingStructuralEqualityRelationalTestBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.EntityFrameworkCore.Query.Relationships.ComplexProperties; +using Microsoft.EntityFrameworkCore.Query.Associations.ComplexProperties; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexTableSplitting; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexTableSplitting; public abstract class ComplexTableSplittingStructuralEqualityRelationalTestBase : ComplexPropertiesStructuralEqualityTestBase diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsCollectionRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/Navigations/NavigationsCollectionRelationalTestBase.cs similarity index 94% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsCollectionRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/Navigations/NavigationsCollectionRelationalTestBase.cs index 65f381da1e4..e28bb300086 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsCollectionRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/Navigations/NavigationsCollectionRelationalTestBase.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public abstract class NavigationsCollectionRelationalTestBase : NavigationsCollectionTestBase where TFixture : NavigationsRelationalFixtureBase, new() diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsIncludeRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/Navigations/NavigationsIncludeRelationalTestBase.cs similarity index 90% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsIncludeRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/Navigations/NavigationsIncludeRelationalTestBase.cs index 6888eda540d..240fca84e95 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsIncludeRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/Navigations/NavigationsIncludeRelationalTestBase.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public abstract class NavigationsIncludeRelationalTestBase : NavigationsIncludeTestBase where TFixture : NavigationsRelationalFixtureBase, new() diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsMiscellaneousRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/Navigations/NavigationsMiscellaneousRelationalTestBase.cs similarity index 90% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsMiscellaneousRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/Navigations/NavigationsMiscellaneousRelationalTestBase.cs index ad7a8e94672..8e7fef3b2c0 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsMiscellaneousRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/Navigations/NavigationsMiscellaneousRelationalTestBase.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public abstract class NavigationsMiscellaneousRelationalTestBase : NavigationsMiscellaneousTestBase where TFixture : NavigationsRelationalFixtureBase, new() diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsProjectionRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/Navigations/NavigationsProjectionRelationalTestBase.cs similarity index 95% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsProjectionRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/Navigations/NavigationsProjectionRelationalTestBase.cs index 8af5b15ab64..932322f5677 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsProjectionRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/Navigations/NavigationsProjectionRelationalTestBase.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public abstract class NavigationsProjectionRelationalTestBase : NavigationsProjectionTestBase diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsRelationalFixtureBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/Navigations/NavigationsRelationalFixtureBase.cs similarity index 93% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsRelationalFixtureBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/Navigations/NavigationsRelationalFixtureBase.cs index 4a7febaffd9..a734d9b24f3 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsRelationalFixtureBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/Navigations/NavigationsRelationalFixtureBase.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public abstract class NavigationsRelationalFixtureBase : NavigationsFixtureBase, ITestSqlLoggerFactory { diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsSetOperationsRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/Navigations/NavigationsSetOperationsRelationalTestBase.cs similarity index 93% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsSetOperationsRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/Navigations/NavigationsSetOperationsRelationalTestBase.cs index e5b66e80f0e..1effeb17bdd 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsSetOperationsRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/Navigations/NavigationsSetOperationsRelationalTestBase.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public abstract class NavigationsSetOperationsRelationalTestBase : NavigationsSetOperationsTestBase where TFixture : NavigationsRelationalFixtureBase, new() diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsStructuralEqualityRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/Navigations/NavigationsStructuralEqualityRelationalTestBase.cs similarity index 95% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsStructuralEqualityRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/Navigations/NavigationsStructuralEqualityRelationalTestBase.cs index bddd7317696..ec14cb75448 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/Navigations/NavigationsStructuralEqualityRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/Navigations/NavigationsStructuralEqualityRelationalTestBase.cs @@ -3,7 +3,7 @@ using Xunit.Sdk; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public abstract class NavigationsStructuralEqualityRelationalTestBase : NavigationsStructuralEqualityTestBase where TFixture : NavigationsRelationalFixtureBase, new() diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedJson/OwnedJsonCollectionRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedJson/OwnedJsonCollectionRelationalTestBase.cs similarity index 90% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedJson/OwnedJsonCollectionRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedJson/OwnedJsonCollectionRelationalTestBase.cs index 1713d60664a..16c868e3f94 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedJson/OwnedJsonCollectionRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedJson/OwnedJsonCollectionRelationalTestBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +using Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson; public abstract class OwnedJsonCollectionRelationalTestBase : OwnedNavigationsCollectionTestBase where TFixture : OwnedJsonRelationalFixtureBase, new() diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedJson/OwnedJsonMiscellaneousRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedJson/OwnedJsonMiscellaneousRelationalTestBase.cs similarity index 83% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedJson/OwnedJsonMiscellaneousRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedJson/OwnedJsonMiscellaneousRelationalTestBase.cs index fa79eba5c16..b63bacab57c 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedJson/OwnedJsonMiscellaneousRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedJson/OwnedJsonMiscellaneousRelationalTestBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +using Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson; public abstract class OwnedJsonMiscellaneousRelationalTestBase : OwnedNavigationsMiscellaneousTestBase where TFixture : OwnedJsonRelationalFixtureBase, new() diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedJson/OwnedJsonProjectionRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedJson/OwnedJsonProjectionRelationalTestBase.cs similarity index 87% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedJson/OwnedJsonProjectionRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedJson/OwnedJsonProjectionRelationalTestBase.cs index 1a5b3d2ebd4..125f0d8688c 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedJson/OwnedJsonProjectionRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedJson/OwnedJsonProjectionRelationalTestBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +using Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson; public abstract class OwnedJsonProjectionRelationalTestBase : OwnedNavigationsProjectionTestBase where TFixture : OwnedJsonRelationalFixtureBase, new() diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedJson/OwnedJsonRelationalFixtureBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedJson/OwnedJsonRelationalFixtureBase.cs similarity index 85% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedJson/OwnedJsonRelationalFixtureBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedJson/OwnedJsonRelationalFixtureBase.cs index 1cafd2e8c8f..b1ef56b6c73 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedJson/OwnedJsonRelationalFixtureBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedJson/OwnedJsonRelationalFixtureBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +using Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson; public abstract class OwnedJsonRelationalFixtureBase : OwnedNavigationsFixtureBase, ITestSqlLoggerFactory { diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedJson/OwnedJsonSetOperationsRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedJson/OwnedJsonSetOperationsRelationalTestBase.cs similarity index 100% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedJson/OwnedJsonSetOperationsRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedJson/OwnedJsonSetOperationsRelationalTestBase.cs diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedJson/OwnedJsonStructuralEqualityRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedJson/OwnedJsonStructuralEqualityRelationalTestBase.cs similarity index 94% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedJson/OwnedJsonStructuralEqualityRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedJson/OwnedJsonStructuralEqualityRelationalTestBase.cs index 82e0e56b0ab..0f464cf7408 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedJson/OwnedJsonStructuralEqualityRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedJson/OwnedJsonStructuralEqualityRelationalTestBase.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +using Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; using Xunit.Sdk; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson; public abstract class OwnedJsonStructuralEqualityRelationalTestBase : OwnedNavigationsStructuralEqualityTestBase where TFixture : OwnedJsonRelationalFixtureBase, new() diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsCollectionRelationalTestBase.cs similarity index 94% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsCollectionRelationalTestBase.cs index 1a5847cb75e..799c2d675d2 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsCollectionRelationalTestBase.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public abstract class OwnedNavigationsCollectionRelationalTestBase : OwnedNavigationsCollectionTestBase where TFixture : OwnedNavigationsRelationalFixtureBase, new() diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsMiscellaneousRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsMiscellaneousRelationalTestBase.cs similarity index 90% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsMiscellaneousRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsMiscellaneousRelationalTestBase.cs index dd1196504cb..0d0961269f6 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsMiscellaneousRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsMiscellaneousRelationalTestBase.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public abstract class OwnedNavigationsMiscellaneousRelationalTestBase : OwnedNavigationsMiscellaneousTestBase where TFixture : OwnedNavigationsRelationalFixtureBase, new() diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsProjectionRelationalTestBase.cs similarity index 96% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsProjectionRelationalTestBase.cs index f4bd83a0c22..fad8c44bf02 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsProjectionRelationalTestBase.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public abstract class OwnedNavigationsProjectionRelationalTestBase : OwnedNavigationsProjectionTestBase diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsRelationalFixtureBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsRelationalFixtureBase.cs similarity index 93% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsRelationalFixtureBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsRelationalFixtureBase.cs index 668e613c7fb..e6b643e1c5c 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsRelationalFixtureBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsRelationalFixtureBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.EntityFrameworkCore.Query.Relationships.OwnedTableSplitting; +using Microsoft.EntityFrameworkCore.Query.Associations.OwnedTableSplitting; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; /// /// Base fixture for tests exercising owned entities mapped to separate tables. diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsSetOperationsRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsSetOperationsRelationalTestBase.cs similarity index 96% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsSetOperationsRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsSetOperationsRelationalTestBase.cs index 3402d7823f1..1975f767c0d 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsSetOperationsRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsSetOperationsRelationalTestBase.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public abstract class OwnedNavigationsSetOperationsRelationalTestBase : OwnedNavigationsSetOperationsTestBase where TFixture : OwnedNavigationsRelationalFixtureBase, new() diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualityRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsStructuralEqualityRelationalTestBase.cs similarity index 96% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualityRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsStructuralEqualityRelationalTestBase.cs index 10429917cf8..1c354d630f3 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualityRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsStructuralEqualityRelationalTestBase.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public abstract class OwnedNavigationsStructuralEqualityRelationalTestBase : OwnedNavigationsStructuralEqualityTestBase where TFixture : OwnedNavigationsRelationalFixtureBase, new() diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingMiscellaneousRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingMiscellaneousRelationalTestBase.cs similarity index 82% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingMiscellaneousRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingMiscellaneousRelationalTestBase.cs index cd3f495e676..c6ef7514ca8 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingMiscellaneousRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingMiscellaneousRelationalTestBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +using Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedTableSplitting; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedTableSplitting; public abstract class OwnedTableSplittingMiscellaneousRelationalTestBase : OwnedNavigationsMiscellaneousTestBase where TFixture : OwnedTableSplittingRelationalFixtureBase, new() diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingProjectionRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingProjectionRelationalTestBase.cs similarity index 92% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingProjectionRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingProjectionRelationalTestBase.cs index 9b96267502a..581dc017cea 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingProjectionRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingProjectionRelationalTestBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +using Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedTableSplitting; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedTableSplitting; public abstract class OwnedTableSplittingProjectionRelationalTestBase : OwnedNavigationsProjectionTestBase diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingRelationalFixtureBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingRelationalFixtureBase.cs similarity index 96% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingRelationalFixtureBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingRelationalFixtureBase.cs index 13a96578954..7b58fb6c87f 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingRelationalFixtureBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingRelationalFixtureBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +using Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedTableSplitting; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedTableSplitting; /// /// Base fixture for tests exercising table splitting via owned entities, where the entity and its owned entity are mapped to the same diff --git a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingStructuralEqualityRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingStructuralEqualityRelationalTestBase.cs similarity index 93% rename from test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingStructuralEqualityRelationalTestBase.cs rename to test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingStructuralEqualityRelationalTestBase.cs index afc8a68e1f8..f3ba3b7ee17 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingStructuralEqualityRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingStructuralEqualityRelationalTestBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +using Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedTableSplitting; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedTableSplitting; public abstract class OwnedTableSplittingStructuralEqualityRelationalTestBase : OwnedNavigationsStructuralEqualityTestBase diff --git a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsCollectionTestBase.cs b/test/EFCore.Specification.Tests/Query/Associations/AssociationsCollectionTestBase.cs similarity index 95% rename from test/EFCore.Specification.Tests/Query/Relationships/RelationshipsCollectionTestBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/AssociationsCollectionTestBase.cs index 98d07881dcf..ea73850e664 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsCollectionTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/AssociationsCollectionTestBase.cs @@ -1,13 +1,13 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships; +namespace Microsoft.EntityFrameworkCore.Query.Associations; /// /// Contains tests for apply LINQ operators to collection relationships. /// -public abstract class RelationshipsCollectionTestBase(TFixture fixture) : QueryTestBase(fixture) - where TFixture : RelationshipsQueryFixtureBase, new() +public abstract class AssociationsCollectionTestBase(TFixture fixture) : QueryTestBase(fixture) + where TFixture : AssociationsQueryFixtureBase, new() { [ConditionalFact, MemberData(nameof(IsAsyncData))] public virtual Task Count() diff --git a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsData.cs b/test/EFCore.Specification.Tests/Query/Associations/AssociationsData.cs similarity index 99% rename from test/EFCore.Specification.Tests/Query/Relationships/RelationshipsData.cs rename to test/EFCore.Specification.Tests/Query/Associations/AssociationsData.cs index aaaed23438a..7d7b612eee0 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsData.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/AssociationsData.cs @@ -1,11 +1,11 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships; +namespace Microsoft.EntityFrameworkCore.Query.Associations; -public class RelationshipsData : ISetSource +public class AssociationsData : ISetSource { - public RelationshipsData() + public AssociationsData() { RootEntities = CreateRootEntities(); RelatedTypes = []; diff --git a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsMiscellaneousTestBase.cs b/test/EFCore.Specification.Tests/Query/Associations/AssociationsMiscellaneousTestBase.cs similarity index 75% rename from test/EFCore.Specification.Tests/Query/Relationships/RelationshipsMiscellaneousTestBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/AssociationsMiscellaneousTestBase.cs index 3f229ba2df8..deaa8845fba 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsMiscellaneousTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/AssociationsMiscellaneousTestBase.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships; +namespace Microsoft.EntityFrameworkCore.Query.Associations; -public abstract class RelationshipsMiscellaneousTestBase(TFixture fixture) : QueryTestBase(fixture) - where TFixture : RelationshipsQueryFixtureBase, new() +public abstract class AssociationsMiscellaneousTestBase(TFixture fixture) : QueryTestBase(fixture) + where TFixture : AssociationsQueryFixtureBase, new() { #region Simple filters diff --git a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsModel.cs b/test/EFCore.Specification.Tests/Query/Associations/AssociationsModel.cs similarity index 98% rename from test/EFCore.Specification.Tests/Query/Relationships/RelationshipsModel.cs rename to test/EFCore.Specification.Tests/Query/Associations/AssociationsModel.cs index 71590d2c333..c7dc6b33444 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsModel.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/AssociationsModel.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; -namespace Microsoft.EntityFrameworkCore.Query.Relationships; +namespace Microsoft.EntityFrameworkCore.Query.Associations; /// /// Main entity type used as the root for most test queries. diff --git a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsModelValueTypes.cs b/test/EFCore.Specification.Tests/Query/Associations/AssociationsModelValueTypes.cs similarity index 98% rename from test/EFCore.Specification.Tests/Query/Relationships/RelationshipsModelValueTypes.cs rename to test/EFCore.Specification.Tests/Query/Associations/AssociationsModelValueTypes.cs index 0f1dc31b8e5..008cb9e95e9 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsModelValueTypes.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/AssociationsModelValueTypes.cs @@ -3,7 +3,7 @@ using System.Diagnostics.CodeAnalysis; -namespace Microsoft.EntityFrameworkCore.Query.Relationships; +namespace Microsoft.EntityFrameworkCore.Query.Associations; /// /// Variant of containing value type complex types. diff --git a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsProjectionTestBase.cs b/test/EFCore.Specification.Tests/Query/Associations/AssociationsProjectionTestBase.cs similarity index 98% rename from test/EFCore.Specification.Tests/Query/Relationships/RelationshipsProjectionTestBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/AssociationsProjectionTestBase.cs index a3ee602f53f..c7a7a39ea32 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsProjectionTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/AssociationsProjectionTestBase.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships; +namespace Microsoft.EntityFrameworkCore.Query.Associations; -public abstract class RelationshipsProjectionTestBase(TFixture fixture) : QueryTestBase(fixture) - where TFixture : RelationshipsQueryFixtureBase, new() +public abstract class AssociationsProjectionTestBase(TFixture fixture) : QueryTestBase(fixture) + where TFixture : AssociationsQueryFixtureBase, new() { [ConditionalTheory, MemberData(nameof(TrackingData))] public virtual Task Select_root(QueryTrackingBehavior queryTrackingBehavior) diff --git a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsQueryFixtureBase.cs b/test/EFCore.Specification.Tests/Query/Associations/AssociationsQueryFixtureBase.cs similarity index 96% rename from test/EFCore.Specification.Tests/Query/Relationships/RelationshipsQueryFixtureBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/AssociationsQueryFixtureBase.cs index 06b7f408813..390d82a7c29 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsQueryFixtureBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/AssociationsQueryFixtureBase.cs @@ -1,16 +1,16 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships; +namespace Microsoft.EntityFrameworkCore.Query.Associations; -public abstract class RelationshipsQueryFixtureBase : SharedStoreFixtureBase, IQueryFixtureBase +public abstract class AssociationsQueryFixtureBase : SharedStoreFixtureBase, IQueryFixtureBase { public virtual bool AreCollectionsOrdered => true; - public RelationshipsData Data { get; private set; } + public AssociationsData Data { get; private set; } - public RelationshipsQueryFixtureBase() + public AssociationsQueryFixtureBase() { Data = CreateData(); @@ -44,7 +44,7 @@ public Func GetContextCreator() public virtual ISetSource GetExpectedData() => Data; - protected virtual RelationshipsData CreateData() + protected virtual AssociationsData CreateData() => new(); protected override Task SeedAsync(PoolableDbContext context) diff --git a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsSetOperationsTestBase.cs b/test/EFCore.Specification.Tests/Query/Associations/AssociationsSetOperationsTestBase.cs similarity index 90% rename from test/EFCore.Specification.Tests/Query/Relationships/RelationshipsSetOperationsTestBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/AssociationsSetOperationsTestBase.cs index 2e4108e1727..ff048ea8a47 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsSetOperationsTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/AssociationsSetOperationsTestBase.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships; +namespace Microsoft.EntityFrameworkCore.Query.Associations; -public abstract class RelationshipsSetOperationsTestBase(TFixture fixture) : QueryTestBase(fixture) - where TFixture : RelationshipsQueryFixtureBase, new() +public abstract class AssociationsSetOperationsTestBase(TFixture fixture) : QueryTestBase(fixture) + where TFixture : AssociationsQueryFixtureBase, new() { [ConditionalFact] public virtual Task On_related() diff --git a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsStructuralEqualityTestBase.cs b/test/EFCore.Specification.Tests/Query/Associations/AssociationsStructuralEqualityTestBase.cs similarity index 97% rename from test/EFCore.Specification.Tests/Query/Relationships/RelationshipsStructuralEqualityTestBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/AssociationsStructuralEqualityTestBase.cs index 8dcfd11a6f9..f0afede8edc 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/RelationshipsStructuralEqualityTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/AssociationsStructuralEqualityTestBase.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships; +namespace Microsoft.EntityFrameworkCore.Query.Associations; -public abstract class RelationshipsStructuralEqualityTestBase(TFixture fixture) : QueryTestBase(fixture) - where TFixture : RelationshipsQueryFixtureBase, new() +public abstract class AssociationsStructuralEqualityTestBase(TFixture fixture) : QueryTestBase(fixture) + where TFixture : AssociationsQueryFixtureBase, new() { [ConditionalFact] public virtual Task Two_related() diff --git a/test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/ComplexPropertiesCollectionTestBase.cs b/test/EFCore.Specification.Tests/Query/Associations/ComplexProperties/ComplexPropertiesCollectionTestBase.cs similarity index 67% rename from test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/ComplexPropertiesCollectionTestBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/ComplexProperties/ComplexPropertiesCollectionTestBase.cs index 90b8b488040..2b4a2cb253e 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/ComplexPropertiesCollectionTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/ComplexProperties/ComplexPropertiesCollectionTestBase.cs @@ -1,8 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexProperties; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexProperties; public abstract class ComplexPropertiesCollectionTestBase(TFixture fixture) - : RelationshipsCollectionTestBase(fixture) + : AssociationsCollectionTestBase(fixture) where TFixture : ComplexPropertiesFixtureBase, new(); diff --git a/test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/ComplexPropertiesFixtureBase.cs b/test/EFCore.Specification.Tests/Query/Associations/ComplexProperties/ComplexPropertiesFixtureBase.cs similarity index 93% rename from test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/ComplexPropertiesFixtureBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/ComplexProperties/ComplexPropertiesFixtureBase.cs index e92ca50539a..49a2c1b713b 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/ComplexPropertiesFixtureBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/ComplexProperties/ComplexPropertiesFixtureBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexProperties; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexProperties; -public abstract class ComplexPropertiesFixtureBase : RelationshipsQueryFixtureBase +public abstract class ComplexPropertiesFixtureBase : AssociationsQueryFixtureBase { protected override string StoreName => "ComplexRelationshipsQueryTest"; diff --git a/test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/ComplexPropertiesMiscellaneousTestBase.cs b/test/EFCore.Specification.Tests/Query/Associations/ComplexProperties/ComplexPropertiesMiscellaneousTestBase.cs similarity index 88% rename from test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/ComplexPropertiesMiscellaneousTestBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/ComplexProperties/ComplexPropertiesMiscellaneousTestBase.cs index 1b7be2c2184..5521e4e2a7e 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/ComplexPropertiesMiscellaneousTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/ComplexProperties/ComplexPropertiesMiscellaneousTestBase.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexProperties; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexProperties; public abstract class ComplexPropertiesMiscellaneousTestBase(TFixture fixture) - : RelationshipsMiscellaneousTestBase(fixture) + : AssociationsMiscellaneousTestBase(fixture) where TFixture : ComplexPropertiesFixtureBase, new() { #region Value types diff --git a/test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/ComplexPropertiesProjectionTestBase.cs b/test/EFCore.Specification.Tests/Query/Associations/ComplexProperties/ComplexPropertiesProjectionTestBase.cs similarity index 93% rename from test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/ComplexPropertiesProjectionTestBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/ComplexProperties/ComplexPropertiesProjectionTestBase.cs index 420116abf73..ffb0390d703 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/ComplexPropertiesProjectionTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/ComplexProperties/ComplexPropertiesProjectionTestBase.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexProperties; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexProperties; public abstract class ComplexPropertiesProjectionTestBase(TFixture fixture) - : RelationshipsProjectionTestBase(fixture) + : AssociationsProjectionTestBase(fixture) where TFixture : ComplexPropertiesFixtureBase, new() { #region Value types diff --git a/test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/ComplexPropertiesSetOperationsTestBase.cs b/test/EFCore.Specification.Tests/Query/Associations/ComplexProperties/ComplexPropertiesSetOperationsTestBase.cs similarity index 67% rename from test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/ComplexPropertiesSetOperationsTestBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/ComplexProperties/ComplexPropertiesSetOperationsTestBase.cs index fb556baaa85..476de6515b4 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/ComplexPropertiesSetOperationsTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/ComplexProperties/ComplexPropertiesSetOperationsTestBase.cs @@ -1,8 +1,8 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexProperties; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexProperties; public abstract class ComplexPropertiesSetOperationsTestBase(TFixture fixture) - : RelationshipsSetOperationsTestBase(fixture) + : AssociationsSetOperationsTestBase(fixture) where TFixture : ComplexPropertiesFixtureBase, new(); diff --git a/test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/ComplexPropertiesStructuralEqualityTestBase.cs b/test/EFCore.Specification.Tests/Query/Associations/ComplexProperties/ComplexPropertiesStructuralEqualityTestBase.cs similarity index 97% rename from test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/ComplexPropertiesStructuralEqualityTestBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/ComplexProperties/ComplexPropertiesStructuralEqualityTestBase.cs index d779e39c53d..0ca4e33360c 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/ComplexPropertiesStructuralEqualityTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/ComplexProperties/ComplexPropertiesStructuralEqualityTestBase.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexProperties; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexProperties; public abstract class ComplexPropertiesStructuralEqualityTestBase(TFixture fixture) - : RelationshipsStructuralEqualityTestBase(fixture) + : AssociationsStructuralEqualityTestBase(fixture) where TFixture : ComplexPropertiesFixtureBase, new() { // The below overrides are in order to add the client-side by-value comparison (Equals instead of ==), to account for the diff --git a/test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/TrackingRewriter.cs b/test/EFCore.Specification.Tests/Query/Associations/ComplexProperties/TrackingRewriter.cs similarity index 94% rename from test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/TrackingRewriter.cs rename to test/EFCore.Specification.Tests/Query/Associations/ComplexProperties/TrackingRewriter.cs index 91005899021..e6706df6463 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/ComplexProperties/TrackingRewriter.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/ComplexProperties/TrackingRewriter.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexProperties; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexProperties; internal class TrackingRewriter(QueryTrackingBehavior queryTrackingBehavior) : ExpressionVisitor { diff --git a/test/EFCore.Specification.Tests/Query/Relationships/Navigations/NavigationsCollectionTestBase.cs b/test/EFCore.Specification.Tests/Query/Associations/Navigations/NavigationsCollectionTestBase.cs similarity index 64% rename from test/EFCore.Specification.Tests/Query/Relationships/Navigations/NavigationsCollectionTestBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/Navigations/NavigationsCollectionTestBase.cs index ce9fd4df22c..8616afbf0eb 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/Navigations/NavigationsCollectionTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/Navigations/NavigationsCollectionTestBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; -public abstract class NavigationsCollectionTestBase(TFixture fixture) : RelationshipsCollectionTestBase(fixture) +public abstract class NavigationsCollectionTestBase(TFixture fixture) : AssociationsCollectionTestBase(fixture) where TFixture : NavigationsFixtureBase, new() { } diff --git a/test/EFCore.Specification.Tests/Query/Relationships/Navigations/NavigationsFixtureBase.cs b/test/EFCore.Specification.Tests/Query/Associations/Navigations/NavigationsFixtureBase.cs similarity index 93% rename from test/EFCore.Specification.Tests/Query/Relationships/Navigations/NavigationsFixtureBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/Navigations/NavigationsFixtureBase.cs index bc4350daa01..faf40ea484d 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/Navigations/NavigationsFixtureBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/Navigations/NavigationsFixtureBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; -public abstract class NavigationsFixtureBase : RelationshipsQueryFixtureBase +public abstract class NavigationsFixtureBase : AssociationsQueryFixtureBase { protected override string StoreName => "NavigationsQueryTest"; diff --git a/test/EFCore.Specification.Tests/Query/Relationships/Navigations/NavigationsIncludeTestBase.cs b/test/EFCore.Specification.Tests/Query/Associations/Navigations/NavigationsIncludeTestBase.cs similarity index 98% rename from test/EFCore.Specification.Tests/Query/Relationships/Navigations/NavigationsIncludeTestBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/Navigations/NavigationsIncludeTestBase.cs index 84811343e12..866e61ae5de 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/Navigations/NavigationsIncludeTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/Navigations/NavigationsIncludeTestBase.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public abstract class NavigationsIncludeTestBase(TFixture fixture) : QueryTestBase(fixture) where TFixture : NavigationsFixtureBase, new() diff --git a/test/EFCore.Specification.Tests/Query/Relationships/Navigations/NavigationsMiscellaneousTestBase.cs b/test/EFCore.Specification.Tests/Query/Associations/Navigations/NavigationsMiscellaneousTestBase.cs similarity index 67% rename from test/EFCore.Specification.Tests/Query/Relationships/Navigations/NavigationsMiscellaneousTestBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/Navigations/NavigationsMiscellaneousTestBase.cs index dfa978f48ca..e8af3e366c6 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/Navigations/NavigationsMiscellaneousTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/Navigations/NavigationsMiscellaneousTestBase.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public abstract class NavigationsMiscellaneousTestBase(TFixture fixture) - : RelationshipsMiscellaneousTestBase(fixture) + : AssociationsMiscellaneousTestBase(fixture) where TFixture : NavigationsFixtureBase, new() { } diff --git a/test/EFCore.Specification.Tests/Query/Relationships/Navigations/NavigationsProjectionTestBase.cs b/test/EFCore.Specification.Tests/Query/Associations/Navigations/NavigationsProjectionTestBase.cs similarity index 68% rename from test/EFCore.Specification.Tests/Query/Relationships/Navigations/NavigationsProjectionTestBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/Navigations/NavigationsProjectionTestBase.cs index 48e88329f42..5ebec3bac5f 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/Navigations/NavigationsProjectionTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/Navigations/NavigationsProjectionTestBase.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public abstract class NavigationsProjectionTestBase(TFixture fixture) - : RelationshipsProjectionTestBase(fixture) + : AssociationsProjectionTestBase(fixture) where TFixture : NavigationsFixtureBase, new() { } diff --git a/test/EFCore.Specification.Tests/Query/Relationships/Navigations/NavigationsSetOperationsTestBase.cs b/test/EFCore.Specification.Tests/Query/Associations/Navigations/NavigationsSetOperationsTestBase.cs similarity index 67% rename from test/EFCore.Specification.Tests/Query/Relationships/Navigations/NavigationsSetOperationsTestBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/Navigations/NavigationsSetOperationsTestBase.cs index 9d6ed07b7b7..9757a4b541d 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/Navigations/NavigationsSetOperationsTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/Navigations/NavigationsSetOperationsTestBase.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public abstract class NavigationsSetOperationsTestBase(TFixture fixture) - : RelationshipsSetOperationsTestBase(fixture) + : AssociationsSetOperationsTestBase(fixture) where TFixture : NavigationsFixtureBase, new() { } diff --git a/test/EFCore.Specification.Tests/Query/Relationships/Navigations/NavigationsStructuralEqualityTestBase.cs b/test/EFCore.Specification.Tests/Query/Associations/Navigations/NavigationsStructuralEqualityTestBase.cs similarity index 67% rename from test/EFCore.Specification.Tests/Query/Relationships/Navigations/NavigationsStructuralEqualityTestBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/Navigations/NavigationsStructuralEqualityTestBase.cs index 20efc6ae716..bfac5b261db 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/Navigations/NavigationsStructuralEqualityTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/Navigations/NavigationsStructuralEqualityTestBase.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public abstract class NavigationsStructuralEqualityTestBase(TFixture fixture) - : RelationshipsStructuralEqualityTestBase(fixture) + : AssociationsStructuralEqualityTestBase(fixture) where TFixture : NavigationsFixtureBase, new() { } diff --git a/test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionTestBase.cs b/test/EFCore.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsCollectionTestBase.cs similarity index 85% rename from test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionTestBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsCollectionTestBase.cs index 293ac767559..9d8d2f8fe66 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsCollectionTestBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; -public abstract class OwnedNavigationsCollectionTestBase(TFixture fixture) : RelationshipsCollectionTestBase(fixture) +public abstract class OwnedNavigationsCollectionTestBase(TFixture fixture) : AssociationsCollectionTestBase(fixture) where TFixture : OwnedNavigationsFixtureBase, new() { public override Task Distinct_projected(QueryTrackingBehavior queryTrackingBehavior) diff --git a/test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsFixtureBase.cs b/test/EFCore.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsFixtureBase.cs similarity index 94% rename from test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsFixtureBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsFixtureBase.cs index 2fac96c3613..a2133c30185 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsFixtureBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsFixtureBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; -public abstract class OwnedNavigationsFixtureBase : RelationshipsQueryFixtureBase +public abstract class OwnedNavigationsFixtureBase : AssociationsQueryFixtureBase { protected override string StoreName => "OwnedNavigationsQueryTest"; @@ -62,7 +62,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con }); } - protected override RelationshipsData CreateData() + protected override AssociationsData CreateData() { var data = base.CreateData(); diff --git a/test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsMiscellaneousTestBase.cs b/test/EFCore.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsMiscellaneousTestBase.cs similarity index 67% rename from test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsMiscellaneousTestBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsMiscellaneousTestBase.cs index 2ba71b33951..e5cd4cfa156 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsMiscellaneousTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsMiscellaneousTestBase.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public abstract class OwnedNavigationsMiscellaneousTestBase(TFixture fixture) - : RelationshipsMiscellaneousTestBase(fixture) + : AssociationsMiscellaneousTestBase(fixture) where TFixture : OwnedNavigationsFixtureBase, new() { } diff --git a/test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionTestBase.cs b/test/EFCore.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsProjectionTestBase.cs similarity index 98% rename from test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionTestBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsProjectionTestBase.cs index a3b901f1782..8f773a69f6a 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsProjectionTestBase.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; -public abstract class OwnedNavigationsProjectionTestBase(TFixture fixture) : RelationshipsProjectionTestBase(fixture) +public abstract class OwnedNavigationsProjectionTestBase(TFixture fixture) : AssociationsProjectionTestBase(fixture) where TFixture : OwnedNavigationsFixtureBase, new() { #region Non-collection diff --git a/test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsSetOperationsTestBase.cs b/test/EFCore.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsSetOperationsTestBase.cs similarity index 67% rename from test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsSetOperationsTestBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsSetOperationsTestBase.cs index 4b9e0bfc752..7f741f245a7 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsSetOperationsTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsSetOperationsTestBase.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public abstract class OwnedNavigationsSetOperationsTestBase(TFixture fixture) - : RelationshipsSetOperationsTestBase(fixture) + : AssociationsSetOperationsTestBase(fixture) where TFixture : OwnedNavigationsFixtureBase, new() { } diff --git a/test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualityTestBase.cs b/test/EFCore.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsStructuralEqualityTestBase.cs similarity index 93% rename from test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualityTestBase.cs rename to test/EFCore.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsStructuralEqualityTestBase.cs index dc6c1f6006a..08888a8d253 100644 --- a/test/EFCore.Specification.Tests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualityTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Associations/OwnedNavigations/OwnedNavigationsStructuralEqualityTestBase.cs @@ -1,10 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public abstract class OwnedNavigationsStructuralEqualityTestBase(TFixture fixture) - : RelationshipsStructuralEqualityTestBase(fixture) + : AssociationsStructuralEqualityTestBase(fixture) where TFixture : OwnedNavigationsFixtureBase, new() { public override Task Two_related() diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonCollectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonCollectionSqlServerTest.cs similarity index 99% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonCollectionSqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonCollectionSqlServerTest.cs index 4eeba50facc..59d1597e9d9 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonCollectionSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonCollectionSqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson; public class ComplexJsonCollectionSqlServerTest(ComplexJsonSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : ComplexJsonCollectionRelationalTestBase(fixture, testOutputHelper) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonMiscellaneousSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonMiscellaneousSqlServerTest.cs similarity index 98% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonMiscellaneousSqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonMiscellaneousSqlServerTest.cs index a065d0f8017..6f94b8a5d88 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonMiscellaneousSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonMiscellaneousSqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson; public class ComplexJsonMiscellaneousSqlServerTest(ComplexJsonSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : ComplexJsonMiscellaneousRelationalTestBase(fixture, testOutputHelper) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonProjectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonProjectionSqlServerTest.cs similarity index 99% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonProjectionSqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonProjectionSqlServerTest.cs index 0130684b9c0..450950230ed 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonProjectionSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonProjectionSqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson; public class ComplexJsonProjectionSqlServerTest(ComplexJsonSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : ComplexJsonProjectionRelationalTestBase(fixture, testOutputHelper) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonSetOperationsSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonSetOperationsSqlServerTest.cs similarity index 97% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonSetOperationsSqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonSetOperationsSqlServerTest.cs index ad6f8ee09b5..1fa5604b5b3 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonSetOperationsSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonSetOperationsSqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson; public class ComplexJsonSetOperationsSqlServerTest(ComplexJsonSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : ComplexJsonSetOperationsRelationalTestBase(fixture, testOutputHelper) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonSqlServerFixture.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonSqlServerFixture.cs similarity index 92% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonSqlServerFixture.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonSqlServerFixture.cs index 775292151c9..3584e53423e 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonSqlServerFixture.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonSqlServerFixture.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson; public class ComplexJsonSqlServerFixture : ComplexJsonRelationalFixtureBase { diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonStructuralEqualitySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonStructuralEqualitySqlServerTest.cs similarity index 99% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonStructuralEqualitySqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonStructuralEqualitySqlServerTest.cs index 39ac8e71497..0137526254e 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonStructuralEqualitySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonStructuralEqualitySqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson; public class ComplexJsonStructuralEqualitySqlServerTest(ComplexJsonSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : ComplexJsonStructuralEqualityRelationalTestBase(fixture, testOutputHelper) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingMiscellaneousSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingMiscellaneousSqlServerTest.cs similarity index 98% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingMiscellaneousSqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingMiscellaneousSqlServerTest.cs index b783447ee89..7482761f408 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingMiscellaneousSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingMiscellaneousSqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexTableSplitting; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexTableSplitting; public class ComplexTableSplittingMiscellaneousSqlServerTest( ComplexTableSplittingSqlServerFixture fixture, diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingProjectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingProjectionSqlServerTest.cs similarity index 99% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingProjectionSqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingProjectionSqlServerTest.cs index 419967c9d76..29ed5012bc3 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingProjectionSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingProjectionSqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexTableSplitting; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexTableSplitting; public class ComplexTableSplittingProjectionSqlServerTest( ComplexTableSplittingSqlServerFixture fixture, diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingSqlServerFixture.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingSqlServerFixture.cs similarity index 81% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingSqlServerFixture.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingSqlServerFixture.cs index a016d28fc69..aee552a876d 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingSqlServerFixture.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingSqlServerFixture.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexTableSplitting; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexTableSplitting; public class ComplexTableSplittingSqlServerFixture : ComplexTableSplittingRelationalFixtureBase, ITestSqlLoggerFactory { diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingStructuralEqualitySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingStructuralEqualitySqlServerTest.cs similarity index 99% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingStructuralEqualitySqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingStructuralEqualitySqlServerTest.cs index 8d780096da1..4d3e5885251 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingStructuralEqualitySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingStructuralEqualitySqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexTableSplitting; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexTableSplitting; public class ComplexTableSplittingStructuralEqualitySqlServerTest( ComplexTableSplittingSqlServerFixture fixture, diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsCollectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/Navigations/NavigationsCollectionSqlServerTest.cs similarity index 99% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsCollectionSqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/Navigations/NavigationsCollectionSqlServerTest.cs index be29971cf8b..9996dce3be0 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsCollectionSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/Navigations/NavigationsCollectionSqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public class NavigationsCollectionSqlServerTest(NavigationsSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : NavigationsCollectionRelationalTestBase(fixture, testOutputHelper) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsIncludeSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/Navigations/NavigationsIncludeSqlServerTest.cs similarity index 99% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsIncludeSqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/Navigations/NavigationsIncludeSqlServerTest.cs index c6710235b2c..2370d91e8f1 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsIncludeSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/Navigations/NavigationsIncludeSqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public class NavigationsIncludeSqlServerTest(NavigationsSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : NavigationsIncludeRelationalTestBase(fixture, testOutputHelper) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsMiscellaneousSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/Navigations/NavigationsMiscellaneousSqlServerTest.cs similarity index 99% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsMiscellaneousSqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/Navigations/NavigationsMiscellaneousSqlServerTest.cs index fbfa02d353d..f1ddee781f2 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsMiscellaneousSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/Navigations/NavigationsMiscellaneousSqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public class NavigationsMiscellaneousSqlServerTest( NavigationsSqlServerFixture fixture, diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsProjectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/Navigations/NavigationsProjectionSqlServerTest.cs similarity index 99% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsProjectionSqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/Navigations/NavigationsProjectionSqlServerTest.cs index b64be9d67a8..e310053a51b 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsProjectionSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/Navigations/NavigationsProjectionSqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public class NavigationsProjectionSqlServerTest(NavigationsSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : NavigationsProjectionRelationalTestBase(fixture, testOutputHelper) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsSetOperationsSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/Navigations/NavigationsSetOperationsSqlServerTest.cs similarity index 99% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsSetOperationsSqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/Navigations/NavigationsSetOperationsSqlServerTest.cs index f2a1cbf60f1..ef7a2c7fe66 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsSetOperationsSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/Navigations/NavigationsSetOperationsSqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public class NavigationsSetOperationsSqlServerTest( NavigationsSqlServerFixture fixture, diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsSqlServerFixture.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/Navigations/NavigationsSqlServerFixture.cs similarity index 81% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsSqlServerFixture.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/Navigations/NavigationsSqlServerFixture.cs index 3cf039aa856..3b6f1f80acb 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsSqlServerFixture.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/Navigations/NavigationsSqlServerFixture.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public class NavigationsSqlServerFixture : NavigationsRelationalFixtureBase { diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsStructuralEqualitySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/Navigations/NavigationsStructuralEqualitySqlServerTest.cs similarity index 99% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsStructuralEqualitySqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/Navigations/NavigationsStructuralEqualitySqlServerTest.cs index ea910fa6418..035c548afc2 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/Navigations/NavigationsStructuralEqualitySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/Navigations/NavigationsStructuralEqualitySqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public class NavigationsStructuralEqualitySqlServerTest( NavigationsSqlServerFixture fixture, diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonCollectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonCollectionSqlServerTest.cs similarity index 99% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonCollectionSqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonCollectionSqlServerTest.cs index ed5c4d9b45f..be463dc19ca 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonCollectionSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonCollectionSqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson; public class OwnedJsonCollectionSqlServerTest(OwnedJsonSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : OwnedJsonCollectionRelationalTestBase(fixture, testOutputHelper) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonMiscellaneousSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonMiscellaneousSqlServerTest.cs similarity index 95% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonMiscellaneousSqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonMiscellaneousSqlServerTest.cs index 9d588dc8b6d..cb6a2e58a01 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonMiscellaneousSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonMiscellaneousSqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson; public class OwnedJsonMiscellaneousSqlServerTest( OwnedJsonSqlServerFixture fixture, diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonProjectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonProjectionSqlServerTest.cs similarity index 99% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonProjectionSqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonProjectionSqlServerTest.cs index 26bbb973581..40778b02a03 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonProjectionSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonProjectionSqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson; public class OwnedJsonProjectionSqlServerTest(OwnedJsonSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : OwnedJsonProjectionRelationalTestBase(fixture, testOutputHelper) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonSqlServerFixture.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonSqlServerFixture.cs similarity index 81% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonSqlServerFixture.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonSqlServerFixture.cs index 5b843ce5961..79a434d84df 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonSqlServerFixture.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonSqlServerFixture.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson; public class OwnedJsonSqlServerFixture : OwnedJsonRelationalFixtureBase { diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonStructuralEqualitySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonStructuralEqualitySqlServerTest.cs similarity index 98% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonStructuralEqualitySqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonStructuralEqualitySqlServerTest.cs index d97e0148faf..865f47ea186 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonStructuralEqualitySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonStructuralEqualitySqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson; public class OwnedJsonStructuralEqualitySqlServerTest( OwnedJsonSqlServerFixture fixture, diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonTypeSqlServerFixture.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonTypeSqlServerFixture.cs similarity index 92% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonTypeSqlServerFixture.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonTypeSqlServerFixture.cs index 82af35bf521..69f58d86562 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonTypeSqlServerFixture.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonTypeSqlServerFixture.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson; public class OwnedJsonTypeSqlServerFixture : OwnedJsonRelationalFixtureBase { diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsCollectionSqlServerTest.cs similarity index 99% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionSqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsCollectionSqlServerTest.cs index 971e0820596..248784aed10 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsCollectionSqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public class OwnedNavigationsCollectionSqlServerTest(OwnedNavigationsSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : OwnedNavigationsCollectionRelationalTestBase(fixture, testOutputHelper) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsMiscellaneousSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsMiscellaneousSqlServerTest.cs similarity index 99% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsMiscellaneousSqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsMiscellaneousSqlServerTest.cs index 771d9646f37..0784ddec1c9 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsMiscellaneousSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsMiscellaneousSqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public class OwnedNavigationsMiscellaneousSqlServerTest( OwnedNavigationsSqlServerFixture fixture, diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsProjectionSqlServerTest.cs similarity index 99% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionSqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsProjectionSqlServerTest.cs index 0ceb4db4021..6a06d3ccfd4 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsProjectionSqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public class OwnedNavigationsProjectionSqlServerTest(OwnedNavigationsSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : OwnedNavigationsProjectionRelationalTestBase(fixture, testOutputHelper) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsSetOperationsSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsSetOperationsSqlServerTest.cs similarity index 99% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsSetOperationsSqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsSetOperationsSqlServerTest.cs index f1e736cbb91..3c50fff7fab 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsSetOperationsSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsSetOperationsSqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public class OwnedNavigationsSetOperationsSqlServerTest( OwnedNavigationsSqlServerFixture fixture, diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsSqlServerFixture.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsSqlServerFixture.cs similarity index 81% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsSqlServerFixture.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsSqlServerFixture.cs index 3f6631ff256..7e984ef390f 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsSqlServerFixture.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsSqlServerFixture.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public class OwnedNavigationsSqlServerFixture : OwnedNavigationsRelationalFixtureBase { diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualitySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsStructuralEqualitySqlServerTest.cs similarity index 99% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualitySqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsStructuralEqualitySqlServerTest.cs index d44f21f7810..3fe0516bc3d 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualitySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsStructuralEqualitySqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public class OwnedNavigationsStructuralEqualitySqlServerTest( OwnedNavigationsSqlServerFixture fixture, diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingMiscellaneousSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingMiscellaneousSqlServerTest.cs similarity index 99% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingMiscellaneousSqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingMiscellaneousSqlServerTest.cs index 11f085d0bc2..0f286dd5eb9 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingMiscellaneousSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingMiscellaneousSqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedTableSplitting; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedTableSplitting; public class OwnedTableSplittingMiscellaneousSqlServerTest( OwnedTableSplittingSqlServerFixture fixture, diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingProjectionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingProjectionSqlServerTest.cs similarity index 99% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingProjectionSqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingProjectionSqlServerTest.cs index 964ecc08892..efa7574c65d 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingProjectionSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingProjectionSqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedTableSplitting; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedTableSplitting; public class OwnedTableSplittingProjectionSqlServerTest(OwnedTableSplittingSqlServerFixture fixture, ITestOutputHelper testOutputHelper) : OwnedTableSplittingProjectionRelationalTestBase(fixture, testOutputHelper) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingSqlServerFixture.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingSqlServerFixture.cs similarity index 80% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingSqlServerFixture.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingSqlServerFixture.cs index 942f32d0fef..11619269bf1 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingSqlServerFixture.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingSqlServerFixture.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedTableSplitting; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedTableSplitting; public class OwnedTableSplittingSqlServerFixture : OwnedTableSplittingRelationalFixtureBase { diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingStructuralEqualitySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingStructuralEqualitySqlServerTest.cs similarity index 99% rename from test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingStructuralEqualitySqlServerTest.cs rename to test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingStructuralEqualitySqlServerTest.cs index 04b93fdc6b8..6a398a2a4df 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingStructuralEqualitySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingStructuralEqualitySqlServerTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedTableSplitting; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedTableSplitting; public class OwnedTableSplittingStructuralEqualitySqlServerTest( OwnedTableSplittingSqlServerFixture fixture, diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonCollectionSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonCollectionSqliteTest.cs similarity index 82% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonCollectionSqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonCollectionSqliteTest.cs index e3b8de9dd1a..e8e0b8ea24d 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonCollectionSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonCollectionSqliteTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson; public class ComplexJsonCollectionSqliteTest(ComplexJsonSqliteFixture fixture, ITestOutputHelper testOutputHelper) : ComplexJsonCollectionRelationalTestBase(fixture, testOutputHelper); diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonMiscellaneousSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonMiscellaneousSqliteTest.cs similarity index 83% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonMiscellaneousSqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonMiscellaneousSqliteTest.cs index c5aada6efd7..647bf2f837c 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonMiscellaneousSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonMiscellaneousSqliteTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson; public class ComplexJsonMiscellaneousSqliteTest(ComplexJsonSqliteFixture fixture, ITestOutputHelper testOutputHelper) : ComplexJsonMiscellaneousRelationalTestBase(fixture, testOutputHelper); diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonProjectionSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonProjectionSqliteTest.cs similarity index 96% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonProjectionSqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonProjectionSqliteTest.cs index 4db7b605d2c..eb18f49cd99 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonProjectionSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonProjectionSqliteTest.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Sqlite.Internal; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson; public class ComplexJsonProjectionSqliteTest(ComplexJsonSqliteFixture fixture, ITestOutputHelper testOutputHelper) : ComplexJsonProjectionRelationalTestBase(fixture, testOutputHelper) diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonSetOperationsSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonSetOperationsSqliteTest.cs similarity index 83% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonSetOperationsSqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonSetOperationsSqliteTest.cs index 0200a3d13f3..5d2ab5823a1 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonSetOperationsSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonSetOperationsSqliteTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson; public class ComplexJsonSetOperationsSqliteTest(ComplexJsonSqliteFixture fixture, ITestOutputHelper testOutputHelper) : ComplexJsonSetOperationsRelationalTestBase(fixture, testOutputHelper); diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonSqliteFixture.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonSqliteFixture.cs similarity index 81% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonSqliteFixture.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonSqliteFixture.cs index 1f7704ff4a9..6b5beef2656 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonSqliteFixture.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonSqliteFixture.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson; public class ComplexJsonSqliteFixture : ComplexJsonRelationalFixtureBase { diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonStructuralEqualitySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonStructuralEqualitySqliteTest.cs similarity index 83% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonStructuralEqualitySqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonStructuralEqualitySqliteTest.cs index 3c8ce4cdf4a..2cfebc44c5a 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexJson/ComplexJsonStructuralEqualitySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonStructuralEqualitySqliteTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexJson; public class ComplexJsonStructuralEqualitySqliteTest(ComplexJsonSqliteFixture fixture, ITestOutputHelper testOutputHelper) : ComplexJsonStructuralEqualityRelationalTestBase(fixture, testOutputHelper); diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingMiscellaneousSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingMiscellaneousSqliteTest.cs similarity index 83% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingMiscellaneousSqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingMiscellaneousSqliteTest.cs index 5a74e7598ea..d74412a8d00 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingMiscellaneousSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingMiscellaneousSqliteTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexTableSplitting; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexTableSplitting; public class ComplexTableSplittingMiscellaneousSqliteTest( ComplexTableSplittingSqliteFixture fixture, diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingProjectionSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingProjectionSqliteTest.cs similarity index 93% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingProjectionSqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingProjectionSqliteTest.cs index bb68fa057be..bd2aa117b62 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingProjectionSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingProjectionSqliteTest.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Sqlite.Internal; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexTableSplitting; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexTableSplitting; public class ComplexTableSplittingProjectionSqliteTest(ComplexTableSplittingSqliteFixture fixture, ITestOutputHelper testOutputHelper) : ComplexTableSplittingProjectionRelationalTestBase(fixture, testOutputHelper) diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingSqliteFixture.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingSqliteFixture.cs similarity index 80% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingSqliteFixture.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingSqliteFixture.cs index 8f261d59c2d..b97a7b988ed 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingSqliteFixture.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingSqliteFixture.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexTableSplitting; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexTableSplitting; public class ComplexTableSplittingSqliteFixture : ComplexTableSplittingRelationalFixtureBase { diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingStructuralEqualitySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingStructuralEqualitySqliteTest.cs similarity index 83% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingStructuralEqualitySqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingStructuralEqualitySqliteTest.cs index 8fab931eb9e..1d02f01eb83 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingStructuralEqualitySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/ComplexTableSplitting/ComplexTableSplittingStructuralEqualitySqliteTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexTableSplitting; +namespace Microsoft.EntityFrameworkCore.Query.Associations.ComplexTableSplitting; public class ComplexTableSplittingStructuralEqualitySqliteTest( ComplexTableSplittingSqliteFixture fixture, diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsCollectionSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/Navigations/NavigationsCollectionSqliteTest.cs similarity index 91% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsCollectionSqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/Navigations/NavigationsCollectionSqliteTest.cs index 7e7359de357..3ebd3567b8d 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsCollectionSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/Navigations/NavigationsCollectionSqliteTest.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Sqlite.Internal; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public class NavigationsCollectionSqliteTest(NavigationsSqliteFixture fixture, ITestOutputHelper testOutputHelper) : NavigationsCollectionRelationalTestBase(fixture, testOutputHelper) diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsIncludeSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/Navigations/NavigationsIncludeSqliteTest.cs similarity index 82% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsIncludeSqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/Navigations/NavigationsIncludeSqliteTest.cs index 3f5c64d41ce..d51d2ebd589 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsIncludeSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/Navigations/NavigationsIncludeSqliteTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public class NavigationsIncludeSqliteTest(NavigationsSqliteFixture fixture, ITestOutputHelper testOutputHelper) : NavigationsIncludeRelationalTestBase(fixture, testOutputHelper); diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsMiscellaneousSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/Navigations/NavigationsMiscellaneousSqliteTest.cs similarity index 83% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsMiscellaneousSqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/Navigations/NavigationsMiscellaneousSqliteTest.cs index 3ba53aebc95..78195545a5b 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsMiscellaneousSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/Navigations/NavigationsMiscellaneousSqliteTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public class NavigationsMiscellaneousSqliteTest( NavigationsSqliteFixture fixture, diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsProjectionSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/Navigations/NavigationsProjectionSqliteTest.cs similarity index 93% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsProjectionSqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/Navigations/NavigationsProjectionSqliteTest.cs index 8087c0ec619..287c5f590ed 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsProjectionSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/Navigations/NavigationsProjectionSqliteTest.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Sqlite.Internal; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public class NavigationsProjectionSqliteTest(NavigationsSqliteFixture fixture, ITestOutputHelper testOutputHelper) : NavigationsProjectionRelationalTestBase(fixture, testOutputHelper) diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsSetOperationsSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/Navigations/NavigationsSetOperationsSqliteTest.cs similarity index 83% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsSetOperationsSqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/Navigations/NavigationsSetOperationsSqliteTest.cs index 7d8c5c95767..c8954bbc81a 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsSetOperationsSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/Navigations/NavigationsSetOperationsSqliteTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public class NavigationsSetOperationsSqliteTest(NavigationsSqliteFixture fixture, ITestOutputHelper testOutputHelper) : NavigationsSetOperationsRelationalTestBase(fixture, testOutputHelper); diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsSqliteFixture.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/Navigations/NavigationsSqliteFixture.cs similarity index 81% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsSqliteFixture.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/Navigations/NavigationsSqliteFixture.cs index 5c5103f2498..6faf957c205 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsSqliteFixture.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/Navigations/NavigationsSqliteFixture.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public class NavigationsSqliteFixture : NavigationsRelationalFixtureBase { diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsStructuralEqualitySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/Navigations/NavigationsStructuralEqualitySqliteTest.cs similarity index 83% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsStructuralEqualitySqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/Navigations/NavigationsStructuralEqualitySqliteTest.cs index bca06a614fc..fb209118b93 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/Navigations/NavigationsStructuralEqualitySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/Navigations/NavigationsStructuralEqualitySqliteTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.Navigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.Navigations; public class NavigationsStructuralEqualitySqliteTest( NavigationsSqliteFixture fixture, diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonCollectionSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonCollectionSqliteTest.cs similarity index 93% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonCollectionSqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonCollectionSqliteTest.cs index cdee596b9ff..48500d299b3 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonCollectionSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonCollectionSqliteTest.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Sqlite.Internal; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson; public class OwnedJsonCollectionSqliteTest(OwnedJsonSqliteFixture fixture, ITestOutputHelper testOutputHelper) : OwnedJsonCollectionRelationalTestBase(fixture, testOutputHelper) diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonMiscellaneousSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonMiscellaneousSqliteTest.cs similarity index 83% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonMiscellaneousSqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonMiscellaneousSqliteTest.cs index 19547d91b07..65717af6d3f 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonMiscellaneousSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonMiscellaneousSqliteTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson; public class OwnedJsonMiscellaneousSqliteTest(OwnedJsonSqliteFixture fixture, ITestOutputHelper testOutputHelper) : OwnedJsonMiscellaneousRelationalTestBase(fixture, testOutputHelper); diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonProjectionSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonProjectionSqliteTest.cs similarity index 97% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonProjectionSqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonProjectionSqliteTest.cs index 632bad4a157..eeb5d3db8b9 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonProjectionSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonProjectionSqliteTest.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Sqlite.Internal; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson; public class OwnedJsonProjectionSqliteTest(OwnedJsonSqliteFixture fixture, ITestOutputHelper testOutputHelper) : OwnedJsonProjectionRelationalTestBase(fixture, testOutputHelper) diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonSqliteFixture.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonSqliteFixture.cs similarity index 81% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonSqliteFixture.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonSqliteFixture.cs index fa76ed022a4..2775b19bdec 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonSqliteFixture.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonSqliteFixture.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson; public class OwnedJsonSqliteFixture : OwnedJsonRelationalFixtureBase { diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonStructuralEqualitySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonStructuralEqualitySqliteTest.cs similarity index 98% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonStructuralEqualitySqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonStructuralEqualitySqliteTest.cs index 98d55680b9e..06afde8ddc7 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedJson/OwnedJsonStructuralEqualitySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonStructuralEqualitySqliteTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedJson; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson; public class OwnedJsonStructuralEqualitySqliteTest( OwnedJsonSqliteFixture fixture, diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsCollectionSqliteTest.cs similarity index 93% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionSqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsCollectionSqliteTest.cs index cc9770abfb9..0e092f69dcd 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsCollectionSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsCollectionSqliteTest.cs @@ -4,7 +4,7 @@ using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore.Sqlite.Internal; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public class OwnedNavigationsCollectionSqliteTest(OwnedNavigationsSqliteFixture fixture, ITestOutputHelper testOutputHelper) : OwnedNavigationsCollectionRelationalTestBase(fixture, testOutputHelper) diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsMiscellaneousSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsMiscellaneousSqliteTest.cs similarity index 83% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsMiscellaneousSqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsMiscellaneousSqliteTest.cs index b586e4875a3..89d54d4e3ba 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsMiscellaneousSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsMiscellaneousSqliteTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public class OwnedNavigationsMiscellaneousSqliteTest( OwnedNavigationsSqliteFixture fixture, diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsProjectionSqliteTest.cs similarity index 100% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsProjectionSqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsProjectionSqliteTest.cs diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsSetOperationsSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsSetOperationsSqliteTest.cs similarity index 90% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsSetOperationsSqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsSetOperationsSqliteTest.cs index 2af24c8d0c7..7f5673e91be 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsSetOperationsSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsSetOperationsSqliteTest.cs @@ -3,7 +3,7 @@ using Xunit.Sdk; -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public class OwnedNavigationsSetOperationsSqliteTest(OwnedNavigationsSqliteFixture fixture, ITestOutputHelper testOutputHelper) : OwnedNavigationsSetOperationsRelationalTestBase(fixture, testOutputHelper) diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualitySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsStructuralEqualitySqliteTest.cs similarity index 99% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualitySqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsStructuralEqualitySqliteTest.cs index 1b2077e691a..7b9457a2dbc 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedNavigationsStructuralEqualitySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsStructuralEqualitySqliteTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public class OwnedNavigationsStructuralEqualitySqliteTest( OwnedNavigationsSqliteFixture fixture, diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedRelationshipsSqliteFixture.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedNavigations/OwnedRelationshipsSqliteFixture.cs similarity index 87% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedRelationshipsSqliteFixture.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedNavigations/OwnedRelationshipsSqliteFixture.cs index 676704ba078..d400ea70643 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedNavigations/OwnedRelationshipsSqliteFixture.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedNavigations/OwnedRelationshipsSqliteFixture.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; public class OwnedNavigationsSqliteFixture : OwnedNavigationsRelationalFixtureBase { diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingMiscellaneousSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingMiscellaneousSqliteTest.cs similarity index 83% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingMiscellaneousSqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingMiscellaneousSqliteTest.cs index 1e36f01a1ae..f1168c30d10 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingMiscellaneousSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingMiscellaneousSqliteTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedTableSplitting; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedTableSplitting; public class OwnedTableSplittingMiscellaneousSqliteTest( OwnedTableSplittingSqliteFixture fixture, diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingProjectionSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingProjectionSqliteTest.cs similarity index 100% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingProjectionSqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingProjectionSqliteTest.cs diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingRelationshipsSqliteFixture.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingRelationshipsSqliteFixture.cs similarity index 87% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingRelationshipsSqliteFixture.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingRelationshipsSqliteFixture.cs index 3f6c8a0a7c4..aefc504d20c 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingRelationshipsSqliteFixture.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingRelationshipsSqliteFixture.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedTableSplitting; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedTableSplitting; public class OwnedTableSplittingSqliteFixture : OwnedTableSplittingRelationalFixtureBase { diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingStructuralEqualitySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingStructuralEqualitySqliteTest.cs similarity index 99% rename from test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingStructuralEqualitySqliteTest.cs rename to test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingStructuralEqualitySqliteTest.cs index ce6f53dd0c7..bdfc75d1b2b 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Relationships/OwnedTableSplitting/OwnedTableSplittingStructuralEqualitySqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Associations/OwnedTableSplitting/OwnedTableSplittingStructuralEqualitySqliteTest.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.EntityFrameworkCore.Query.Relationships.OwnedTableSplitting; +namespace Microsoft.EntityFrameworkCore.Query.Associations.OwnedTableSplitting; public class OwnedTableSplittingStructuralEqualitySqliteTest( OwnedTableSplittingSqliteFixture fixture, diff --git a/test/EFCore.Sqlite.FunctionalTests/SqliteComplianceTest.cs b/test/EFCore.Sqlite.FunctionalTests/SqliteComplianceTest.cs index 1fec3cd333e..6f010218cb2 100644 --- a/test/EFCore.Sqlite.FunctionalTests/SqliteComplianceTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/SqliteComplianceTest.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.EntityFrameworkCore.Query.Relationships.OwnedJson; -using Microsoft.EntityFrameworkCore.Query.Relationships.OwnedNavigations; -using Microsoft.EntityFrameworkCore.Query.Relationships.OwnedTableSplitting; +using Microsoft.EntityFrameworkCore.Query.Associations.OwnedJson; +using Microsoft.EntityFrameworkCore.Query.Associations.OwnedNavigations; +using Microsoft.EntityFrameworkCore.Query.Associations.OwnedTableSplitting; namespace Microsoft.EntityFrameworkCore;