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.

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

More test cleanup #19022

Merged
merged 1 commit into from
Nov 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ FROM root c
WHERE ((c[""Discriminator""] = ""Product"") AND NOT(c[""Discontinued""]))");
}

[ConditionalFact(Skip = "See issue#13857")]
[ConditionalFact(Skip = "See issue#17246")]
public override void Auto_initialized_view_set()
{
base.Auto_initialized_view_set();
}

[ConditionalFact(Skip = "issue #12086")] // collection support
[ConditionalFact(Skip = "issue #17246")] // collection support
public override void KeylessEntity_with_nav_defining_query()
{
base.KeylessEntity_with_nav_defining_query();
Expand Down Expand Up @@ -111,15 +111,15 @@ FROM root c
WHERE (c[""Discriminator""] = ""Customer"")");
}

[ConditionalTheory(Skip = "issue 12086")] // left join translation
[ConditionalTheory(Skip = "issue#17314")] // left join translation
public override async Task KeylessEntity_select_where_navigation(bool async)
{
await base.KeylessEntity_select_where_navigation(async);

AssertSql(@"");
}

[ConditionalTheory(Skip = "issue 12086")] // left join translation
[ConditionalTheory(Skip = "issue#17314")] // left join translation
public override async Task KeylessEntity_select_where_navigation_multi_level(bool async)
{
await AssertQuery(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ FROM root c
WHERE (c[""Discriminator""] = ""Order"")");
}

[ConditionalTheory(Skip = "Issue #12086")]
[ConditionalTheory(Skip = "Issue #17246")]
public override async Task Where_subquery_anon(bool async)
{
await base.Where_subquery_anon(async);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ FROM root c
WHERE (c[""Discriminator""] = ""Customer"")");
}

[ConditionalTheory(Skip = "Issue$14935")]
[ConditionalTheory(Skip = "Issue#17246")]
public override async Task Projection_when_client_evald_subquery(bool async)
{
await base.Projection_when_client_evald_subquery(async);
Expand Down
38 changes: 19 additions & 19 deletions test/EFCore.Cosmos.FunctionalTests/Query/OwnedQueryCosmosTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ public OwnedQueryCosmosTest(OwnedQueryCosmosFixture fixture, ITestOutputHelper t
//TestLoggerFactory.TestOutputHelper = testOutputHelper;
}

[ConditionalTheory(Skip = "Issue#12086")]
[ConditionalTheory(Skip = "Issue#17246")]
public override Task Query_loads_reference_nav_automatically_in_projection(bool async)
{
return base.Query_loads_reference_nav_automatically_in_projection(async);
}

[ConditionalTheory(Skip = "SelectMany #12086")]
[ConditionalTheory(Skip = "SelectMany #17246")]
public override Task Query_with_owned_entity_equality_operator(bool async)
{
return base.Query_with_owned_entity_equality_operator(async);
Expand Down Expand Up @@ -120,105 +120,105 @@ FROM root c
WHERE (c[""Discriminator""] = ""LeafA"")");
}

[ConditionalTheory(Skip = "LeftJoin #12086")]
[ConditionalTheory(Skip = "LeftJoin #17314")]
public override Task Filter_owned_entity_chained_with_regular_entity_followed_by_projecting_owned_collection(bool async)
{
return base.Filter_owned_entity_chained_with_regular_entity_followed_by_projecting_owned_collection(async);
}

[ConditionalTheory(Skip = "LeftJoin #12086")]
[ConditionalTheory(Skip = "LeftJoin #17314")]
public override Task Navigation_rewrite_on_owned_reference_followed_by_regular_entity(bool async)
{
return base.Navigation_rewrite_on_owned_reference_followed_by_regular_entity(async);
}

[ConditionalTheory(Skip = "LeftJoin #12086")]
[ConditionalTheory(Skip = "LeftJoin #17314")]
public override Task Navigation_rewrite_on_owned_reference_followed_by_regular_entity_filter(bool async)
{
return base.Navigation_rewrite_on_owned_reference_followed_by_regular_entity_filter(async);
}

[ConditionalTheory(Skip = "LeftJoin #12086")]
[ConditionalTheory(Skip = "LeftJoin #17314")]
public override Task Navigation_rewrite_on_owned_reference_followed_by_regular_entity_and_another_reference(bool async)
{
return base.Navigation_rewrite_on_owned_reference_followed_by_regular_entity_and_another_reference(async);
}

[ConditionalTheory(Skip = "LeftJoin #12086")]
[ConditionalTheory(Skip = "LeftJoin #17314")]
public override Task Navigation_rewrite_on_owned_reference_followed_by_regular_entity_and_another_reference_and_scalar(bool async)
{
return base.Navigation_rewrite_on_owned_reference_followed_by_regular_entity_and_another_reference_and_scalar(async);
}

[ConditionalTheory(Skip = "LeftJoin #12086")]
[ConditionalTheory(Skip = "LeftJoin #17314")]
public override Task Navigation_rewrite_on_owned_reference_followed_by_regular_entity_and_collection(bool async)
{
return base.Navigation_rewrite_on_owned_reference_followed_by_regular_entity_and_collection(async);
}

[ConditionalTheory(Skip = "LeftJoin #12086")]
[ConditionalTheory(Skip = "LeftJoin #17314")]
public override Task Navigation_rewrite_on_owned_reference_followed_by_regular_entity_and_collection_count(bool async)
{
return base.Navigation_rewrite_on_owned_reference_followed_by_regular_entity_and_collection_count(async);
}

[ConditionalTheory(Skip = "LeftJoin #12086")]
[ConditionalTheory(Skip = "LeftJoin #17314")]
public override Task Navigation_rewrite_on_owned_reference_followed_by_regular_entity_and_property(bool async)
{
return base.Navigation_rewrite_on_owned_reference_followed_by_regular_entity_and_property(async);
}

[ConditionalTheory(Skip = "LeftJoin #12086")]
[ConditionalTheory(Skip = "LeftJoin #17314")]
public override Task
Navigation_rewrite_on_owned_reference_followed_by_regular_entity_and_another_reference_in_predicate_and_projection(bool async)
{
return base.Navigation_rewrite_on_owned_reference_followed_by_regular_entity_and_another_reference_in_predicate_and_projection(
async);
}

[ConditionalTheory(Skip = "LeftJoin #12086")]
[ConditionalTheory(Skip = "LeftJoin #17314")]
public override Task Project_multiple_owned_navigations(bool async)
{
return base.Project_multiple_owned_navigations(async);
}

[ConditionalTheory(Skip = "LeftJoin #12086")]
[ConditionalTheory(Skip = "LeftJoin #17314")]
public override Task Project_multiple_owned_navigations_with_expansion_on_owned_collections(bool async)
{
return base.Project_multiple_owned_navigations_with_expansion_on_owned_collections(async);
}

[ConditionalTheory(Skip = "SelectMany #12086")]
[ConditionalTheory(Skip = "SelectMany #17246")]
public override Task SelectMany_on_owned_collection(bool async)
{
return base.SelectMany_on_owned_collection(async);
}

[ConditionalTheory(Skip = "SelectMany #12086")]
[ConditionalTheory(Skip = "SelectMany #17246")]
public override Task SelectMany_on_owned_reference_followed_by_regular_entity_and_collection(bool async)
{
return base.SelectMany_on_owned_reference_followed_by_regular_entity_and_collection(async);
}

[ConditionalTheory(Skip = "SelectMany #12086")]
[ConditionalTheory(Skip = "SelectMany #17246")]
public override Task SelectMany_on_owned_reference_with_entity_in_between_ending_in_owned_collection(bool async)
{
return base.SelectMany_on_owned_reference_with_entity_in_between_ending_in_owned_collection(async);
}

[ConditionalTheory(Skip = "SelectMany #12086")]
[ConditionalTheory(Skip = "SelectMany #17246")]
public override Task Query_with_owned_entity_equality_method(bool async)
{
return base.Query_with_owned_entity_equality_method(async);
}

[ConditionalTheory(Skip = "SelectMany #12086")]
[ConditionalTheory(Skip = "SelectMany #17246")]
public override Task Query_with_owned_entity_equality_object_method(bool async)
{
return base.Query_with_owned_entity_equality_object_method(async);
}

[ConditionalTheory(Skip = "OfType #12086")]
[ConditionalTheory(Skip = "OfType #17246")]
public override Task Query_with_OfType_eagerly_loads_correct_owned_navigations(bool async)
{
return base.Query_with_OfType_eagerly_loads_correct_owned_navigations(async);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,25 @@ public override Task Complex_query_with_optional_navigations_and_client_side_eva
return base.Complex_query_with_optional_navigations_and_client_side_evaluation(async);
}

[ConditionalTheory(Skip = "17539")]
[ConditionalTheory(Skip = "Issue#17539")]
public override Task Join_navigations_in_inner_selector_translated_without_collision(bool async)
{
return base.Join_navigations_in_inner_selector_translated_without_collision(async);
}

[ConditionalTheory(Skip = "17539")]
[ConditionalTheory(Skip = "Issue#17539")]
public override Task Join_with_navigations_in_the_result_selector1(bool async)
{
return base.Join_with_navigations_in_the_result_selector1(async);
}

[ConditionalTheory(Skip = "17539")]
[ConditionalTheory(Skip = "Issue#17539")]
public override Task Where_nav_prop_reference_optional1_via_DefaultIfEmpty(bool async)
{
return base.Where_nav_prop_reference_optional1_via_DefaultIfEmpty(async);
}

[ConditionalTheory(Skip = "17539")]
[ConditionalTheory(Skip = "Issue#17539")]
public override Task Optional_navigation_propagates_nullability_to_manually_created_left_join2(bool async)
{
return base.Optional_navigation_propagates_nullability_to_manually_created_left_join2(async);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public override Task GroupBy_with_boolean_groupin_key_thru_navigation_access(boo
return GroupBy_with_boolean_groupin_key_thru_navigation_access(async);
}

[ConditionalTheory(Skip = "issue #17260")]
[ConditionalTheory(Skip = "issue #17620")]
public override Task Select_subquery_projecting_single_constant_inside_anonymous(bool async)
{
return base.Select_subquery_projecting_single_constant_inside_anonymous(async);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7086,7 +7086,7 @@ public virtual Task Group_by_with_aggregate_max_on_entity_type(bool async)
.Select(g => new { g.Key, Aggregate = g.Max() })));
}

[ConditionalTheory(Skip = "issue #18492")]
[ConditionalTheory(Skip = "issue #19020")]
[MemberData(nameof(IsAsyncData))]
public virtual Task Group_by_on_StartsWith_with_null_parameter_as_argument(bool async)
{
Expand All @@ -7109,7 +7109,7 @@ public virtual Task Group_by_with_having_StartsWith_with_null_parameter_as_argum
ss => ss.Set<Gear>().GroupBy(g => g.FullName).Where(g => false).Select(g => g.Key));
}

