From e394c152d530e3bd07a660e7047ab524f37be3a2 Mon Sep 17 00:00:00 2001 From: Smit Patel Date: Thu, 21 Nov 2019 15:02:52 -0800 Subject: [PATCH] More test cleanup --- ...NorthwindKeylessEntitiesQueryCosmosTest.cs | 8 ++-- .../NorthwindMiscellaneousQueryCosmosTest.cs | 2 +- .../Query/NorthwindSelectQueryCosmosTest.cs | 2 +- .../Query/OwnedQueryCosmosTest.cs | 38 +++++++++---------- ...ComplexNavigationsWeakQueryInMemoryTest.cs | 8 ++-- .../Query/GearsOfWarQueryInMemoryTest.cs | 2 +- .../Query/GearsOfWarQueryTestBase.cs | 6 +-- .../Query/GearsOfWarQuerySqlServerTest.cs | 7 +++- .../Query/QueryBugsTest.cs | 26 ++++++------- .../WithConstructorsSqlServerTest.cs | 4 -- 10 files changed, 52 insertions(+), 51 deletions(-) diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindKeylessEntitiesQueryCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindKeylessEntitiesQueryCosmosTest.cs index 39ed34c5526..feccf2413c5 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindKeylessEntitiesQueryCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindKeylessEntitiesQueryCosmosTest.cs @@ -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(); @@ -111,7 +111,7 @@ 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); @@ -119,7 +119,7 @@ public override async Task KeylessEntity_select_where_navigation(bool 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( diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindMiscellaneousQueryCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindMiscellaneousQueryCosmosTest.cs index 0af91703336..61a40efc37a 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindMiscellaneousQueryCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindMiscellaneousQueryCosmosTest.cs @@ -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); diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindSelectQueryCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindSelectQueryCosmosTest.cs index 0b1d636f3bc..6e7c02f3a21 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindSelectQueryCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindSelectQueryCosmosTest.cs @@ -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); diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/OwnedQueryCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/OwnedQueryCosmosTest.cs index 958d049ad88..66eaa926e6e 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/OwnedQueryCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/OwnedQueryCosmosTest.cs @@ -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); @@ -120,55 +120,55 @@ 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) { @@ -176,49 +176,49 @@ public override Task 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); diff --git a/test/EFCore.InMemory.FunctionalTests/Query/ComplexNavigationsWeakQueryInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/Query/ComplexNavigationsWeakQueryInMemoryTest.cs index d443ba7239c..d41594d9e82 100644 --- a/test/EFCore.InMemory.FunctionalTests/Query/ComplexNavigationsWeakQueryInMemoryTest.cs +++ b/test/EFCore.InMemory.FunctionalTests/Query/ComplexNavigationsWeakQueryInMemoryTest.cs @@ -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); diff --git a/test/EFCore.InMemory.FunctionalTests/Query/GearsOfWarQueryInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/Query/GearsOfWarQueryInMemoryTest.cs index 4a2e27cecc2..a938e0c1880 100644 --- a/test/EFCore.InMemory.FunctionalTests/Query/GearsOfWarQueryInMemoryTest.cs +++ b/test/EFCore.InMemory.FunctionalTests/Query/GearsOfWarQueryInMemoryTest.cs @@ -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); diff --git a/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs index beff415d5d2..ebc57f35b99 100644 --- a/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs @@ -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) { @@ -7109,7 +7109,7 @@ public virtual Task Group_by_with_having_StartsWith_with_null_parameter_as_argum ss => ss.Set().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) { @@ -7145,7 +7145,7 @@ public virtual Task Where_null_parameter_is_not_null(bool async) ss => ss.Set().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) { diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs index 1051b4e2000..27663e11241 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs @@ -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) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/QueryBugsTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/QueryBugsTest.cs index 5f052e0f0a2..a1f6a408189 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/QueryBugsTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/QueryBugsTest.cs @@ -2999,7 +2999,7 @@ private class Child10635 : IEntity10635 #region Bug10301 - [ConditionalFact(Skip = "issue #15364")] + [ConditionalFact] public virtual void MultiContext_query_filter_test() { using (CreateDatabase10301()) @@ -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"); } } @@ -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()) @@ -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()) diff --git a/test/EFCore.SqlServer.FunctionalTests/WithConstructorsSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/WithConstructorsSqlServerTest.cs index 648815b6f67..31698ec03cc 100644 --- a/test/EFCore.SqlServer.FunctionalTests/WithConstructorsSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/WithConstructorsSqlServerTest.cs @@ -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());