Query: Enable test for complex case of null removal (#22216)

Resolves #17020 It is already fixed in some earlier commit
dotnet · Aug 25, 2020 · 340db2f · 340db2f
1 parent 7cfa858
commit 340db2f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/test/EFCore.Specification.Tests/Query/ComplexNavigationsQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/ComplexNavigationsQueryTestBase.cs
@@ -4620,7 +4620,7 @@ public virtual Task Include_multiple_collections_on_same_level(bool async)
                 assertOrder: true);
         }
 
-        [ConditionalTheory(Skip = "Issue#17020")]
+        [ConditionalTheory]
         [MemberData(nameof(IsAsyncData))]
         public virtual Task Null_check_removal_applied_recursively(bool async)
         {

diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsQuerySqlServerTest.cs
@@ -4179,7 +4179,13 @@ public override async Task Null_check_removal_applied_recursively(bool async)
         {
             await base.Null_check_removal_applied_recursively(async);
 
-            AssertSql(" ");
+            AssertSql(
+                @"SELECT [l].[Id], [l].[Date], [l].[Name], [l].[OneToMany_Optional_Self_Inverse1Id], [l].[OneToMany_Required_Self_Inverse1Id], [l].[OneToOne_Optional_Self1Id]
+FROM [LevelOne] AS [l]
+LEFT JOIN [LevelTwo] AS [l0] ON [l].[Id] = [l0].[Level1_Optional_Id]
+LEFT JOIN [LevelThree] AS [l1] ON [l0].[Id] = [l1].[Level2_Optional_Id]
+LEFT JOIN [LevelFour] AS [l2] ON [l1].[Id] = [l2].[Level3_Optional_Id]
+WHERE [l2].[Name] = N'L4 01'");
         }
 
         public override async Task Null_check_different_structure_does_not_remove_null_checks(bool async)