Query: Add regression test for nav expansion inside interpolated stri…

…ng (#16889) Resolves #16724
dotnet · Aug 1, 2019 · 8de388c · 8de388c
1 parent 0f8f19a
commit 8de388c
Show file tree

Hide file tree

Showing 6 changed files with 402 additions and 354 deletions.
diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/SimpleQueryCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/SimpleQueryCosmosTest.cs
@@ -4043,6 +4043,12 @@ public override Task Inner_parameter_in_nested_lambdas_gets_preserved(bool isAsy
             return base.Inner_parameter_in_nested_lambdas_gets_preserved(isAsync);
         }
 
+        [ConditionalTheory(Skip = "Issue #14935")]
+        public override Task Navigation_inside_interpolated_string_is_expanded(bool isAsync)
+        {
+            return base.Navigation_inside_interpolated_string_is_expanded(isAsync);
+        }
+
         private void AssertSql(params string[] expected)
             => Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
 

diff --git a/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs
@@ -7474,6 +7474,15 @@ public virtual Task DateTimeOffset_Contains_Less_than_Greater_than(bool isAsync)
                                     dates.Contains(m.Timeline)));
         }
 
+        [ConditionalTheory]  // issue #16724
+        [MemberData(nameof(IsAsyncData))]
+        public virtual Task Navigation_inside_interpolated_string_expanded(bool isAsync)
+        {
+            return AssertQuery<Weapon>(
+                isAsync,
+                ws => ws.Select(w => w.SynergyWithId.HasValue ? $"SynergyWithOwner: {w.SynergyWith.OwnerFullName}" : string.Empty));
+        }
+
         protected GearsOfWarContext CreateContext() => Fixture.CreateContext();
 
         protected virtual void ClearLog()