Converting Inheritance relationship tests to AssertQuery infra

dotnet · Jul 8, 2020 · 69a3cad · 69a3cad
1 parent 45fe7cd
commit 69a3cad
Show file tree

Hide file tree

Showing 31 changed files with 2,036 additions and 1,261 deletions.
diff --git a/...e.Relational.Specification.Tests/Query/InheritanceRelationshipsQueryRelationalTestBase.cs b/...e.Relational.Specification.Tests/Query/InheritanceRelationshipsQueryRelationalTestBase.cs
diff --git a/test/EFCore.Relational.Specification.Tests/Query/TPTRelationshipsQueryRelationalFixture.cs b/test/EFCore.Relational.Specification.Tests/Query/TPTRelationshipsQueryRelationalFixture.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationships;
+using Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationshipsModel;
 
 namespace Microsoft.EntityFrameworkCore.Query
 {

diff --git a/test/EFCore.Specification.Tests/Query/InheritanceRelationshipsQueryFixtureBase.cs b/test/EFCore.Specification.Tests/Query/InheritanceRelationshipsQueryFixtureBase.cs
diff --git a/test/EFCore.Specification.Tests/Query/InheritanceRelationshipsQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/InheritanceRelationshipsQueryTestBase.cs
diff --git a/...pecification.Tests/TestModels/InheritanceRelationships/InheritanceRelationshipsContext.cs b/...pecification.Tests/TestModels/InheritanceRelationships/InheritanceRelationshipsContext.cs
diff --git a/...anceRelationships/BaseCollectionOnBase.cs → ...elationshipsModel/BaseCollectionOnBase.cs b/...anceRelationships/BaseCollectionOnBase.cs → ...elationshipsModel/BaseCollectionOnBase.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationships
+namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationshipsModel
 {
     public class BaseCollectionOnBase
     {

diff --git a/...eRelationships/BaseCollectionOnDerived.cs → ...tionshipsModel/BaseCollectionOnDerived.cs b/...eRelationships/BaseCollectionOnDerived.cs → ...tionshipsModel/BaseCollectionOnDerived.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationships
+namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationshipsModel
 {
     public class BaseCollectionOnDerived
     {

diff --git a/...hips/BaseInheritanceRelationshipEntity.cs → ...odel/BaseInheritanceRelationshipEntity.cs b/...hips/BaseInheritanceRelationshipEntity.cs → ...odel/BaseInheritanceRelationshipEntity.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationships
+namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationshipsModel
 {
     public class BaseInheritanceRelationshipEntity
     {

diff --git a/...tanceRelationships/BaseReferenceOnBase.cs → ...RelationshipsModel/BaseReferenceOnBase.cs b/...tanceRelationships/BaseReferenceOnBase.cs → ...RelationshipsModel/BaseReferenceOnBase.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationships
+namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationshipsModel
 {
     public class BaseReferenceOnBase
     {

diff --git a/...ceRelationships/BaseReferenceOnDerived.cs → ...ationshipsModel/BaseReferenceOnDerived.cs b/...ceRelationships/BaseReferenceOnDerived.cs → ...ationshipsModel/BaseReferenceOnDerived.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationships
+namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationshipsModel
 {
     public class BaseReferenceOnDerived
     {

diff --git a/...eritanceRelationships/CollectionOnBase.cs → ...nceRelationshipsModel/CollectionOnBase.cs b/...eritanceRelationships/CollectionOnBase.cs → ...nceRelationshipsModel/CollectionOnBase.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationships
+namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationshipsModel
 {
     public class CollectionOnBase
     {

diff --git a/...tanceRelationships/CollectionOnDerived.cs → ...RelationshipsModel/CollectionOnDerived.cs b/...tanceRelationships/CollectionOnDerived.cs → ...RelationshipsModel/CollectionOnDerived.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationships
+namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationshipsModel
 {
     public class CollectionOnDerived
     {

diff --git a/...eRelationships/DerivedCollectionOnBase.cs → ...tionshipsModel/DerivedCollectionOnBase.cs b/...eRelationships/DerivedCollectionOnBase.cs → ...tionshipsModel/DerivedCollectionOnBase.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationships
+namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationshipsModel
 {
     public class DerivedCollectionOnBase : BaseCollectionOnBase
     {

diff --git a/...lationships/DerivedCollectionOnDerived.cs → ...nshipsModel/DerivedCollectionOnDerived.cs b/...lationships/DerivedCollectionOnDerived.cs → ...nshipsModel/DerivedCollectionOnDerived.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationships
+namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationshipsModel
 {
     public class DerivedCollectionOnDerived : BaseCollectionOnDerived
     {

diff --git a/...s/DerivedInheritanceRelationshipEntity.cs → ...l/DerivedInheritanceRelationshipEntity.cs b/...s/DerivedInheritanceRelationshipEntity.cs → ...l/DerivedInheritanceRelationshipEntity.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationships
+namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationshipsModel
 {
     public class DerivedInheritanceRelationshipEntity : BaseInheritanceRelationshipEntity
     {

diff --git a/...ceRelationships/DerivedReferenceOnBase.cs → ...ationshipsModel/DerivedReferenceOnBase.cs b/...ceRelationships/DerivedReferenceOnBase.cs → ...ationshipsModel/DerivedReferenceOnBase.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationships
+namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationshipsModel
 {
     public class DerivedReferenceOnBase : BaseReferenceOnBase
     {

diff --git a/...elationships/DerivedReferenceOnDerived.cs → ...onshipsModel/DerivedReferenceOnDerived.cs b/...elationships/DerivedReferenceOnDerived.cs → ...onshipsModel/DerivedReferenceOnDerived.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationships
+namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationshipsModel
 {
     public class DerivedReferenceOnDerived : BaseReferenceOnDerived
     {

diff --git a/...ication.Tests/TestModels/InheritanceRelationshipsModel/InheritanceRelationshipsContext.cs b/...ication.Tests/TestModels/InheritanceRelationshipsModel/InheritanceRelationshipsContext.cs
@@ -0,0 +1,77 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.EntityFrameworkCore.TestUtilities;
+
+namespace Microsoft.EntityFrameworkCore.TestModels.InheritanceRelationshipsModel
+{
+    public class InheritanceRelationshipsContext : PoolableDbContext
+    {
+        public static readonly string StoreName = "InheritanceRelationships";
+
+        public InheritanceRelationshipsContext(DbContextOptions options)
+            : base(options)
+        {
+        }
+
+        public DbSet<BaseCollectionOnBase> BaseCollectionsOnBase { get; set; }
+        public DbSet<BaseCollectionOnDerived> BaseCollectionsOnDerived { get; set; }
+        public DbSet<BaseInheritanceRelationshipEntity> BaseEntities { get; set; }
+        public DbSet<BaseReferenceOnBase> BaseReferencesOnBase { get; set; }
+        public DbSet<BaseReferenceOnDerived> BaseReferencesOnDerived { get; set; }
+        public DbSet<CollectionOnBase> CollectionsOnBase { get; set; }
+        public DbSet<CollectionOnDerived> CollectionsOnDerived { get; set; }
+        public DbSet<NestedCollectionBase> NestedCollections { get; set; }
+        public DbSet<NestedReferenceBase> NestedReferences { get; set; }
+        public DbSet<PrincipalEntity> PrincipalEntities { get; set; }
+        public DbSet<ReferencedEntity> ReferencedEntities { get; set; }
+        public DbSet<ReferenceOnBase> ReferencesOnBase { get; set; }
+        public DbSet<ReferenceOnDerived> ReferencesOnDerived { get; set; }
+
+        public static void Seed(InheritanceRelationshipsContext context)
+        {
+            var baseCollectionsOnBase = InheritanceRelationshipsData.CreateBaseCollectionsOnBase();
+            var baseCollectionsOnDerived = InheritanceRelationshipsData.CreateBaseCollectionsOnDerived();
+            var baseEntities = InheritanceRelationshipsData.CreateBaseEntities();
+            var baseReferencesOnBase = InheritanceRelationshipsData.CreateBaseReferencesOnBase();
+            var baseReferencesOnDerived = InheritanceRelationshipsData.CreateBaseReferencesOnDerived();
+            var collectionsOnBase = InheritanceRelationshipsData.CreateCollectionsOnBase();
+            var collectionsOnDerived = InheritanceRelationshipsData.CreateCollectionsOnDerived();
+            var nestedCollections = InheritanceRelationshipsData.CreateNestedCollections();
+            var nestedReferences = InheritanceRelationshipsData.CreateNestedReferences();
+            var principalEntities = InheritanceRelationshipsData.CreatePrincipalEntities();
+            var referencedEntities = InheritanceRelationshipsData.CreateReferencedEntities();
+            var referencesOnBase = InheritanceRelationshipsData.CreateReferencesOnBase();
+            var referencesOnDerived = InheritanceRelationshipsData.CreateReferencesOnDerived();
+
+            InheritanceRelationshipsData.WireUp(
+                baseEntities,
+                baseReferencesOnBase,
+                baseReferencesOnDerived,
+                referencesOnBase,
+                referencesOnDerived,
+                nestedReferences,
+                baseCollectionsOnBase,
+                baseCollectionsOnDerived,
+                collectionsOnBase,
+                collectionsOnDerived,
+                nestedCollections);
+
+            context.BaseCollectionsOnBase.AddRange(baseCollectionsOnBase);
+            context.BaseCollectionsOnDerived.AddRange(baseCollectionsOnDerived);
+            context.BaseEntities.AddRange(baseEntities);
+            context.BaseReferencesOnBase.AddRange(baseReferencesOnBase);
+            context.BaseReferencesOnDerived.AddRange(baseReferencesOnDerived);
+            context.CollectionsOnBase.AddRange(collectionsOnBase);
+            context.CollectionsOnDerived.AddRange(collectionsOnDerived);
+            context.NestedCollections.AddRange(nestedCollections);
+            context.NestedReferences.AddRange(nestedReferences);
+            context.PrincipalEntities.AddRange(principalEntities);
+            context.ReferencedEntities.AddRange(referencedEntities);
+            context.ReferencesOnBase.AddRange(referencesOnBase);
+            context.ReferencesOnDerived.AddRange(referencesOnDerived);
+
+            context.SaveChanges();
+        }
+    }
+}