[ConditionalTheory(Skip = "issue #18492")]
[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual Task Select_StartsWith_with_null_parameter_as_argument(bool async)
{
Expand Down Expand Up @@ -7145,7 +7145,7 @@ public virtual Task Where_null_parameter_is_not_null(bool async)
ss => ss.Set<Gear>().Where(g => false));
}

[ConditionalTheory(Skip = "issue #18492")]
[ConditionalTheory(Skip = "issue #19019")]
[MemberData(nameof(IsAsyncData))]
public virtual Task OrderBy_StartsWith_with_null_parameter_as_argument(bool async)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7063,7 +7063,12 @@ public override async Task Select_StartsWith_with_null_parameter_as_argument(boo
await base.Select_StartsWith_with_null_parameter_as_argument(async);

AssertSql(
@"");
@"SELECT CASE
WHEN CAST(0 AS bit) = CAST(1 AS bit) THEN CAST(1 AS bit)
ELSE CAST(0 AS bit)
END
FROM [Gears] AS [g]
WHERE [g].[Discriminator] IN (N'Gear', N'Officer')");
}

public override async Task Select_null_parameter_is_not_null(bool async)
Expand Down
26 changes: 13 additions & 13 deletions test/EFCore.SqlServer.FunctionalTests/Query/QueryBugsTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2999,7 +2999,7 @@ private class Child10635 : IEntity10635

