Miscellaneous query test fixes

resolves #14550 resolves #15164 resolves #15994 resolves #16722 added regression tests for #14671 added regression test for #17852 converted remaining tests in Gears of War into AssertQuery pattern (part of #12501)
dotnet · Oct 2, 2019 · 1bd4e85 · 1bd4e85
1 parent d005f54
commit 1bd4e85
Show file tree

Hide file tree

Showing 10 changed files with 1,314 additions and 1,225 deletions.
diff --git a/src/EFCore/Query/Internal/NavigationExpandingExpressionVisitor.ExpressionVisitors.cs b/src/EFCore/Query/Internal/NavigationExpandingExpressionVisitor.ExpressionVisitors.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;

diff --git a/test/EFCore.InMemory.FunctionalTests/Query/ComplexNavigationsQueryInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/Query/ComplexNavigationsQueryInMemoryTest.cs
@@ -20,5 +20,11 @@ public override Task Complex_query_with_optional_navigations_and_client_side_eva
         {
             return base.Complex_query_with_optional_navigations_and_client_side_evaluation(isAsync);
         }
+
+        [ConditionalFact(Skip = "issue #18194")]
+        public override void Member_pushdown_chain_3_levels_deep_entity()
+        {
+            base.Member_pushdown_chain_3_levels_deep_entity();
+        }
     }
 }
diff --git a/test/EFCore.Specification.Tests/Query/ComplexNavigationsQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/ComplexNavigationsQueryTestBase.cs
diff --git a/test/EFCore.Specification.Tests/Query/ComplexNavigationsWeakQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/ComplexNavigationsWeakQueryTestBase.cs
@@ -81,31 +81,27 @@ public override Task Multiple_SelectMany_with_nested_navigations_and_explicit_De
         }
 
         [ConditionalTheory(Skip = "issue #13560")]
-        public override Task SelectMany_with_nested_navigations_explicit_DefaultIfEmpty_and_additional_joins_outside_of_SelectMany(
-            bool isAsync)
+        public override Task SelectMany_with_nested_navigations_explicit_DefaultIfEmpty_and_additional_joins_outside_of_SelectMany(bool isAsync)
         {
             return base.SelectMany_with_nested_navigations_explicit_DefaultIfEmpty_and_additional_joins_outside_of_SelectMany(isAsync);
         }
 
         [ConditionalTheory(Skip = "issue #13560")]
-        public override Task SelectMany_with_nested_navigations_explicit_DefaultIfEmpty_and_additional_joins_outside_of_SelectMany2(
-            bool isAsync)
+        public override Task SelectMany_with_nested_navigations_explicit_DefaultIfEmpty_and_additional_joins_outside_of_SelectMany2(bool isAsync)
         {
             return base.SelectMany_with_nested_navigations_explicit_DefaultIfEmpty_and_additional_joins_outside_of_SelectMany2(isAsync);
         }
 
-        [ConditionalFact(Skip = "issue #13560")]
-        public override void SelectMany_with_nested_navigations_and_additional_joins_outside_of_SelectMany()
+        [ConditionalTheory(Skip = "issue #13560")]
+        public override Task SelectMany_with_nested_navigations_and_additional_joins_outside_of_SelectMany(bool isAsync)
         {
-            base.SelectMany_with_nested_navigations_and_additional_joins_outside_of_SelectMany();
+            return base.SelectMany_with_nested_navigations_and_additional_joins_outside_of_SelectMany(isAsync);
         }
 
         [ConditionalTheory(Skip = "issue #13560")]
-        public override Task
-            Complex_SelectMany_with_nested_navigations_and_explicit_DefaultIfEmpty_with_other_query_operators_composed_on_top(bool isAsync)
+        public override Task Complex_SelectMany_with_nested_navigations_and_explicit_DefaultIfEmpty_with_other_query_operators_composed_on_top(bool isAsync)
         {
-            return base.Complex_SelectMany_with_nested_navigations_and_explicit_DefaultIfEmpty_with_other_query_operators_composed_on_top(
-                isAsync);
+            return base.Complex_SelectMany_with_nested_navigations_and_explicit_DefaultIfEmpty_with_other_query_operators_composed_on_top(isAsync);
         }
 
         [ConditionalTheory(Skip = "Issue#16752")]
@@ -165,12 +161,18 @@ public override void Member_pushdown_chain_3_levels_deep()
         {
         }
 
+        public override void Member_pushdown_chain_3_levels_deep_entity()
+        {
+        }
+
         public override void Member_pushdown_with_collection_navigation_in_the_middle()
         {
         }
 
-        public override void Include_inside_subquery()
+        [ConditionalTheory(Skip = "Issue#16752")]
+        public override Task Include_inside_subquery(bool isAsync)
         {
+            return base.Include_inside_subquery(isAsync);
         }
     }
 }