Skip to content

More relationship test fixes #35942

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roji merged 2 commits into from
Apr 12, 2025
Merged

More relationship test fixes #35942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83a711c
Remove some ordering assumptions in the relationship tests
roji Apr 12, 2025
2aa3c41
Added missing SQL baselines to relationship tests
roji Apr 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions test/EFCore.Specification.Tests/Query/Relationships/Include/NavigationIncludeTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ public virtual Task Include_trunk_optional(bool async)
=> AssertQuery(
async,
ss => ss.Set<RelationshipsRootEntity>().Include(x => x.OptionalReferenceTrunk),
assertOrder: true,
elementAsserter: (e, a) => AssertInclude(e, a, new ExpectedInclude<RelationshipsRootEntity>(x => x.OptionalReferenceTrunk!)));

[ConditionalTheory]
Expand All @@ -34,7 +33,6 @@ public virtual Task Include_trunk_collection(bool async)
=> AssertQuery(
async,
ss => ss.Set<RelationshipsRootEntity>().Include(x => x.CollectionTrunk),
assertOrder: true,
elementAsserter: (e, a) => AssertInclude(e, a, new ExpectedInclude<RelationshipsRootEntity>(x => x.CollectionTrunk)));

[ConditionalTheory]
Expand All @@ -60,7 +58,6 @@ public virtual Task Include_branch_required_required(bool async)
=> AssertQuery(
async,
ss => ss.Set<RelationshipsRootEntity>().Include(x => x.RequiredReferenceTrunk.RequiredReferenceBranch),
assertOrder: true,
elementAsserter: (e, a) => AssertInclude(
e,
a,
Expand All @@ -73,7 +70,6 @@ public virtual Task Include_branch_required_collection(bool async)
=> AssertQuery(
async,
ss => ss.Set<RelationshipsRootEntity>().Include(x => x.RequiredReferenceTrunk.CollectionBranch),
assertOrder: true,
elementAsserter: (e, a) => AssertInclude(
e,
a,
Expand All @@ -86,7 +82,6 @@ public virtual Task Include_branch_optional_optional(bool async)
=> AssertQuery(
async,
ss => ss.Set<RelationshipsRootEntity>().Include(x => x.OptionalReferenceTrunk!.OptionalReferenceBranch),
assertOrder: true,
elementAsserter: (e, a) => AssertInclude(
e,
a,
Expand All @@ -99,7 +94,6 @@ public virtual Task Include_branch_optional_collection(bool async)
=> AssertQuery(
async,
ss => ss.Set<RelationshipsRootEntity>().Include(x => x.OptionalReferenceTrunk!.CollectionBranch),
assertOrder: true,
elementAsserter: (e, a) => AssertInclude(
e,
a,
Expand All @@ -112,7 +106,6 @@ public virtual Task Include_branch_collection_collection(bool async)
=> AssertQuery(
async,
ss => ss.Set<RelationshipsRootEntity>().Include(x => x.CollectionTrunk).ThenInclude(x => x.CollectionBranch),
assertOrder: true,
elementAsserter: (e, a) => AssertInclude(
e,
a,
Expand Down
8 changes: 6 additions & 2 deletions test/EFCore.Specification.Tests/Query/Relationships/OwnedRelationshipsFixtureBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,9 +507,11 @@ public static void AssertOwnedTrunk(RelationshipsTrunkEntity expected, Relations
}

Assert.Equal(expected.CollectionBranch.Count, actual.CollectionBranch?.Count ?? 0);
var expectedCollection = expected.CollectionBranch.OrderBy(e => e.Name).ToList();
var actualCollection = actual.CollectionBranch is null ? [] : actual.CollectionBranch.OrderBy(e => e.Name).ToList();
for (var i = 0; i < expected.CollectionBranch.Count; i++)
{
AssertOwnedBranch(expected.CollectionBranch[i], actual.CollectionBranch![i]);
AssertOwnedBranch(expectedCollection[i], actualCollection![i]);
}
}

Expand All @@ -526,9 +528,11 @@ public static void AssertOwnedBranch(RelationshipsBranchEntity expected, Relatio
}

Assert.Equal(expected.CollectionLeaf.Count, actual.CollectionLeaf?.Count ?? 0);
var expectedCollection = expected.CollectionLeaf.OrderBy(e => e.Name).ToList();
var actualCollection = actual.CollectionLeaf is null ? [] : actual.CollectionLeaf.OrderBy(e => e.Name).ToList();
for (var i = 0; i < expected.CollectionLeaf.Count; i++)
{
AssertOwnedLeaf(expected.CollectionLeaf[i], actual.CollectionLeaf![i]);
AssertOwnedLeaf(expectedCollection[i], actualCollection![i]);
}
}

Expand Down
4 changes: 2 additions & 2 deletions test/EFCore.Specification.Tests/Query/Relationships/Projection/ProjectionTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ public virtual Task Select_multiple_branch_leaf(bool async)
Assert.Equal(e.Id, a.Id);
AssertEqual(e.RequiredReferenceBranch, a.RequiredReferenceBranch);
AssertEqual(e.OptionalReferenceLeaf, a.OptionalReferenceLeaf);
AssertCollection(e.CollectionLeaf, a.CollectionLeaf, ordered: true);
AssertCollection(e.CollectionBranch, a.CollectionBranch, ordered: true);
AssertCollection(e.CollectionLeaf, a.CollectionLeaf, ordered: false);
AssertCollection(e.CollectionBranch, a.CollectionBranch, ordered: false);
Assert.Equal(e.Name, a.Name);
});

Expand Down
115 changes: 115 additions & 0 deletions ...e.SqlServer.FunctionalTests/Query/Relationships/Include/NavigationIncludeSqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,18 @@ public NavigationIncludeSqlServerTest(NavigationRelationshipsSqlServerFixture fi
Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);
}

public override async Task Include_trunk_required(bool async)
{
await base.Include_trunk_required(async);

AssertSql(
"""
SELECT [r].[Id], [r].[Name], [r].[OptionalReferenceTrunkId], [r].[RequiredReferenceTrunkId], [t].[Id], [t].[CollectionRootId], [t].[Name], [t].[OptionalReferenceBranchId], [t].[RequiredReferenceBranchId]
FROM [RootEntities] AS [r]
INNER JOIN [TrunkEntities] AS [t] ON [r].[RequiredReferenceTrunkId] = [t].[Id]
""");
}

public override async Task Include_trunk_optional(bool async)
{
await base.Include_trunk_optional(async);
Expand All @@ -25,6 +37,109 @@ FROM [RootEntities] AS [r]
""");
}

public override async Task Include_trunk_collection(bool async)
{
await base.Include_trunk_collection(async);

AssertSql(
"""
SELECT [r].[Id], [r].[Name], [r].[OptionalReferenceTrunkId], [r].[RequiredReferenceTrunkId], [t].[Id], [t].[CollectionRootId], [t].[Name], [t].[OptionalReferenceBranchId], [t].[RequiredReferenceBranchId]
FROM [RootEntities] AS [r]
LEFT JOIN [TrunkEntities] AS [t] ON [r].[Id] = [t].[CollectionRootId]
ORDER BY [r].[Id]
""");
}

public override async Task Include_trunk_required_optional_and_collection(bool async)
{
await base.Include_trunk_required_optional_and_collection(async);

AssertSql(
"""
SELECT [r].[Id], [r].[Name], [r].[OptionalReferenceTrunkId], [r].[RequiredReferenceTrunkId], [t].[Id], [t].[CollectionRootId], [t].[Name], [t].[OptionalReferenceBranchId], [t].[RequiredReferenceBranchId], [t0].[Id], [t0].[CollectionRootId], [t0].[Name], [t0].[OptionalReferenceBranchId], [t0].[RequiredReferenceBranchId], [t1].[Id], [t1].[CollectionRootId], [t1].[Name], [t1].[OptionalReferenceBranchId], [t1].[RequiredReferenceBranchId]
FROM [RootEntities] AS [r]
INNER JOIN [TrunkEntities] AS [t] ON [r].[RequiredReferenceTrunkId] = [t].[Id]
LEFT JOIN [TrunkEntities] AS [t0] ON [r].[OptionalReferenceTrunkId] = [t0].[Id]
LEFT JOIN [TrunkEntities] AS [t1] ON [r].[Id] = [t1].[CollectionRootId]
ORDER BY [r].[Id], [t].[Id], [t0].[Id]
""");
}

public override async Task Include_branch_required_required(bool async)
{
await base.Include_branch_required_required(async);

AssertSql(
"""
SELECT [r].[Id], [r].[Name], [r].[OptionalReferenceTrunkId], [r].[RequiredReferenceTrunkId], [t].[Id], [t].[CollectionRootId], [t].[Name], [t].[OptionalReferenceBranchId], [t].[RequiredReferenceBranchId], [b].[Id], [b].[CollectionTrunkId], [b].[Name], [b].[OptionalReferenceLeafId], [b].[RequiredReferenceLeafId]
FROM [RootEntities] AS [r]
INNER JOIN [TrunkEntities] AS [t] ON [r].[RequiredReferenceTrunkId] = [t].[Id]
INNER JOIN [BranchEntities] AS [b] ON [t].[RequiredReferenceBranchId] = [b].[Id]
""");
}

public override async Task Include_branch_required_collection(bool async)
{
await base.Include_branch_required_collection(async);

AssertSql(
"""
SELECT [r].[Id], [r].[Name], [r].[OptionalReferenceTrunkId], [r].[RequiredReferenceTrunkId], [t].[Id], [t].[CollectionRootId], [t].[Name], [t].[OptionalReferenceBranchId], [t].[RequiredReferenceBranchId], [b].[Id], [b].[CollectionTrunkId], [b].[Name], [b].[OptionalReferenceLeafId], [b].[RequiredReferenceLeafId]
FROM [RootEntities] AS [r]
INNER JOIN [TrunkEntities] AS [t] ON [r].[RequiredReferenceTrunkId] = [t].[Id]
LEFT JOIN [BranchEntities] AS [b] ON [t].[Id] = [b].[CollectionTrunkId]
ORDER BY [r].[Id], [t].[Id]
""");
}

public override async Task Include_branch_optional_optional(bool async)
{
await base.Include_branch_optional_optional(async);

AssertSql(
"""
SELECT [r].[Id], [r].[Name], [r].[OptionalReferenceTrunkId], [r].[RequiredReferenceTrunkId], [t].[Id], [t].[CollectionRootId], [t].[Name], [t].[OptionalReferenceBranchId], [t].[RequiredReferenceBranchId], [b].[Id], [b].[CollectionTrunkId], [b].[Name], [b].[OptionalReferenceLeafId], [b].[RequiredReferenceLeafId]
FROM [RootEntities] AS [r]
LEFT JOIN [TrunkEntities] AS [t] ON [r].[OptionalReferenceTrunkId] = [t].[Id]
LEFT JOIN [BranchEntities] AS [b] ON [t].[OptionalReferenceBranchId] = [b].[Id]
""");
}

public override async Task Include_branch_optional_collection(bool async)
{
await base.Include_branch_optional_collection(async);

AssertSql(
"""
SELECT [r].[Id], [r].[Name], [r].[OptionalReferenceTrunkId], [r].[RequiredReferenceTrunkId], [t].[Id], [t].[CollectionRootId], [t].[Name], [t].[OptionalReferenceBranchId], [t].[RequiredReferenceBranchId], [b].[Id], [b].[CollectionTrunkId], [b].[Name], [b].[OptionalReferenceLeafId], [b].[RequiredReferenceLeafId]
FROM [RootEntities] AS [r]
LEFT JOIN [TrunkEntities] AS [t] ON [r].[OptionalReferenceTrunkId] = [t].[Id]
LEFT JOIN [BranchEntities] AS [b] ON [t].[Id] = [b].[CollectionTrunkId]
ORDER BY [r].[Id], [t].[Id]
""");
}

public override async Task Include_branch_collection_collection(bool async)
{
await base.Include_branch_collection_collection(async);

AssertSql(
"""
SELECT [r].[Id], [r].[Name], [r].[OptionalReferenceTrunkId], [r].[RequiredReferenceTrunkId], [s].[Id], [s].[CollectionRootId], [s].[Name], [s].[OptionalReferenceBranchId], [s].[RequiredReferenceBranchId], [s].[Id0], [s].[CollectionTrunkId], [s].[Name0], [s].[OptionalReferenceLeafId], [s].[RequiredReferenceLeafId]
FROM [RootEntities] AS [r]
LEFT JOIN (
SELECT [t].[Id], [t].[CollectionRootId], [t].[Name], [t].[OptionalReferenceBranchId], [t].[RequiredReferenceBranchId], [b].[Id] AS [Id0], [b].[CollectionTrunkId], [b].[Name] AS [Name0], [b].[OptionalReferenceLeafId], [b].[RequiredReferenceLeafId]
FROM [TrunkEntities] AS [t]
LEFT JOIN [BranchEntities] AS [b] ON [t].[Id] = [b].[CollectionTrunkId]
) AS [s] ON [r].[Id] = [s].[CollectionRootId]
ORDER BY [r].[Id], [s].[Id]
""");
}

[ConditionalFact]
public virtual void Check_all_tests_overridden()
=> TestHelpers.AssertAllMethodsOverridden(GetType());

private void AssertSql(params string[] expected)
=> Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
}
4 changes: 4 additions & 0 deletions ...unctionalTests/Query/Relationships/Projection/ComplexNoTrackingProjectionSqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,10 @@ public override async Task Select_subquery_root_set_optional_trunk_FirstOrDefaul
AssertSql();
}

[ConditionalFact]
public virtual void Check_all_tests_overridden()
=> TestHelpers.AssertAllMethodsOverridden(GetType());

private void AssertSql(params string[] expected)
=> Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
}
4 changes: 4 additions & 0 deletions ...qlServer.FunctionalTests/Query/Relationships/Projection/ComplexProjectionSqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,10 @@ public override async Task Select_subquery_root_set_optional_trunk_FirstOrDefaul
AssertSql();
}

[ConditionalFact]
public virtual void Check_all_tests_overridden()
=> TestHelpers.AssertAllMethodsOverridden(GetType());

private void AssertSql(params string[] expected)
=> Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
}
4 changes: 4 additions & 0 deletions ...tionalTests/Query/Relationships/Projection/NavigationNoTrackingProjectionSqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,10 @@ FROM [RootEntities] AS [r]
""");
}

[ConditionalFact]
public virtual void Check_all_tests_overridden()
=> TestHelpers.AssertAllMethodsOverridden(GetType());

private void AssertSql(params string[] expected)
=> Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
}
4 changes: 4 additions & 0 deletions ...erver.FunctionalTests/Query/Relationships/Projection/NavigationProjectionSqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,10 @@ FROM [RootEntities] AS [r]
""");
}

[ConditionalFact]
public virtual void Check_all_tests_overridden()
=> TestHelpers.AssertAllMethodsOverridden(GetType());

private void AssertSql(params string[] expected)
=> Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
}
4 changes: 4 additions & 0 deletions ...ts/Query/Relationships/Projection/NavigationReferenceNoTrackingProjectionSqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,10 @@ ORDER BY [r].[Id]
""");
}

[ConditionalFact]
public virtual void Check_all_tests_overridden()
=> TestHelpers.AssertAllMethodsOverridden(GetType());

private void AssertSql(params string[] expected)
=> Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
}
4 changes: 4 additions & 0 deletions ...ctionalTests/Query/Relationships/Projection/NavigationReferenceProjectionSqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,10 @@ ORDER BY [r].[Id]
""");
}

[ConditionalFact]
public virtual void Check_all_tests_overridden()
=> TestHelpers.AssertAllMethodsOverridden(GetType());

private void AssertSql(params string[] expected)
=> Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
}
16 changes: 16 additions & 0 deletions ...ctionalTests/Query/Relationships/Projection/OwnedJsonNoTrackingProjectionSqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,22 @@ [RequiredReferenceLeaf] nvarchar(max) '$.RequiredReferenceLeaf' AS JSON
""");
}

