From 409157b653f455dd4178a1d68f47da02741c30cb Mon Sep 17 00:00:00 2001 From: Smit Patel Date: Fri, 6 Nov 2020 00:04:54 -0800 Subject: [PATCH] Re-enable in-memory test for optional navigation access Resolves #18284 --- .../Query/GearsOfWarQueryInMemoryTest.cs | 8 -------- .../Query/GearsOfWarQueryTestBase.cs | 2 +- .../Query/GearsOfWarQuerySqlServerTest.cs | 2 +- .../Query/TPTGearsOfWarQuerySqlServerTest.cs | 2 +- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/test/EFCore.InMemory.FunctionalTests/Query/GearsOfWarQueryInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/Query/GearsOfWarQueryInMemoryTest.cs index 663c702dcdf..c7db1445bd4 100644 --- a/test/EFCore.InMemory.FunctionalTests/Query/GearsOfWarQueryInMemoryTest.cs +++ b/test/EFCore.InMemory.FunctionalTests/Query/GearsOfWarQueryInMemoryTest.cs @@ -45,10 +45,6 @@ public override Task => base.Null_semantics_is_correctly_applied_for_function_comparisons_that_take_arguments_from_optional_navigation_complex( async); - [ConditionalTheory(Skip = "issue #18284")] - public override Task GroupBy_with_boolean_groupin_key_thru_navigation_access(bool async) - => GroupBy_with_boolean_groupin_key_thru_navigation_access(async); - [ConditionalTheory(Skip = "issue #17620")] public override Task Select_subquery_projecting_single_constant_inside_anonymous(bool async) => base.Select_subquery_projecting_single_constant_inside_anonymous(async); @@ -57,10 +53,6 @@ public override Task Select_subquery_projecting_single_constant_inside_anonymous public override Task Group_by_on_StartsWith_with_null_parameter_as_argument(bool async) => base.Group_by_on_StartsWith_with_null_parameter_as_argument(async); - [ConditionalTheory(Skip = "issue #18284")] - public override Task Enum_closure_typed_as_underlying_type_generates_correct_parameter_type(bool async) - => base.Enum_closure_typed_as_underlying_type_generates_correct_parameter_type(async); - [ConditionalTheory(Skip = "issue #17386")] public override Task Client_member_and_unsupported_string_Equals_in_the_same_query(bool async) => base.Client_member_and_unsupported_string_Equals_in_the_same_query(async); diff --git a/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs index 5474b011ee9..203a675e3ac 100644 --- a/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs @@ -7534,7 +7534,7 @@ public virtual Task Enum_closure_typed_as_underlying_type_generates_correct_para return AssertQuery( async, - ss => ss.Set().Where(w => prm == (int)w.AmmunitionType), + ss => ss.Set().Where(w => prm == (int?)w.AmmunitionType), ss => ss.Set().Where(w => w.AmmunitionType != null && prm == (int)w.AmmunitionType)); } diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs index 3b496ec79dc..c17fee0e275 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs @@ -6949,7 +6949,7 @@ public override async Task Enum_closure_typed_as_underlying_type_generates_corre await base.Enum_closure_typed_as_underlying_type_generates_correct_parameter_type(async); AssertSql( - @"@__prm_0='1' + @"@__prm_0='1' (Nullable = true) SELECT [w].[Id], [w].[AmmunitionType], [w].[IsAutomatic], [w].[Name], [w].[OwnerFullName], [w].[SynergyWithId] FROM [Weapons] AS [w] diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TPTGearsOfWarQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TPTGearsOfWarQuerySqlServerTest.cs index be3b5cd7bd6..5304dc2317c 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/TPTGearsOfWarQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/TPTGearsOfWarQuerySqlServerTest.cs @@ -8073,7 +8073,7 @@ public override async Task Enum_closure_typed_as_underlying_type_generates_corre await base.Enum_closure_typed_as_underlying_type_generates_correct_parameter_type(async); AssertSql( - @"@__prm_0='1' + @"@__prm_0='1' (Nullable = true) SELECT [w].[Id], [w].[AmmunitionType], [w].[IsAutomatic], [w].[Name], [w].[OwnerFullName], [w].[SynergyWithId] FROM [Weapons] AS [w]