Tests: Make QueryAsserter a combined form of TestBase & Fixture confi…

…guration

- Introduce methods to rewrite server/expected queries on QueryTestBase
- Introduce QueryTestBase.IgnoreEntryCount to run same query with tracking/no tracking via rewritten form
- Introduce some relational test bases to verify execution of DbCommands
- Merge include asserter into query asserter
- Remove Include*Fixtures

test/EFCore.InMemory.FunctionalTests/Query/NorthwindIncludeQueryInMemoryTest.cs

@@ -2,14 +2,15 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore.TestUtilities;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace Microsoft.EntityFrameworkCore.Query
 {
-    public class NorthwindIncludeQueryInMemoryTest : NorthwindIncludeQueryTestBase<IncludeInMemoryFixture>
+    public class NorthwindIncludeQueryInMemoryTest : NorthwindIncludeQueryTestBase<NorthwindQueryInMemoryFixture<NoopModelCustomizer>>
     {
-        public NorthwindIncludeQueryInMemoryTest(IncludeInMemoryFixture fixture, ITestOutputHelper testOutputHelper)
+        public NorthwindIncludeQueryInMemoryTest(NorthwindQueryInMemoryFixture<NoopModelCustomizer> fixture, ITestOutputHelper testOutputHelper)
             : base(fixture)
         {
             //TestLoggerFactory.TestOutputHelper = testOutputHelper;

test/EFCore.Relational.Specification.Tests/Query/AsyncGearsOfWarQueryRelationalTestBase.cs

@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.EntityFrameworkCore.TestUtilities;
+
+namespace Microsoft.EntityFrameworkCore.Query
+{
+    public abstract class AsyncGearsOfWarQueryRelationalTestBase<TFixture> : AsyncGearsOfWarQueryTestBase<TFixture>
+        where TFixture : GearsOfWarQueryFixtureBase, new()
+    {
+        protected AsyncGearsOfWarQueryRelationalTestBase(TFixture fixture)
+            : base(fixture)
+        {
+        }
+
+        protected virtual bool CanExecuteQueryString => false;
+
+        protected override QueryAsserter CreateQueryAsserter(TFixture fixture)
+            => new RelationalQueryAsserter(fixture, RewriteExpectedQueryExpression, RewriteServerQueryExpression, canExecuteQueryString: CanExecuteQueryString);
+    }
+}

test/EFCore.Relational.Specification.Tests/Query/ComplexNavigationsQueryRelationalFixtureBase.cs

@@ -1,26 +1,12 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
-using System.Collections.Generic;
-using Microsoft.EntityFrameworkCore.TestModels.ComplexNavigationsModel;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 
 namespace Microsoft.EntityFrameworkCore.Query
 {
     public abstract class ComplexNavigationsQueryRelationalFixtureBase : ComplexNavigationsQueryFixtureBase
     {
         public TestSqlLoggerFactory TestSqlLoggerFactory => (TestSqlLoggerFactory)ListLoggerFactory;
-
-        protected override QueryAsserter<ComplexNavigationsContext> CreateQueryAsserter(
-            Dictionary<Type, object> entitySorters,
-            Dictionary<Type, object> entityAsserters)
-            => new RelationalQueryAsserter<ComplexNavigationsContext>(
-                CreateContext,
-                new ComplexNavigationsDefaultData(),
-                entitySorters,
-                entityAsserters,
-                CanExecuteQueryString,
-                CreateExpectedQueryRewritingVisitor());
     }
 }

test/EFCore.Relational.Specification.Tests/Query/ComplexNavigationsQueryRelationalTestBase.cs

@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.EntityFrameworkCore.TestUtilities;
+
+namespace Microsoft.EntityFrameworkCore.Query
+{
+    public abstract class ComplexNavigationsQueryRelationalTestBase<TFixture> : ComplexNavigationsQueryTestBase<TFixture>
+        where TFixture : ComplexNavigationsQueryFixtureBase, new()
+    {
+        protected ComplexNavigationsQueryRelationalTestBase(TFixture fixture)
+            : base(fixture)
+        {
+        }
+
+        protected virtual bool CanExecuteQueryString => false;
+
+        protected override QueryAsserter CreateQueryAsserter(TFixture fixture)
+            => new RelationalQueryAsserter(fixture, RewriteExpectedQueryExpression, RewriteServerQueryExpression, canExecuteQueryString: CanExecuteQueryString);
+    }
+}

test/EFCore.Relational.Specification.Tests/Query/GearsOfWarQueryRelationalFixture.cs

@@ -1,9 +1,6 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
-using System.Collections.Generic;
-using Microsoft.EntityFrameworkCore.TestModels.GearsOfWarModel;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 
 namespace Microsoft.EntityFrameworkCore.Query
@@ -16,15 +13,5 @@ public abstract class GearsOfWarQueryRelationalFixture : GearsOfWarQueryFixtureB
 
         protected override bool ShouldLogCategory(string logCategory)
             => logCategory == DbLoggerCategory.Query.Name;
-
-        protected override QueryAsserter<GearsOfWarContext> CreateQueryAsserter(
-            Dictionary<Type, object> entitySorters,
-            Dictionary<Type, object> entityAsserters)
-            => new RelationalQueryAsserter<GearsOfWarContext>(
-                CreateContext,
-                new GearsOfWarData(),
-                entitySorters,
-                entityAsserters,
-                CanExecuteQueryString);
     }
 }

test/EFCore.Relational.Specification.Tests/Query/GearsOfWarQueryRelationalTestBase.cs

@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.EntityFrameworkCore.TestUtilities;
+
+namespace Microsoft.EntityFrameworkCore.Query
+{
+    public abstract class GearsOfWarQueryRelationalTestBase<TFixture> : GearsOfWarQueryTestBase<TFixture>
+        where TFixture : GearsOfWarQueryFixtureBase, new()
+    {
+        protected GearsOfWarQueryRelationalTestBase(TFixture fixture)
+            : base(fixture)
+        {
+        }
+
+        protected virtual bool CanExecuteQueryString => false;
+
+        protected override QueryAsserter CreateQueryAsserter(TFixture fixture)
+            => new RelationalQueryAsserter(fixture, RewriteExpectedQueryExpression, RewriteServerQueryExpression, canExecuteQueryString: CanExecuteQueryString);
+    }
+}

test/EFCore.Relational.Specification.Tests/Query/ManyToManyQueryRelationalFixture.cs

@@ -1,25 +1,12 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
-using System.Collections.Generic;
-using Microsoft.EntityFrameworkCore.TestModels.ManyToManyModel;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 
 namespace Microsoft.EntityFrameworkCore.Query
 {
     public abstract class ManyToManyQueryRelationalFixture : ManyToManyQueryFixtureBase
     {
         public TestSqlLoggerFactory TestSqlLoggerFactory => (TestSqlLoggerFactory)ListLoggerFactory;
-
-        protected override QueryAsserter<ManyToManyContext> CreateQueryAsserter(
-            Dictionary<Type, object> entitySorters,
-            Dictionary<Type, object> entityAsserters)
-            => new RelationalQueryAsserter<ManyToManyContext>(
-                CreateContext,
-                new ManyToManyData(),
-                entitySorters,
-                entityAsserters,
-                CanExecuteQueryString);
     }
 }

test/EFCore.Relational.Specification.Tests/Query/ManyToManyQueryRelationalTestBase.cs

@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.EntityFrameworkCore.TestUtilities;
+
+namespace Microsoft.EntityFrameworkCore.Query
+{
+    public abstract class ManyToManyQueryRelationalTestBase<TFixture> : ManyToManyQueryTestBase<TFixture>
+        where TFixture : ManyToManyQueryFixtureBase, new()
+    {
+        protected ManyToManyQueryRelationalTestBase(TFixture fixture)
+            : base(fixture)
+        {
+        }
+
+        protected virtual bool CanExecuteQueryString => false;
+
+        protected override QueryAsserter CreateQueryAsserter(TFixture fixture)
+            => new RelationalQueryAsserter(fixture, RewriteExpectedQueryExpression, RewriteServerQueryExpression, canExecuteQueryString: CanExecuteQueryString);
+    }
+}

test/EFCore.Relational.Specification.Tests/Query/NorthwindAggregateOperatorsQueryRelationalTestBase.cs

@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.EntityFrameworkCore.TestUtilities;
+
+namespace Microsoft.EntityFrameworkCore.Query
+{
+    public abstract class NorthwindAggregateOperatorsQueryRelationalTestBase<TFixture> : NorthwindAggregateOperatorsQueryTestBase<TFixture>
+        where TFixture : NorthwindQueryFixtureBase<NoopModelCustomizer>, new()
+    {
+        protected NorthwindAggregateOperatorsQueryRelationalTestBase(TFixture fixture)
+            : base(fixture)
+        {
+        }
+
+        protected virtual bool CanExecuteQueryString => false;
+
+        protected override QueryAsserter CreateQueryAsserter(TFixture fixture)
+            => new RelationalQueryAsserter(fixture, RewriteExpectedQueryExpression, RewriteServerQueryExpression, canExecuteQueryString: CanExecuteQueryString);
+    }
+}

test/EFCore.Relational.Specification.Tests/Query/NorthwindAsyncSimpleQueryRelationalTestBase.cs

@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.EntityFrameworkCore.TestUtilities;
+
+namespace Microsoft.EntityFrameworkCore.Query
+{
+    public abstract class NorthwindAsyncSimpleQueryRelationalTestBase<TFixture> : NorthwindAsyncSimpleQueryTestBase<TFixture>
+        where TFixture : NorthwindQueryFixtureBase<NoopModelCustomizer>, new()
+    {
+        protected NorthwindAsyncSimpleQueryRelationalTestBase(TFixture fixture)
+            : base(fixture)
+        {
+        }
+
+        protected virtual bool CanExecuteQueryString => false;
+
+        protected override QueryAsserter CreateQueryAsserter(TFixture fixture)
+            => new RelationalQueryAsserter(fixture, RewriteExpectedQueryExpression, RewriteServerQueryExpression, canExecuteQueryString: CanExecuteQueryString);
+    }
+}

test/EFCore.Relational.Specification.Tests/Query/NorthwindFunctionsQueryRelationalTestBase.cs

@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.EntityFrameworkCore.TestUtilities;
+
+namespace Microsoft.EntityFrameworkCore.Query
+{
+    public abstract class NorthwindFunctionsQueryRelationalTestBase<TFixture> : NorthwindFunctionsQueryTestBase<TFixture>
+        where TFixture : NorthwindQueryFixtureBase<NoopModelCustomizer>, new()
+    {
+        protected NorthwindFunctionsQueryRelationalTestBase(TFixture fixture)
+            : base(fixture)
+        {
+        }
+
+        protected virtual bool CanExecuteQueryString => false;
+
+        protected override QueryAsserter CreateQueryAsserter(TFixture fixture)
+            => new RelationalQueryAsserter(fixture, RewriteExpectedQueryExpression, RewriteServerQueryExpression, canExecuteQueryString: CanExecuteQueryString);
+    }
+}

test/EFCore.Relational.Specification.Tests/Query/NorthwindGroupByQueryRelationalTestBase.cs

@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.EntityFrameworkCore.TestUtilities;
+
+namespace Microsoft.EntityFrameworkCore.Query
+{
+    public abstract class NorthwindGroupByQueryRelationalTestBase<TFixture> : NorthwindGroupByQueryTestBase<TFixture>
+        where TFixture : NorthwindQueryFixtureBase<NoopModelCustomizer>, new()
+    {
+        protected NorthwindGroupByQueryRelationalTestBase(TFixture fixture)
+            : base(fixture)
+        {
+        }
+
+        protected virtual bool CanExecuteQueryString => false;
+
+        protected override QueryAsserter CreateQueryAsserter(TFixture fixture)
+            => new RelationalQueryAsserter(fixture, RewriteExpectedQueryExpression, RewriteServerQueryExpression, canExecuteQueryString: CanExecuteQueryString);
+    }
+}

test/EFCore.Relational.Specification.Tests/Query/NorthwindIncludeQueryRelationalTestBase.cs

@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.EntityFrameworkCore.TestUtilities;
+
+namespace Microsoft.EntityFrameworkCore.Query
+{
+    public abstract class NorthwindIncludeQueryRelationalTestBase<TFixture> : NorthwindIncludeQueryTestBase<TFixture>
+        where TFixture : NorthwindQueryFixtureBase<NoopModelCustomizer>, new()
+    {
+        protected NorthwindIncludeQueryRelationalTestBase(TFixture fixture)
+            : base(fixture)
+        {
+        }
+
+        protected virtual bool CanExecuteQueryString => false;
+
+        protected override QueryAsserter CreateQueryAsserter(TFixture fixture)
+            => new RelationalQueryAsserter(fixture, RewriteExpectedQueryExpression, RewriteServerQueryExpression, canExecuteQueryString: CanExecuteQueryString);
+    }
+}

test/EFCore.Relational.Specification.Tests/Query/NorthwindJoinQueryRelationalTestBase.cs

@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.EntityFrameworkCore.TestUtilities;
+
+namespace Microsoft.EntityFrameworkCore.Query
+{
+    public abstract class NorthwindJoinQueryRelationalTestBase<TFixture> : NorthwindJoinQueryTestBase<TFixture>
+        where TFixture : NorthwindQueryFixtureBase<NoopModelCustomizer>, new()
+    {
+        protected NorthwindJoinQueryRelationalTestBase(TFixture fixture)
+            : base(fixture)
+        {
+        }
+
+        protected virtual bool CanExecuteQueryString => false;
+
+        protected override QueryAsserter CreateQueryAsserter(TFixture fixture)
+            => new RelationalQueryAsserter(fixture, RewriteExpectedQueryExpression, RewriteServerQueryExpression, canExecuteQueryString: CanExecuteQueryString);
+    }
+}

test/EFCore.Relational.Specification.Tests/Query/NorthwindKeylessEntitiesQueryRelationalTestBase.cs

@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.EntityFrameworkCore.TestUtilities;
+
+namespace Microsoft.EntityFrameworkCore.Query
+{
+    public abstract class NorthwindKeylessEntitiesQueryRelationalTestBase<TFixture> : NorthwindKeylessEntitiesQueryTestBase<TFixture>
+        where TFixture : NorthwindQueryFixtureBase<NoopModelCustomizer>, new()
+    {
+        protected NorthwindKeylessEntitiesQueryRelationalTestBase(TFixture fixture)
+            : base(fixture)
+        {
+        }
+
+        protected virtual bool CanExecuteQueryString => false;
+
+        protected override QueryAsserter CreateQueryAsserter(TFixture fixture)
+            => new RelationalQueryAsserter(fixture, RewriteExpectedQueryExpression, RewriteServerQueryExpression, canExecuteQueryString: CanExecuteQueryString);
+    }
+}

test/EFCore.Relational.Specification.Tests/Query/NorthwindMiscellaneousQueryRelationalTestBase.cs

@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.EntityFrameworkCore.TestUtilities;
+
+namespace Microsoft.EntityFrameworkCore.Query
+{
+    public abstract class NorthwindMiscellaneousQueryRelationalTestBase<TFixture> : NorthwindMiscellaneousQueryTestBase<TFixture>
+        where TFixture : NorthwindQueryFixtureBase<NoopModelCustomizer>, new()
+    {
+        protected NorthwindMiscellaneousQueryRelationalTestBase(TFixture fixture)
+            : base(fixture)
+        {
+        }
+
+        protected virtual bool CanExecuteQueryString => false;
+
+        protected override QueryAsserter CreateQueryAsserter(TFixture fixture)
+            => new RelationalQueryAsserter(fixture, RewriteExpectedQueryExpression, RewriteServerQueryExpression, canExecuteQueryString: CanExecuteQueryString);
+    }
+}

test/EFCore.Relational.Specification.Tests/Query/NorthwindNavigationsQueryRelationalTestBase.cs

@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.EntityFrameworkCore.TestUtilities;
+
+namespace Microsoft.EntityFrameworkCore.Query
+{
+    public abstract class NorthwindNavigationsQueryRelationalTestBase<TFixture> : NorthwindNavigationsQueryTestBase<TFixture>
+        where TFixture : NorthwindQueryFixtureBase<NoopModelCustomizer>, new()
+    {
+        protected NorthwindNavigationsQueryRelationalTestBase(TFixture fixture)
+            : base(fixture)
+        {
+        }
+
+        protected virtual bool CanExecuteQueryString => false;
+
+        protected override QueryAsserter CreateQueryAsserter(TFixture fixture)
+            => new RelationalQueryAsserter(fixture, RewriteExpectedQueryExpression, RewriteServerQueryExpression, canExecuteQueryString: CanExecuteQueryString);
+    }
+}