Convert Inheritance query tests to AssertQuery infrastructure

dotnet · Jul 2, 2020 · 5849bff · 5849bff
1 parent e327d2c
commit 5849bff
Show file tree

Hide file tree

Showing 31 changed files with 1,334 additions and 773 deletions.
diff --git a/test/EFCore.InMemory.FunctionalTests/Query/IncompleteMappingInheritanceQueryInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/Query/IncompleteMappingInheritanceQueryInMemoryTest.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Xunit;
 
@@ -14,10 +15,10 @@ public IncompleteMappingInheritanceQueryInMemoryTest(IncompleteMappingInheritanc
         {
         }
 
-        [ConditionalFact]
-        public override void Can_query_all_animal_views()
+        public override async Task Can_query_all_animal_views(bool async)
         {
-            var message = Assert.Throws<InvalidOperationException>(() => base.Can_query_all_animal_views()).Message;
+            var message = (await Assert.ThrowsAsync<InvalidOperationException>(
+                () => base.Can_query_all_animal_views(async))).Message;
 
             Assert.Equal(
                 CoreStrings.TranslationFailed(

diff --git a/test/EFCore.InMemory.FunctionalTests/Query/InheritanceQueryInMemoryFixture.cs b/test/EFCore.InMemory.FunctionalTests/Query/InheritanceQueryInMemoryFixture.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Linq;
 using Microsoft.EntityFrameworkCore.Diagnostics;
-using Microsoft.EntityFrameworkCore.TestModels.Inheritance;
+using Microsoft.EntityFrameworkCore.TestModels.InheritanceModel;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 
 namespace Microsoft.EntityFrameworkCore.Query

diff --git a/test/EFCore.InMemory.FunctionalTests/Query/InheritanceQueryInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/Query/InheritanceQueryInMemoryTest.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Xunit;
 using Xunit.Abstractions;
@@ -16,10 +17,10 @@ public InheritanceQueryInMemoryTest(InheritanceQueryInMemoryFixture fixture, ITe
             //TestLoggerFactory.TestOutputHelper = testOutputHelper;
         }
 
-        [ConditionalFact]
-        public override void Can_query_all_animal_views()
+        public override async Task Can_query_all_animal_views(bool async)
         {
-            var message = Assert.Throws<InvalidOperationException>(() => base.Can_query_all_animal_views()).Message;
+            var message = (await Assert.ThrowsAsync<InvalidOperationException>(
+                () => base.Can_query_all_animal_views(async))).Message;
 
             Assert.Equal(
                 CoreStrings.TranslationFailed(

diff --git a/test/EFCore.Relational.Specification.Tests/Query/InheritanceQueryRelationalFixture.cs b/test/EFCore.Relational.Specification.Tests/Query/InheritanceQueryRelationalFixture.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.Inheritance;
+using Microsoft.EntityFrameworkCore.TestModels.InheritanceModel;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 
 namespace Microsoft.EntityFrameworkCore.Query
@@ -33,7 +33,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
             modelBuilder.Entity<Tea>().Property(e => e.CaffeineGrams).HasColumnName("CaffeineGrams");
 
             modelBuilder.Entity<AnimalQuery>().HasNoKey().ToQuery(
-                () => context.Set<AnimalQuery>().FromSqlRaw("SELECT * FROM Animal"));
+                () => context.Set<AnimalQuery>().FromSqlRaw("SELECT * FROM Animals"));
             modelBuilder.Entity<KiwiQuery>().HasDiscriminator().HasValue("Kiwi");
             modelBuilder.Entity<EagleQuery>().HasDiscriminator().HasValue("Eagle");
         }

diff --git a/test/EFCore.Relational.Specification.Tests/Query/InheritanceRelationalQueryTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/InheritanceRelationalQueryTestBase.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.Linq;
-using Microsoft.EntityFrameworkCore.TestModels.Inheritance;
+using Microsoft.EntityFrameworkCore.TestModels.InheritanceModel;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 using Xunit;
 
@@ -22,14 +22,14 @@ protected InheritanceRelationalQueryTestBase(TFixture fixture)
         public virtual void FromSql_on_root()
         {
             using var context = CreateContext();
-            context.Set<Animal>().FromSqlRaw(NormalizeDelimitersInRawString("select * from [Animal]")).ToList();
+            context.Set<Animal>().FromSqlRaw(NormalizeDelimitersInRawString("select * from [Animals]")).ToList();
         }
 
         [ConditionalFact]
         public virtual void FromSql_on_derived()
         {
             using var context = CreateContext();
-            context.Set<Eagle>().FromSqlRaw(NormalizeDelimitersInRawString("select * from [Animal]")).ToList();
+            context.Set<Eagle>().FromSqlRaw(NormalizeDelimitersInRawString("select * from [Animals]")).ToList();
         }
 
         [ConditionalFact]
@@ -44,7 +44,7 @@ public virtual void Casting_to_base_type_joining_with_query_type_works()
         private void GetEntityWithAuditHistoryQuery<T>(InheritanceContext context, IQueryable<T> query)
             where T : Animal
         {
-            var queryTypeQuery = context.Set<AnimalQuery>().FromSqlRaw(NormalizeDelimitersInRawString("Select * from [Animal]"));
+            var queryTypeQuery = context.Set<AnimalQuery>().FromSqlRaw(NormalizeDelimitersInRawString("Select * from [Animals]"));
 
             var animalQuery = query.Cast<Animal>();
 

diff --git a/test/EFCore.Relational.Specification.Tests/Query/TPTInheritanceQueryFixture.cs b/test/EFCore.Relational.Specification.Tests/Query/TPTInheritanceQueryFixture.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.Inheritance;
+using Microsoft.EntityFrameworkCore.TestModels.InheritanceModel;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 
 namespace Microsoft.EntityFrameworkCore.Query