Updated

dotnet · Sep 16, 2021 · d54a852 · d54a852
1 parent 80f7e91
commit d54a852
Show file tree

Hide file tree

Showing 4 changed files with 191 additions and 161 deletions.
diff --git a/test/EFCore.InMemory.FunctionalTests/Query/Ef6GroupByInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/Query/Ef6GroupByInMemoryTest.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 using Xunit;
@@ -15,65 +16,59 @@ public Ef6GroupByInMemoryTest(Ef6GroupByInMemoryFixture fixture, ITestOutputHelp
         {
         }
 
-        [ConditionalTheory (Skip = "Could not be translated.")]
-        public override async Task Grouping_by_all_columns_doesnt_produce_a_groupby_statement(bool async)
+        public override Task Average_Grouped_from_LINQ_101(bool async)
         {
-            await base.Grouping_by_all_columns_doesnt_produce_a_groupby_statement(async);
+            return AssertQuery(
+                async,
+                ss => from p in ss.Set<ProductForLinq>()
+                      group p by p.Category
+                      into g
+                      select new
+                      {
+                          Category = g.Key,
+                          AveragePrice = g.Average(p => p.UnitPrice)
+                      });
         }
 
-        [ConditionalTheory (Skip = "Could not be translated.")]
-        public override async Task Grouping_by_all_columns_with_aggregate_function_works_2(bool async)
-        {
-            await base.Grouping_by_all_columns_with_aggregate_function_works_2(async);
-        }
+        [ConditionalTheory (Skip = "Issue #17653")]
+        public override Task Grouping_by_all_columns_doesnt_produce_a_groupby_statement(bool async)
+            => Task.CompletedTask;
 
-        [ConditionalTheory (Skip = "Could not be translated.")]
-        public override async Task Grouping_by_all_columns_with_aggregate_function_works_3(bool async)
-        {
-            await base.Grouping_by_all_columns_with_aggregate_function_works_3(async);
-        }
+        [ConditionalTheory (Skip = "Issue #17653")]
+        public override Task Grouping_by_all_columns_with_aggregate_function_works_2(bool async)
+            => Task.CompletedTask;
 
-        [ConditionalTheory (Skip = "Could not be translated.")]
-        public override async Task Grouping_by_all_columns_with_aggregate_function_works_4(bool async)
-        {
-            await base.Grouping_by_all_columns_with_aggregate_function_works_4(async);
-        }
+        [ConditionalTheory (Skip = "Issue #17653")]
+        public override Task Grouping_by_all_columns_with_aggregate_function_works_3(bool async)
+            => Task.CompletedTask;
 
-        [ConditionalTheory (Skip = "Could not be translated.")]
-        public override async Task Grouping_by_all_columns_with_aggregate_function_works_5(bool async)
-        {
-            await base.Grouping_by_all_columns_with_aggregate_function_works_5(async);
-        }
+        [ConditionalTheory (Skip = "Issue #17653")]
+        public override Task Grouping_by_all_columns_with_aggregate_function_works_4(bool async)
+            => Task.CompletedTask;
 
-        [ConditionalTheory (Skip = "Could not be translated.")]
-        public override async Task Grouping_by_all_columns_with_aggregate_function_works_6(bool async)
-        {
-            await base.Grouping_by_all_columns_with_aggregate_function_works_6(async);
-        }
+        [ConditionalTheory (Skip = "Issue #17653")]
+        public override Task Grouping_by_all_columns_with_aggregate_function_works_5(bool async)
+            => Task.CompletedTask;
 
-        [ConditionalTheory (Skip = "Could not be translated.")]
-        public override async Task Grouping_by_all_columns_with_aggregate_function_works_7(bool async)
-        {
-            await base.Grouping_by_all_columns_with_aggregate_function_works_7(async);
-        }
+        [ConditionalTheory (Skip = "Issue #17653")]
+        public override Task Grouping_by_all_columns_with_aggregate_function_works_6(bool async)
+            => Task.CompletedTask;
 
-        [ConditionalTheory (Skip = "Could not be translated.")]
-        public override async Task Grouping_by_all_columns_with_aggregate_function_works_8(bool async)
-        {
-            await base.Grouping_by_all_columns_with_aggregate_function_works_8(async);
-        }
+        [ConditionalTheory (Skip = "Issue #17653")]
+        public override Task Grouping_by_all_columns_with_aggregate_function_works_7(bool async)
+            => Task.CompletedTask;
 
-        [ConditionalTheory (Skip = "Could not be translated.")]
-        public override async Task Grouping_by_all_columns_with_aggregate_function_works_9(bool async)
-        {
-            await base.Grouping_by_all_columns_with_aggregate_function_works_9(async);
-        }
+        [ConditionalTheory (Skip = "Issue #17653")]
+        public override Task Grouping_by_all_columns_with_aggregate_function_works_8(bool async)
+            => Task.CompletedTask;
 
-        [ConditionalTheory (Skip = "Could not be translated.")]
-        public override async Task Grouping_by_all_columns_with_aggregate_function_works_10(bool async)
-        {
-            await base.Grouping_by_all_columns_with_aggregate_function_works_10(async);
-        }
+        [ConditionalTheory (Skip = "Issue #17653")]
+        public override Task Grouping_by_all_columns_with_aggregate_function_works_9(bool async)
+            => Task.CompletedTask;
+
+        [ConditionalTheory (Skip = "Issue #17653")]
+        public override Task Grouping_by_all_columns_with_aggregate_function_works_10(bool async)
+            => Task.CompletedTask;
 
         public class Ef6GroupByInMemoryFixture : Ef6GroupByFixtureBase
         {