From 792e0b89b556519c3c48019022318ae5bab27912 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 7 Aug 2026 20:49:25 +0000 Subject: [PATCH 1/2] Initial plan From c56fa42485edf7f2d5260fc285230e411582401c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 7 Aug 2026 20:53:35 +0000 Subject: [PATCH 2/2] Rename generic test overloads to avoid xUnit discovery conflicts Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com> --- .../ModelBuilding/CosmosModelBuilderGenericTest.cs | 12 ++++++------ .../Translations/StringTranslationsCosmosTest.cs | 4 ++-- .../ModelBuilding/ModelBuilderTest.ComplexType.cs | 12 ++++++------ .../ModelBuilderTest.NonRelationship.cs | 12 ++++++------ .../Query/Translations/StringTranslationsTestBase.cs | 2 +- .../Translations/StringTranslationsSqlServerTest.cs | 4 ++-- .../Translations/StringTranslationsSqliteTest.cs | 4 ++-- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/test/EFCore.Cosmos.FunctionalTests/ModelBuilding/CosmosModelBuilderGenericTest.cs b/test/EFCore.Cosmos.FunctionalTests/ModelBuilding/CosmosModelBuilderGenericTest.cs index 9335b8babb5..23c69ab5acf 100644 --- a/test/EFCore.Cosmos.FunctionalTests/ModelBuilding/CosmosModelBuilderGenericTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/ModelBuilding/CosmosModelBuilderGenericTest.cs @@ -56,13 +56,13 @@ public override void Primitive_collections_can_be_made_concurrency_tokens() base.Primitive_collections_can_be_made_concurrency_tokens).Message); public override void Properties_can_have_custom_type_value_converter_type_set() - => Properties_can_have_custom_type_value_converter_type_set(); + => Properties_can_have_custom_type_value_converter_type_set_implementation(); public override void Properties_can_have_non_generic_value_converter_set() - => Properties_can_have_non_generic_value_converter_set(); + => Properties_can_have_non_generic_value_converter_set_implementation(); public override void Properties_can_have_provider_type_set() - => Properties_can_have_provider_type_set(); + => Properties_can_have_provider_type_set_implementation(); public override void Properties_can_be_set_to_generate_values_on_Add() { @@ -712,13 +712,13 @@ public class CosmosGenericComplexType(CosmosModelBuilderFixture fixture) : ComplexTypeTestBase(fixture), IClassFixture { public override void Properties_can_have_custom_type_value_converter_type_set() - => Properties_can_have_custom_type_value_converter_type_set(); + => Properties_can_have_custom_type_value_converter_type_set_implementation(); public override void Properties_can_have_non_generic_value_converter_set() - => Properties_can_have_non_generic_value_converter_set(); + => Properties_can_have_non_generic_value_converter_set_implementation(); public override void Properties_can_have_provider_type_set() - => Properties_can_have_provider_type_set(); + => Properties_can_have_provider_type_set_implementation(); public override void Complex_properties_can_be_configured_by_type() => base.Complex_properties_can_be_configured_by_type(); diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/StringTranslationsCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/StringTranslationsCosmosTest.cs index 1a3106670b5..b9a113cd585 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/Translations/StringTranslationsCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/Translations/StringTranslationsCosmosTest.cs @@ -14,9 +14,9 @@ public StringTranslationsCosmosTest(BasicTypesQueryCosmosFixture fixture, ITestO #region Equals - public override async Task Equals() + public override async Task Instance_Equals() { - await base.Equals(); + await base.Instance_Equals(); AssertSql( """ diff --git a/test/EFCore.Specification.Tests/ModelBuilding/ModelBuilderTest.ComplexType.cs b/test/EFCore.Specification.Tests/ModelBuilding/ModelBuilderTest.ComplexType.cs index f06b500d0b4..9a1ccd5910f 100644 --- a/test/EFCore.Specification.Tests/ModelBuilding/ModelBuilderTest.ComplexType.cs +++ b/test/EFCore.Specification.Tests/ModelBuilding/ModelBuilderTest.ComplexType.cs @@ -509,9 +509,9 @@ public virtual void Access_mode_can_be_overridden_at_entity_and_property_levels( [Fact(Skip = "Issue #35613")] public virtual void Properties_can_have_provider_type_set() - => Properties_can_have_provider_type_set(); + => Properties_can_have_provider_type_set_implementation(); - protected virtual void Properties_can_have_provider_type_set() + protected virtual void Properties_can_have_provider_type_set_implementation() { var modelBuilder = CreateModelBuilder(); @@ -590,9 +590,9 @@ public virtual void Properties_can_have_provider_type_set_for_type() [Fact(Skip = "Issue #35613")] public virtual void Properties_can_have_non_generic_value_converter_set() - => Properties_can_have_non_generic_value_converter_set(); + => Properties_can_have_non_generic_value_converter_set_implementation(); - protected virtual void Properties_can_have_non_generic_value_converter_set() + protected virtual void Properties_can_have_non_generic_value_converter_set_implementation() { var modelBuilder = CreateModelBuilder(); @@ -634,9 +634,9 @@ protected virtual void Properties_can_have_non_generic_value_converter_set Properties_can_have_custom_type_value_converter_type_set(); + => Properties_can_have_custom_type_value_converter_type_set_implementation(); - protected virtual void Properties_can_have_custom_type_value_converter_type_set() + protected virtual void Properties_can_have_custom_type_value_converter_type_set_implementation() { var modelBuilder = CreateModelBuilder(); diff --git a/test/EFCore.Specification.Tests/ModelBuilding/ModelBuilderTest.NonRelationship.cs b/test/EFCore.Specification.Tests/ModelBuilding/ModelBuilderTest.NonRelationship.cs index 48a67942933..101e2dbfa29 100644 --- a/test/EFCore.Specification.Tests/ModelBuilding/ModelBuilderTest.NonRelationship.cs +++ b/test/EFCore.Specification.Tests/ModelBuilding/ModelBuilderTest.NonRelationship.cs @@ -803,9 +803,9 @@ public virtual void Access_mode_can_be_overridden_at_entity_and_property_levels( [Fact] public virtual void Properties_can_have_provider_type_set() - => Properties_can_have_provider_type_set(); + => Properties_can_have_provider_type_set_implementation(); - protected virtual void Properties_can_have_provider_type_set() + protected virtual void Properties_can_have_provider_type_set_implementation() { var modelBuilder = CreateModelBuilder(); @@ -872,9 +872,9 @@ public virtual void Properties_can_have_provider_type_set_for_type() [Fact] public virtual void Properties_can_have_non_generic_value_converter_set() - => Properties_can_have_non_generic_value_converter_set(); + => Properties_can_have_non_generic_value_converter_set_implementation(); - protected virtual void Properties_can_have_non_generic_value_converter_set() + protected virtual void Properties_can_have_non_generic_value_converter_set_implementation() { var modelBuilder = CreateModelBuilder(); @@ -910,9 +910,9 @@ protected virtual void Properties_can_have_non_generic_value_converter_set Properties_can_have_custom_type_value_converter_type_set(); + => Properties_can_have_custom_type_value_converter_type_set_implementation(); - protected virtual void Properties_can_have_custom_type_value_converter_type_set() + protected virtual void Properties_can_have_custom_type_value_converter_type_set_implementation() { var modelBuilder = CreateModelBuilder(); diff --git a/test/EFCore.Specification.Tests/Query/Translations/StringTranslationsTestBase.cs b/test/EFCore.Specification.Tests/Query/Translations/StringTranslationsTestBase.cs index 0f26f10e312..20c63ffb7b3 100644 --- a/test/EFCore.Specification.Tests/Query/Translations/StringTranslationsTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/Translations/StringTranslationsTestBase.cs @@ -19,7 +19,7 @@ protected virtual bool IsCaseSensitive #region Equals [Fact] - public virtual Task Equals() + public virtual Task Instance_Equals() => IsCaseSensitive ? AssertQuery(ss => ss.Set().Where(b => b.String.Equals("Seattle"))) : AssertQuery( diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/StringTranslationsSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/StringTranslationsSqlServerTest.cs index b17264816cb..ce55695dbae 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/Translations/StringTranslationsSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/Translations/StringTranslationsSqlServerTest.cs @@ -20,9 +20,9 @@ protected override bool IsCaseSensitive #region Equals - public override async Task Equals() + public override async Task Instance_Equals() { - await base.Equals(); + await base.Instance_Equals(); AssertSql( """ diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/StringTranslationsSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/StringTranslationsSqliteTest.cs index 55cf98394c0..6bfcd852086 100644 --- a/test/EFCore.Sqlite.FunctionalTests/Query/Translations/StringTranslationsSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/Query/Translations/StringTranslationsSqliteTest.cs @@ -18,9 +18,9 @@ public StringTranslationsSqliteTest(BasicTypesQuerySqliteFixture fixture, ITestO #region Equals - public override async Task Equals() + public override async Task Instance_Equals() { - await base.Equals(); + await base.Instance_Equals(); AssertSql( """