Query: Re-enable tests for issue#16622 (#16890)

Fixed by new nav rewrite Resolves #16622
dotnet · Aug 1, 2019 · c2dfa4b · c2dfa4b
1 parent 8de388c
commit c2dfa4b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/test/EFCore.Specification.Tests/LazyLoadProxyTestBase.cs b/test/EFCore.Specification.Tests/LazyLoadProxyTestBase.cs
@@ -1844,7 +1844,7 @@ public virtual void Lazy_loading_finds_correct_entity_type_with_opaque_predicate
             }
         }
 
-        [ConditionalFact(Skip = "Issue#16622")]
+        [ConditionalFact]
         public virtual void Lazy_loading_finds_correct_entity_type_with_multiple_queries_using_Count()
         {
             using (var context = CreateContext(lazyLoadingEnabled: true))

diff --git a/test/EFCore.Specification.Tests/Query/OwnedQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/OwnedQueryTestBase.cs
@@ -308,7 +308,7 @@ public virtual void Project_multiple_owned_navigations_with_expansion_on_owned_c
             }
         }
 
-        [ConditionalFact(Skip = "Issue#16622")]
+        [ConditionalFact]
         public virtual void Navigation_rewrite_on_owned_reference_followed_by_regular_entity_filter()
         {
             using (var ctx = CreateContext())

diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/OwnedQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/OwnedQuerySqlServerTest.cs
@@ -356,7 +356,18 @@ public override void Navigation_rewrite_on_owned_reference_followed_by_regular_e
             base.Navigation_rewrite_on_owned_reference_followed_by_regular_entity_filter();
 
             AssertSql(
-                @"");
+                @"SELECT [o].[Id], [o].[Discriminator], [o0].[Id], [o1].[Id], [o1].[PersonAddress_Country_Name], [o1].[PersonAddress_Country_PlanetId], [o2].[Id], [o3].[Id], [o3].[BranchAddress_Country_Name], [o3].[BranchAddress_Country_PlanetId], [o4].[Id], [o5].[Id], [o5].[LeafBAddress_Country_Name], [o5].[LeafBAddress_Country_PlanetId], [o6].[Id], [o7].[Id], [o7].[LeafAAddress_Country_Name], [o7].[LeafAAddress_Country_PlanetId]
+FROM [OwnedPerson] AS [o]
+LEFT JOIN [OwnedPerson] AS [o0] ON [o].[Id] = [o0].[Id]
+LEFT JOIN [OwnedPerson] AS [o1] ON [o0].[Id] = [o1].[Id]
+LEFT JOIN [Planet] AS [p] ON [o1].[PersonAddress_Country_PlanetId] = [p].[Id]
+LEFT JOIN [OwnedPerson] AS [o2] ON [o].[Id] = [o2].[Id]
+LEFT JOIN [OwnedPerson] AS [o3] ON [o2].[Id] = [o3].[Id]
+LEFT JOIN [OwnedPerson] AS [o4] ON [o].[Id] = [o4].[Id]
+LEFT JOIN [OwnedPerson] AS [o5] ON [o4].[Id] = [o5].[Id]
+LEFT JOIN [OwnedPerson] AS [o6] ON [o].[Id] = [o6].[Id]
+LEFT JOIN [OwnedPerson] AS [o7] ON [o6].[Id] = [o7].[Id]
+WHERE [o].[Discriminator] IN (N'OwnedPerson', N'Branch', N'LeafB', N'LeafA') AND (([p].[Id] <> 7) OR [p].[Id] IS NULL)");
         }
 
         public override void Navigation_rewrite_on_owned_reference_followed_by_regular_entity_and_property()