#region Bug10301

[ConditionalFact(Skip = "issue #15364")]
[ConditionalFact]
public virtual void MultiContext_query_filter_test()
{
using (CreateDatabase10301())
Expand All @@ -3016,21 +3016,21 @@ public virtual void MultiContext_query_filter_test()
AssertSql(
@"@__ef_filter__Tenant_0='0'

SELECT [e].[Id], [e].[SomeValue]
FROM [Blogs] AS [e]
WHERE [e].[SomeValue] = @__ef_filter__Tenant_0",
SELECT [b].[Id], [b].[SomeValue]
FROM [Blogs] AS [b]
WHERE [b].[SomeValue] = @__ef_filter__Tenant_0",
//
@"@__ef_filter__Tenant_0='1'

SELECT [e].[Id], [e].[SomeValue]
FROM [Blogs] AS [e]
WHERE [e].[SomeValue] = @__ef_filter__Tenant_0",
SELECT [b].[Id], [b].[SomeValue]
FROM [Blogs] AS [b]
WHERE [b].[SomeValue] = @__ef_filter__Tenant_0",
//
@"@__ef_filter__Tenant_0='2'

SELECT COUNT(*)
FROM [Blogs] AS [e]
WHERE [e].[SomeValue] = @__ef_filter__Tenant_0");
FROM [Blogs] AS [b]
WHERE [b].[SomeValue] = @__ef_filter__Tenant_0");
}
}

Expand Down Expand Up @@ -3316,7 +3316,7 @@ private class MaumarEntity11818

#region Bug11803_11791

[ConditionalFact(Skip = "Issue #15364")]
[ConditionalFact]
public virtual void Query_filter_with_db_set_should_not_block_other_filters()
{
using (CreateDatabase11803())
Expand All @@ -3326,15 +3326,15 @@ public virtual void Query_filter_with_db_set_should_not_block_other_filters()

AssertSql(
@"SELECT [f].[Id], [f].[Name]
FROM [ConditionalFactions] AS [f]
FROM [Factions] AS [f]
WHERE EXISTS (
SELECT 1
FROM [Leaders] AS [l]
WHERE [l].[Name] = N'Crach an Craite')");
WHERE ([l].[Name] IS NOT NULL AND ([l].[Name] LIKE N'Bran%')) AND ([l].[Name] = N'Crach an Craite'))");
}
}

[ConditionalFact(Skip = "Issue#13361")]
[ConditionalFact(Skip = "Issue#18903")]
public virtual void Keyless_type_used_inside_defining_query()
{
using (CreateDatabase11803())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ public WithConstructorsSqlServerTest(WithConstructorsSqlServerFixture fixture)
{
}

[ConditionalFact(Skip = "Issue #16323")]
public override void Query_with_keyless_type()
=> base.Query_with_keyless_type();

protected override void UseTransaction(DatabaseFacade facade, IDbContextTransaction transaction)
=> facade.UseTransaction(transaction.GetDbTransaction());

Expand Down