Query: Re-enable tests for issue#16389 (#16892)

Resolves #16389 Fixed in new nav expansion
dotnet · Aug 1, 2019 · 53f64ac · 53f64ac
1 parent 710b36f
commit 53f64ac
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/test/EFCore.Specification.Tests/Query/GroupByQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/GroupByQueryTestBase.cs
@@ -2979,7 +2979,7 @@ await AssertMax<Order>(
                 os => os.GroupBy(o => o.CustomerID).Select(g => g.Sum(gg => gg.OrderID)));
         }
 
-        [ConditionalTheory(Skip = "Issue#16389")]
+        [ConditionalTheory]
         [MemberData(nameof(IsAsyncData))]
         public virtual async Task All_after_GroupBy_aggregate(bool isAsync)
         {
@@ -2989,7 +2989,7 @@ await AssertAll<Order, int>(
                 predicate: ee => true);
         }
 
-        [ConditionalTheory(Skip = "Issue#16389")]
+        [ConditionalTheory]
         [MemberData(nameof(IsAsyncData))]
         public virtual async Task All_after_GroupBy_aggregate2(bool isAsync)
         {
@@ -2999,7 +2999,7 @@ await AssertAll<Order, int>(
                 predicate: ee => ee >= 0);
         }
 
-        [ConditionalTheory(Skip = "Issue#16389")]
+        [ConditionalTheory]
         [MemberData(nameof(IsAsyncData))]
         public virtual async Task Any_after_GroupBy_aggregate(bool isAsync)
         {

diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/GroupByQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/GroupByQuerySqlServerTest.cs
@@ -1989,14 +1989,12 @@ public override async Task All_after_GroupBy_aggregate(bool isAsync)
             await base.All_after_GroupBy_aggregate(isAsync);
 
             AssertSql(
-                @"
-CHECK THE SQL
-SELECT CASE
+                @"SELECT CASE
     WHEN NOT EXISTS (
         SELECT 1
         FROM [Orders] AS [o]
-        WHERE CAST(0 AS bit) = CAST(1 AS bit)
-        GROUP BY [o].[CustomerID]) THEN CAST(1 AS bit)
+        GROUP BY [o].[CustomerID]
+        HAVING CAST(0 AS bit) = CAST(1 AS bit)) THEN CAST(1 AS bit)
     ELSE CAST(0 AS bit)
 END");
         }
@@ -2005,17 +2003,23 @@ public override async Task All_after_GroupBy_aggregate2(bool isAsync)
         {
             await base.All_after_GroupBy_aggregate2(isAsync);
 
-            AssertSql(@" ");
+            AssertSql(
+                @"SELECT CASE
+    WHEN NOT EXISTS (
+        SELECT 1
+        FROM [Orders] AS [o]
+        GROUP BY [o].[CustomerID]
+        HAVING SUM([o].[OrderID]) < 0) THEN CAST(1 AS bit)
+    ELSE CAST(0 AS bit)
+END");
         }
 
         public override async Task Any_after_GroupBy_aggregate(bool isAsync)
         {
             await base.Any_after_GroupBy_aggregate(isAsync);
 
             AssertSql(
-                @"
-CHECK THE SQL
-SELECT CASE
+                @"SELECT CASE
     WHEN EXISTS (
         SELECT 1
         FROM [Orders] AS [o]