Not test left behind: Ef6GroupByTest

Part of #26088.
dotnet · Dec 12, 2021 · 93d7482 · 93d7482
1 parent 1fa736f
commit 93d7482
Show file tree

Hide file tree

Showing 5 changed files with 661 additions and 289 deletions.
diff --git a/test/EFCore.InMemory.FunctionalTests/Query/Ef6GroupByInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/Query/Ef6GroupByInMemoryTest.cs
@@ -20,46 +20,6 @@ group p by p.Category
                   into g
                   select new { Category = g.Key, AveragePrice = g.Average(p => p.UnitPrice) });
 
-    [ConditionalTheory(Skip = "Issue #17653")]
-    public override async Task Grouping_by_all_columns_doesnt_produce_a_groupby_statement(bool async)
-        => await base.Grouping_by_all_columns_doesnt_produce_a_groupby_statement(async);
-
-    [ConditionalTheory(Skip = "Issue #17653")]
-    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 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 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 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 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 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 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 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 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);
-
     public class Ef6GroupByInMemoryFixture : Ef6GroupByFixtureBase
     {
         protected override ITestStoreFactory TestStoreFactory

diff --git a/test/EFCore.Relational.Specification.Tests/TestUtilities/TestSqlLoggerFactory.cs b/test/EFCore.Relational.Specification.Tests/TestUtilities/TestSqlLoggerFactory.cs
@@ -148,18 +148,18 @@ public void AssertBaseline(string[] expected, bool assertOrder = true)
 
             lock (_queryBaselineFileLock)
             {
-                File.AppendAllText(logFile, contents);
-
-                // if (!_overriddenMethods.Any())
-                // {
-                //     File.Delete(logFile);
-                // }
-                //
-                // if (!_overriddenMethods.Contains(methodName))
-                // {
-                //     File.AppendAllText(logFile, overrideString);
-                //     _overriddenMethods.Add(methodName);
-                // }
+//                File.AppendAllText(logFile, contents);
+
+                if (!_overriddenMethods.Any())
+                {
+                    File.Delete(logFile);
+                }
+
+                if (!_overriddenMethods.Contains(methodName))
+                {
+                    File.AppendAllText(logFile, overrideString);
+                    _overriddenMethods.Add(methodName);
+                }
             }
 
             throw;