Skip to content

Commit 61fbbb9

Browse files
another fix.
1 parent 9d16944 commit 61fbbb9

2 files changed

Lines changed: 26 additions & 19 deletions

File tree

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/TestHelpers.cs

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,27 @@ public static async Task<List<T>> InsertWithStrategyAsync<T>(
4646
}
4747

4848
var actualConfigure = configure ?? (_ => { });
49-
switch (strategy)
49+
try
5050
{
51-
case InsertStrategy.InsertReturn:
52-
return dbContext.ExecuteBulkInsertReturnEntities(entities, actualConfigure, onConflict);
53-
case InsertStrategy.InsertReturnAsync:
54-
return await dbContext.ExecuteBulkInsertReturnEntitiesAsync(entities, actualConfigure, onConflict);
55-
case InsertStrategy.Insert:
56-
dbContext.ExecuteBulkInsert(entities, actualConfigure, onConflict);
57-
return dbContext.Set<T>().Where(x => x.TestRun == runId).ToList();
58-
case InsertStrategy.InsertAsync:
59-
await dbContext.ExecuteBulkInsertAsync(entities, actualConfigure, onConflict);
60-
return await dbContext.Set<T>().Where(x => x.TestRun == runId).ToListAsync();
61-
default:
62-
throw new NotImplementedException();
51+
switch (strategy)
52+
{
53+
case InsertStrategy.InsertReturn:
54+
return dbContext.ExecuteBulkInsertReturnEntities(entities, actualConfigure, onConflict);
55+
case InsertStrategy.InsertReturnAsync:
56+
return await dbContext.ExecuteBulkInsertReturnEntitiesAsync(entities, actualConfigure, onConflict);
57+
case InsertStrategy.Insert:
58+
dbContext.ExecuteBulkInsert(entities, actualConfigure, onConflict);
59+
return dbContext.Set<T>().Where(x => x.TestRun == runId).ToList();
60+
case InsertStrategy.InsertAsync:
61+
await dbContext.ExecuteBulkInsertAsync(entities, actualConfigure, onConflict);
62+
return await dbContext.Set<T>().Where(x => x.TestRun == runId).ToListAsync();
63+
default:
64+
throw new NotImplementedException();
65+
}
66+
}
67+
finally
68+
{
69+
dbContext.ChangeTracker.Clear();
6370
}
6471
}
6572
}

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Basic/BasicTestsBase.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,12 @@ public async Task InsertEntities_MultipleTimes(InsertStrategy strategy)
103103
// Arrange
104104
var entities = new List<TestEntity>
105105
{
106-
new TestEntity { Name = $"{_run}_Entity1" },
107-
new TestEntity { Name = $"{_run}_Entity2" }
106+
new TestEntity { TestRun = _run, Name = $"{_run}_Entity1" },
107+
new TestEntity { TestRun = _run, Name = $"{_run}_Entity2" }
108108
};
109109

110110
// Act
111-
await _context.ExecuteBulkInsertAsync(entities);
111+
await _context.InsertWithStrategyAsync(strategy, entities);
112112

113113
foreach (var entity in entities)
114114
{
@@ -457,7 +457,7 @@ public async Task InsertEntities_WithOpenTransaction_RollsBackOnFailure(InsertSt
457457
Assert.Empty(insertedEntities);
458458
}
459459

460-
[SkippableFact]
460+
[Fact]
461461
public async Task ThrowsWhenUsingWrongConfigurationType()
462462
{
463463
// Skip for providers that don't support this feature
@@ -466,8 +466,8 @@ public async Task ThrowsWhenUsingWrongConfigurationType()
466466
// Arrange
467467
var entities = new List<TestEntity>
468468
{
469-
new TestEntity { TestRun = _run, Name = $"{_run}_Entity1" },
470-
new TestEntity { TestRun = _run, Name = $"{_run}_Entity2" }
469+
new TestEntity { Name = $"{_run}_Entity1" },
470+
new TestEntity { Name = $"{_run}_Entity2" }
471471
};
472472

473473
// Act & Assert

0 commit comments

Comments
 (0)