public override async Task Project_branch_collection_element_using_indexer_constant(bool async)
{
await base.Project_branch_collection_element_using_indexer_constant(async);

AssertSql(
"""
SELECT JSON_QUERY([r].[RequiredReferenceTrunk], '$.CollectionBranch'), [r].[Id]
FROM [RootEntities] AS [r]
ORDER BY [r].[Id]
""");
}

[ConditionalFact]
public virtual void Check_all_tests_overridden()
=> TestHelpers.AssertAllMethodsOverridden(GetType());

private void AssertSql(params string[] expected)
=> Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
}
4 changes: 4 additions & 0 deletions ...Server.FunctionalTests/Query/Relationships/Projection/OwnedJsonProjectionSqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ private async Task AssertCantTrackJson(Func<Task> test)
AssertSql();
}

[ConditionalFact]
public virtual void Check_all_tests_overridden()
=> TestHelpers.AssertAllMethodsOverridden(GetType());

private void AssertSql(params string[] expected)
=> Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
}
4 changes: 4 additions & 0 deletions ...sts/Query/Relationships/Projection/OwnedJsonReferenceNoTrackingProjectionSqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,10 @@ ORDER BY [r].[Id]
""");
}

[ConditionalFact]
public virtual void Check_all_tests_overridden()
=> TestHelpers.AssertAllMethodsOverridden(GetType());

private void AssertSql(params string[] expected)
=> Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
}
4 changes: 4 additions & 0 deletions ...nctionalTests/Query/Relationships/Projection/OwnedJsonReferenceProjectionSqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ private async Task AssertCantTrackJson(Func<Task> test)
AssertSql();
}

[ConditionalFact]
public virtual void Check_all_tests_overridden()
=> TestHelpers.AssertAllMethodsOverridden(GetType());

private void AssertSql(params string[] expected)
=> Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
}
4 changes: 4 additions & 0 deletions ...nalTests/Query/Relationships/Projection/OwnedJsonTypeNoTrackingProjectionSqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,8 @@ public OwnedJsonTypeNoTrackingProjectionSqlServerTest(OwnedJsonTypeRelationships
Fixture.TestSqlLoggerFactory.Clear();
Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);
}

[ConditionalFact]
public virtual void Check_all_tests_overridden()
=> TestHelpers.AssertAllMethodsOverridden(GetType());
}
4 changes: 4 additions & 0 deletions ...Query/Relationships/Projection/OwnedJsonTypeReferenceNoTrackingProjectionSqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,8 @@ public OwnedJsonTypeReferenceNoTrackingProjectionSqlServerTest(OwnedJsonTypeRela
Fixture.TestSqlLoggerFactory.Clear();
Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);
}

[ConditionalFact]
public virtual void Check_all_tests_overridden()
=> TestHelpers.AssertAllMethodsOverridden(GetType());
}
4 changes: 4 additions & 0 deletions ....FunctionalTests/Query/Relationships/Projection/OwnedNoTrackingProjectionSqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,10 @@ WHEN [r].[OptionalReferenceTrunk_Name] IS NOT NULL THEN [r].[Id]
""");
}

[ConditionalFact]
public virtual void Check_all_tests_overridden()
=> TestHelpers.AssertAllMethodsOverridden(GetType());

private void AssertSql(params string[] expected)
=> Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
}
4 changes: 4 additions & 0 deletions ....SqlServer.FunctionalTests/Query/Relationships/Projection/OwnedProjectionSqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ private async Task AssertCantTrackOwned(Func<Task> test)
AssertSql();
}

[ConditionalFact]
public virtual void Check_all_tests_overridden()
=> TestHelpers.AssertAllMethodsOverridden(GetType());

private void AssertSql(params string[] expected)
=> Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
}
4 changes: 4 additions & 0 deletions ...alTests/Query/Relationships/Projection/OwnedReferenceNoTrackingProjectionSqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,10 @@ WHEN [r2].[OptionalReferenceTrunk_OptionalReferenceBranch_Name] IS NOT NULL THEN
""");
}

[ConditionalFact]
public virtual void Check_all_tests_overridden()
=> TestHelpers.AssertAllMethodsOverridden(GetType());

private void AssertSql(params string[] expected)
=> Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
}
Loading