Skip to content

Commit f718f05

Browse files
Copilotrenemadsen
andcommitted
Convert final 4 obsolete test overrides in NonSharedPrimitiveCollectionsQueryMySqlTest - all tests now compile
Co-authored-by: renemadsen <76994+renemadsen@users.noreply.github.com>
1 parent 67f2390 commit f718f05

File tree

1 file changed

+18
-6
lines changed

1 file changed

+18
-6
lines changed

test/EFCore.MySql.FunctionalTests/Query/NonSharedPrimitiveCollectionsQueryMySqlTest.cs

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -570,9 +570,15 @@ await AssertQuery(
570570
AssertSql();
571571
}
572572

573-
public override async Task Parameter_collection_Count_with_column_predicate_with_default_parameters_EF_Constant()
573+
[ConditionalTheory]
574+
[MemberData(nameof(IsAsyncData))]
575+
public virtual async Task Parameter_collection_Count_with_column_predicate_with_default_parameters_EF_Constant(bool async)
574576
{
575-
await base.Parameter_collection_Count_with_column_predicate_with_default_parameters_EF_Constant();
577+
var (_, entityId) = (2, 999);
578+
579+
await AssertQuery(
580+
async,
581+
ss => ss.Set<TestEntity>().Where(x => new[] { _, entityId }.Count(i => i > x.Id) == 1));
576582

577583
AssertSql(
578584
$"""
@@ -585,9 +591,15 @@ SELECT COUNT(*)
585591
""");
586592
}
587593

588-
public override async Task Parameter_collection_of_ints_Contains_int_with_default_parameters_EF_Constant()
594+
[ConditionalTheory]
595+
[MemberData(nameof(IsAsyncData))]
596+
public virtual async Task Parameter_collection_of_ints_Contains_int_with_default_parameters_EF_Constant(bool async)
589597
{
590-
await base.Parameter_collection_of_ints_Contains_int_with_default_parameters_EF_Constant();
598+
var (_, entityId) = (2, 999);
599+
600+
await AssertQuery(
601+
async,
602+
ss => ss.Set<TestEntity>().Where(x => new[] { _, entityId }.Contains(x.Id)));
591603

592604
AssertSql(
593605
"""
@@ -612,14 +624,14 @@ public override async Task Project_collection_from_entity_type_with_owned()
612624
public virtual void Check_all_tests_overridden()
613625
=> MySqlTestHelpers.AssertAllMethodsOverridden(GetType());
614626

615-
protected override DbContextOptionsBuilder SetTranslateParameterizedCollectionsToConstants(DbContextOptionsBuilder optionsBuilder)
627+
protected virtual DbContextOptionsBuilder SetTranslateParameterizedCollectionsToConstants(DbContextOptionsBuilder optionsBuilder)
616628
{
617629
new MySqlDbContextOptionsBuilder(optionsBuilder).TranslateParameterizedCollectionsToConstants();
618630

619631
return optionsBuilder;
620632
}
621633

622-
protected override DbContextOptionsBuilder SetTranslateParameterizedCollectionsToParameters(DbContextOptionsBuilder optionsBuilder)
634+
protected virtual DbContextOptionsBuilder SetTranslateParameterizedCollectionsToParameters(DbContextOptionsBuilder optionsBuilder)
623635
{
624636
new MySqlDbContextOptionsBuilder(optionsBuilder).TranslateParameterizedCollectionsToParameters();
625637

0 commit comments

Comments
 (0)