From 0d76ab29200be35b220dba90a5509691af604ab3 Mon Sep 17 00:00:00 2001 From: Smit Patel Date: Thu, 1 Aug 2019 09:58:04 -0700 Subject: [PATCH] Query: Merge processing of eager loaded include with normal include Resolves #16619 This avoids issue of adding includes when includes are not part of projection. Fixed in new nav rewrite --- .../Query/OwnedQueryCosmosTest.cs | 3 --- test/EFCore.Specification.Tests/Query/OwnedQueryTestBase.cs | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/OwnedQueryCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/OwnedQueryCosmosTest.cs index 0fcbe10de1d..8bc6747bd36 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/OwnedQueryCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/OwnedQueryCosmosTest.cs @@ -221,9 +221,6 @@ public override void No_ignored_include_warning_when_implicit_load() private void AssertSql(params string[] expected) => Fixture.TestSqlLoggerFactory.AssertBaseline(expected); - private void AssertContainsSql(params string[] expected) - => Fixture.TestSqlLoggerFactory.AssertBaseline(expected, assertOrder: false); - private void ClearLog() => Fixture.TestSqlLoggerFactory.Clear(); diff --git a/test/EFCore.Specification.Tests/Query/OwnedQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/OwnedQueryTestBase.cs index 6c08f6656f9..ecf2c5a7371 100644 --- a/test/EFCore.Specification.Tests/Query/OwnedQueryTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/OwnedQueryTestBase.cs @@ -92,7 +92,7 @@ public virtual void Query_for_base_type_loads_all_owned_navs() } } - [ConditionalFact(Skip = "Issue#16619")] + [ConditionalFact] public virtual void No_ignored_include_warning_when_implicit_load() { using (var context = CreateContext())