Query: Attempt to enable few tests

Fix bug in EnumerableVerifyingExpressionVisitor to allow ToArray
dotnet · Jun 14, 2019 · c1f72a5 · c1f72a5
1 parent d039c8b
commit c1f72a5
Show file tree

Hide file tree

Showing 15 changed files with 206 additions and 205 deletions.
diff --git a/src/EFCore/Query/Pipeline/QueryOptimizingExpressionVisitor.cs b/src/EFCore/Query/Pipeline/QueryOptimizingExpressionVisitor.cs
@@ -41,7 +41,8 @@ protected override Expression VisitMethodCall(MethodCallExpression node)
                 if (node.Method.DeclaringType == typeof(Enumerable)
                     && node.Arguments[0].Type.IsGenericType
                     && node.Arguments[0].Type.GetGenericTypeDefinition() == typeof(IQueryable<>)
-                    && !string.Equals(node.Method.Name, nameof(Enumerable.ToList)))
+                    && !string.Equals(node.Method.Name, nameof(Enumerable.ToList))
+                    && !string.Equals(node.Method.Name, nameof(Enumerable.ToArray)))
                 {
                     throw new InvalidFilterCriteriaException();
                 }

diff --git a/test/EFCore.InMemory.FunctionalTests/ConcurrencyDetectorInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/ConcurrencyDetectorInMemoryTest.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.EntityFrameworkCore
 {
-    // TODO: See Tasklist#23
+    // TODO: See Issue#14534
     internal class ConcurrencyDetectorInMemoryTest : ConcurrencyDetectorTestBase<NorthwindQueryInMemoryFixture<NoopModelCustomizer>>
     {
         public ConcurrencyDetectorInMemoryTest(NorthwindQueryInMemoryFixture<NoopModelCustomizer> fixture)

diff --git a/test/EFCore.Relational.Specification.Tests/Query/SqlExecutorTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/SqlExecutorTestBase.cs
@@ -52,7 +52,7 @@ public virtual void Executes_stored_procedure_with_generated_parameter()
             }
         }
 
-        [ConditionalFact(Skip = "QueryIssue")]
+        [ConditionalFact(Skip = "Issue#14534")]
         public virtual void Throws_on_concurrent_command()
         {
             using (var context = CreateContext())

diff --git a/test/EFCore.Relational.Specification.Tests/Query/UdfDbFunctionTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/UdfDbFunctionTestBase.cs
@@ -800,7 +800,7 @@ public virtual void Scalar_Nested_Function_UDF_BCL_Static()
             }
         }
 
-        [ConditionalFact(Skip = "Tasklist#6")]
+        [ConditionalFact]
         public virtual void Nullable_navigation_property_access_preserves_schema_for_sql_function()
         {
             using (var context = CreateContext())

diff --git a/test/EFCore.Specification.Tests/Query/AsyncSimpleQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/AsyncSimpleQueryTestBase.cs
@@ -56,7 +56,7 @@ public virtual async Task Query_backed_by_database_view()
             }
         }
 
-        [ConditionalFact(Skip = "QueryIssue")]
+        [ConditionalFact(Skip = "Issue#15611")]
         public virtual async Task ToList_context_subquery_deadlock_issue()
         {
             using (var context = CreateContext())
@@ -95,7 +95,7 @@ var results
             }
         }
 
-        [ConditionalFact(Skip = "QueryIssue")]
+        [ConditionalFact(Skip = "Issue#15611")]
         public virtual async Task ToArray_on_nav_subquery_in_projection_nested()
         {
             using (var context = CreateContext())
@@ -117,7 +117,7 @@ var results
             }
         }
 
-        [ConditionalFact(Skip = "QueryIssue")]
+        [ConditionalFact(Skip = "Issue#15611")]
         public virtual async Task ToList_on_nav_subquery_in_projection()
         {
             using (var context = CreateContext())
@@ -134,7 +134,7 @@ var results
             }
         }
 
-        [ConditionalFact(Skip = "QueryIssue")]
+        [ConditionalFact(Skip = "Issue#15611")]
         public virtual async Task ToList_on_nav_subquery_with_predicate_in_projection()
         {
             using (var context = CreateContext())

diff --git a/test/EFCore.Specification.Tests/Query/CompiledQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/CompiledQueryTestBase.cs
@@ -80,7 +80,7 @@ public virtual void DbQuery_query_first()
             }
         }
 
-        [ConditionalFact(Skip = "issue #15611")]
+        [ConditionalFact]
         public virtual void Query_ending_with_include()
         {
             var query = EF.CompileQuery(