From fb8fc9e594191ea1d323e3021a9460918f07838c Mon Sep 17 00:00:00 2001 From: Shay Rojansky Date: Thu, 31 Oct 2019 12:58:11 +0100 Subject: [PATCH] Fix some non-determinism in tests --- test/EFCore.Specification.Tests/Query/GroupByQueryTestBase.cs | 4 +++- .../Query/GroupByQuerySqlServerTest.cs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/EFCore.Specification.Tests/Query/GroupByQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/GroupByQueryTestBase.cs index 9daae52242b..153327ae306 100644 --- a/test/EFCore.Specification.Tests/Query/GroupByQueryTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/GroupByQueryTestBase.cs @@ -258,7 +258,7 @@ public virtual Task GroupBy_aggregate_projecting_conditional_expression(bool isA ss => ss.Set().GroupBy(o => o.OrderDate).Select( g => new { g.Key, SomeValue = g.Count() == 0 ? 1 : g.Sum(o => o.OrderID % 2 == 0 ? 1 : 0) / g.Count() }), - e => e.SomeValue); + e => (e.Key, e.SomeValue)); } [ConditionalTheory] @@ -1948,8 +1948,10 @@ public virtual Task GroupBy_with_order_by_skip_and_another_order_by(bool isAsync isAsync, ss => ss.Set() .OrderBy(o => o.CustomerID) + .ThenBy(o => o.OrderID) .Skip(80) .OrderBy(o => o.CustomerID) + .ThenBy(o => o.OrderID) .GroupBy(o => o.CustomerID) .Select(g => g.Sum(o => o.OrderID)) ); diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/GroupByQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/GroupByQuerySqlServerTest.cs index c1fe0e3a44e..36651bdbfb1 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/GroupByQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/GroupByQuerySqlServerTest.cs @@ -2110,7 +2110,7 @@ SELECT SUM([t].[OrderID]) FROM ( SELECT [o].[OrderID], [o].[CustomerID], [o].[EmployeeID], [o].[OrderDate] FROM [Orders] AS [o] - ORDER BY [o].[CustomerID] + ORDER BY [o].[CustomerID], [o].[OrderID] OFFSET @__p_0 ROWS ) AS [t] GROUP BY [t].[CustomerID]");