Skip to content

Commit ec98f38

Browse files
Copilotrenemadsen
andcommitted
Fix EF Core 10 migration compilation errors for test fixtures
Co-authored-by: renemadsen <76994+renemadsen@users.noreply.github.com>
1 parent a448317 commit ec98f38

File tree

2 files changed

+4
-28
lines changed

2 files changed

+4
-28
lines changed

test/EFCore.MySql.FunctionalTests/BulkUpdates/NonSharedModelBulkUpdatesMySqlTest.cs

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Threading.Tasks;
2+
using Microsoft.EntityFrameworkCore;
23
using Microsoft.EntityFrameworkCore.BulkUpdates;
34
using Microsoft.EntityFrameworkCore.TestUtilities;
45
using MySqlConnector;
@@ -7,22 +8,11 @@
78

89
namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.BulkUpdates;
910

10-
public class NonSharedModelBulkUpdatesMySqlTest : NonSharedModelBulkUpdatesRelationalTestBase
11+
public class NonSharedModelBulkUpdatesMySqlTest(NonSharedFixture fixture) : NonSharedModelBulkUpdatesRelationalTestBase(fixture)
1112
{
12-
public NonSharedModelBulkUpdatesMySqlTest()
13-
: base(new MySqlNonSharedModelBulkUpdatesFixture())
14-
{
15-
}
16-
1713
protected override ITestStoreFactory TestStoreFactory
1814
=> MySqlTestStoreFactory.Instance;
1915

20-
public class MySqlNonSharedModelBulkUpdatesFixture : NonSharedModelBulkUpdatesFixtureBase
21-
{
22-
protected override string StoreName => "NonSharedModelBulkUpdates";
23-
protected override ITestStoreFactory TestStoreFactory => MySqlTestStoreFactory.Instance;
24-
}
25-
2616
[ConditionalFact]
2717
public virtual void Check_all_tests_overridden()
2818
=> MySqlTestHelpers.AssertAllMethodsOverridden(GetType());

test/EFCore.MySql.FunctionalTests/MaterializationInterceptionMySqlTest.cs

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@
44

55
namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests;
66

7-
public class MaterializationInterceptionMySqlTest : MaterializationInterceptionTestBase<MaterializationInterceptionMySqlTest.MySqlLibraryContext>
7+
public class MaterializationInterceptionMySqlTest(NonSharedFixture fixture) :
8+
MaterializationInterceptionTestBase<MaterializationInterceptionMySqlTest.MySqlLibraryContext>(fixture)
89
{
9-
public MaterializationInterceptionMySqlTest()
10-
: base(new MySqlMaterializationInterceptionFixture())
11-
{
12-
}
1310

1411
public class MySqlLibraryContext : LibraryContext
1512
{
@@ -31,15 +28,4 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
3128

3229
protected override ITestStoreFactory TestStoreFactory
3330
=> MySqlTestStoreFactory.Instance;
34-
35-
public class MySqlMaterializationInterceptionFixture : SingletonInterceptorsFixtureBase
36-
{
37-
protected override string StoreName => "MaterializationInterception";
38-
protected override ITestStoreFactory TestStoreFactory => MySqlTestStoreFactory.Instance;
39-
40-
protected override IServiceCollection InjectInterceptors(
41-
IServiceCollection serviceCollection,
42-
IEnumerable<IInterceptor> injectedInterceptors)
43-
=> base.InjectInterceptors(serviceCollection.AddEntityFrameworkMySql(), injectedInterceptors);
44-
}
4531
}

0 commit comments

Comments
 (0)