Skip to content

Commit 1a8c5fb

Browse files
Copilotrenemadsen
andcommitted
Fix unit test compilation errors: update Dispose calls and add missing DI constructor parameters for EF Core 10
Co-authored-by: renemadsen <76994+renemadsen@users.noreply.github.com>
1 parent 46523e3 commit 1a8c5fb

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

test/EFCore.MySql.Tests/MySqlRelationalConnectionTest.cs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -301,18 +301,21 @@ private static MySqlRelationalConnection CreateConnection(DbContextOptions optio
301301
var singletonOptions = new MySqlOptions();
302302
singletonOptions.Initialize(options);
303303

304+
var exceptionDetector = new ExceptionDetector();
305+
var loggingOptions = new LoggingOptions();
306+
304307
return new MySqlRelationalConnection(
305308
new RelationalConnectionDependencies(
306309
options,
307310
new DiagnosticsLogger<DbLoggerCategory.Database.Transaction>(
308311
new LoggerFactory(),
309-
new LoggingOptions(),
312+
loggingOptions,
310313
new DiagnosticListener("FakeDiagnosticListener"),
311314
new MySqlLoggingDefinitions(),
312315
new NullDbContextLogger()),
313316
new RelationalConnectionDiagnosticsLogger(
314317
new LoggerFactory(),
315-
new LoggingOptions(),
318+
loggingOptions,
316319
new DiagnosticListener("FakeDiagnosticListener"),
317320
new MySqlLoggingDefinitions(),
318321
new NullDbContextLogger(),
@@ -329,7 +332,9 @@ private static MySqlRelationalConnection CreateConnection(DbContextOptions optio
329332
TestServiceFactory.Instance.Create<TypeMappingSourceDependencies>(),
330333
TestServiceFactory.Instance.Create<RelationalTypeMappingSourceDependencies>(),
331334
singletonOptions),
332-
new ExceptionDetector()))),
335+
exceptionDetector,
336+
loggingOptions)),
337+
exceptionDetector),
333338
new MySqlConnectionStringOptionsValidator(),
334339
singletonOptions);
335340
}

test/EFCore.MySql.Tests/MySqlTestFixtureBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public Task DisposeAsync()
6464

6565
protected override void Dispose(bool disposing)
6666
{
67-
TestStore.Dispose();
67+
TestStore.DisposeAsync().AsTask().Wait();
6868
base.Dispose(disposing);
6969
}
7070

test/EFCore.MySql.Tests/TestBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public async Task InitializeAsync()
1919
public Task DisposeAsync()
2020
=> Task.CompletedTask;
2121

22-
public virtual void Dispose() => TestStore.Dispose();
22+
public virtual void Dispose() => TestStore.DisposeAsync().AsTask().Wait();
2323

2424
public virtual string StoreName => GetType().Name;
2525
public virtual MySqlTestStore TestStore { get; private set; }

0 commit comments

Comments
 (0)