Skip to content
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

Jump to bottom

Miscellaneous query test fixes #18193

Merged
merged 1 commit into from
Oct 3, 2019
Merged

Miscellaneous query test fixes #18193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/EFCore/Query/Internal/NavigationExpandingExpressionVisitor.ExpressionVisitors.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
Expand Down
6 changes: 6 additions & 0 deletions test/EFCore.InMemory.FunctionalTests/Query/ComplexNavigationsQueryInMemoryTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,11 @@ public override Task Complex_query_with_optional_navigations_and_client_side_eva
{
return base.Complex_query_with_optional_navigations_and_client_side_evaluation(isAsync);
}

[ConditionalFact(Skip = "issue #18194")]
public override void Member_pushdown_chain_3_levels_deep_entity()
{
base.Member_pushdown_chain_3_levels_deep_entity();
}
}
}
241 changes: 134 additions & 107 deletions test/EFCore.Specification.Tests/Query/ComplexNavigationsQueryTestBase.cs
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 14 additions & 12 deletions test/EFCore.Specification.Tests/Query/ComplexNavigationsWeakQueryTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,31 +81,27 @@ public override Task Multiple_SelectMany_with_nested_navigations_and_explicit_De
}

[ConditionalTheory(Skip = "issue #13560")]
public override Task SelectMany_with_nested_navigations_explicit_DefaultIfEmpty_and_additional_joins_outside_of_SelectMany(
bool isAsync)
public override Task SelectMany_with_nested_navigations_explicit_DefaultIfEmpty_and_additional_joins_outside_of_SelectMany(bool isAsync)
{
return base.SelectMany_with_nested_navigations_explicit_DefaultIfEmpty_and_additional_joins_outside_of_SelectMany(isAsync);
}

[ConditionalTheory(Skip = "issue #13560")]
public override Task SelectMany_with_nested_navigations_explicit_DefaultIfEmpty_and_additional_joins_outside_of_SelectMany2(
bool isAsync)
public override Task SelectMany_with_nested_navigations_explicit_DefaultIfEmpty_and_additional_joins_outside_of_SelectMany2(bool isAsync)
{
return base.SelectMany_with_nested_navigations_explicit_DefaultIfEmpty_and_additional_joins_outside_of_SelectMany2(isAsync);
}

[ConditionalFact(Skip = "issue #13560")]
public override void SelectMany_with_nested_navigations_and_additional_joins_outside_of_SelectMany()
[ConditionalTheory(Skip = "issue #13560")]
public override Task SelectMany_with_nested_navigations_and_additional_joins_outside_of_SelectMany(bool isAsync)
{
base.SelectMany_with_nested_navigations_and_additional_joins_outside_of_SelectMany();
return base.SelectMany_with_nested_navigations_and_additional_joins_outside_of_SelectMany(isAsync);
}

[ConditionalTheory(Skip = "issue #13560")]
public override Task
Complex_SelectMany_with_nested_navigations_and_explicit_DefaultIfEmpty_with_other_query_operators_composed_on_top(bool isAsync)
public override Task Complex_SelectMany_with_nested_navigations_and_explicit_DefaultIfEmpty_with_other_query_operators_composed_on_top(bool isAsync)
{
return base.Complex_SelectMany_with_nested_navigations_and_explicit_DefaultIfEmpty_with_other_query_operators_composed_on_top(
isAsync);
return base.Complex_SelectMany_with_nested_navigations_and_explicit_DefaultIfEmpty_with_other_query_operators_composed_on_top(isAsync);
}

[ConditionalTheory(Skip = "Issue#16752")]
Expand Down Expand Up @@ -165,12 +161,18 @@ public override void Member_pushdown_chain_3_levels_deep()
{
}

public override void Member_pushdown_chain_3_levels_deep_entity()
{
}

public override void Member_pushdown_with_collection_navigation_in_the_middle()
{
}

public override void Include_inside_subquery()
[ConditionalTheory(Skip = "Issue#16752")]
public override Task Include_inside_subquery(bool isAsync)
{
return base.Include_inside_subquery(isAsync);
}
}
}
Loading