Skip to content

Commit 3f9b3f0

Browse files
TastefulTasteful
committed
Update async tests to use async methods of dbContext
1 parent 0777959 commit 3f9b3f0

1 file changed

Lines changed: 32 additions & 36 deletions

File tree

‎src/AutoMapper.Collection.EntityFrameworkCore.Tests/EntityFrameworkCoreTestsBase.cs‎

Lines changed: 32 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ public async Task Persist_InsertOrUpdateAsync_WhenEntityExist_ThenTheEntityShoul
9696
db.Things.Add(new Thing { Title = "Test2" });
9797
db.Things.Add(new Thing { Title = "Test3" });
9898
db.Things.Add(new Thing { Title = "Test4" });
99-
db.SaveChanges();
99+
await db.SaveChangesAsync();
100100

101-
var item = db.Things.First();
101+
var item = await db.Things.FirstAsync();
102102

103103
// Act
104104
await db.Things.Persist(mapper).InsertOrUpdateAsync(new ThingDto { ID = item.ID, Title = "Test" });
@@ -114,17 +114,17 @@ public async Task Persist_InsertOrUpdateAsync_WhenEntityExist_ThenTheEntityShoul
114114
db.Things.Add(new Thing { Title = "Test2" });
115115
db.Things.Add(new Thing { Title = "Test3" });
116116
db.Things.Add(new Thing { Title = "Test4" });
117-
db.SaveChanges();
117+
await db.SaveChangesAsync();
118118

119-
var item = db.Things.First();
119+
var item = await db.Things.FirstAsync();
120120

121121
// Act
122122
await db.Things.Persist(mapper).InsertOrUpdateAsync(new ThingDto { ID = item.ID, Title = "Test" });
123-
db.SaveChanges();
123+
await db.SaveChangesAsync();
124124

125125
// Assert
126-
db.Things.Count().Should().Be(3);
127-
db.Things.FirstOrDefault(x => x.ID == item.ID).Title.Should().Be("Test");
126+
(await db.Things.CountAsync()).Should().Be(3);
127+
(await db.Things.FirstOrDefaultAsync(x => x.ID == item.ID)).Title.Should().Be("Test");
128128
}
129129

130130
[Fact]
@@ -134,7 +134,7 @@ public async Task Persist_InsertOrUpdateAsync_WhenEntityDoesNotExist_ThenTheEnti
134134
db.Things.Add(new Thing { Title = "Test2" });
135135
db.Things.Add(new Thing { Title = "Test3" });
136136
db.Things.Add(new Thing { Title = "Test4" });
137-
db.SaveChanges();
137+
await db.SaveChangesAsync();
138138

139139
// Act
140140
var createdThing = await db.Things.Persist(mapper).InsertOrUpdateAsync(new ThingDto { Title = "Test" });
@@ -151,16 +151,16 @@ public async Task Persist_InsertOrUpdateAsync_WhenEntityDoesNotExist_ThenTheEnti
151151
db.Things.Add(new Thing { Title = "Test2" });
152152
db.Things.Add(new Thing { Title = "Test3" });
153153
db.Things.Add(new Thing { Title = "Test4" });
154-
db.SaveChanges();
154+
await db.SaveChangesAsync();
155155

156156
// Act
157157
var createdThing = await db.Things.Persist(mapper).InsertOrUpdateAsync(new ThingDto { Title = "Test" });
158-
db.SaveChanges();
158+
await db.SaveChangesAsync();
159159

160160
// Assert
161161
createdThing.Should().NotBeNull();
162-
db.Things.Count().Should().Be(4);
163-
var createdThingFromEF = db.Things.OrderByDescending(x => x.ID).FirstOrDefault();
162+
(await db.Things.CountAsync()).Should().Be(4);
163+
var createdThingFromEF = await db.Things.OrderByDescending(x => x.ID).FirstOrDefaultAsync();
164164
createdThingFromEF.Title.Should().Be("Test");
165165
createdThing.Should().BeEquivalentTo(createdThingFromEF);
166166
}
@@ -210,9 +210,9 @@ public async Task Persist_RemoveAsync_WhenEntityExist_ThenTheEntityShouldBeInThe
210210
db.Things.Add(new Thing { Title = "Test2" });
211211
db.Things.Add(new Thing { Title = "Test3" });
212212
db.Things.Add(new Thing { Title = "Test4" });
213-
db.SaveChanges();
213+
await db.SaveChangesAsync();
214214

215-
var item = db.Things.First();
215+
var item = await db.Things.FirstAsync();
216216

217217
// Act
218218
await db.Things.Persist(mapper).RemoveAsync(new ThingDto { ID = item.ID, Title = "Test" });
@@ -228,17 +228,17 @@ public async Task Persist_RemoveAsync_WhenEntityExist_ThenTheEntityShouldBeDelet
228228
db.Things.Add(new Thing { Title = "Test2" });
229229
db.Things.Add(new Thing { Title = "Test3" });
230230
db.Things.Add(new Thing { Title = "Test4" });
231-
db.SaveChanges();
231+
await db.SaveChangesAsync();
232232

233-
var item = db.Things.First();
233+
var item = await db.Things.FirstAsync();
234234

235235
// Act
236236
await db.Things.Persist(mapper).RemoveAsync(new ThingDto { ID = item.ID, Title = "Test" });
237-
db.SaveChanges();
237+
await db.SaveChangesAsync();
238238

239239
// Assert
240-
db.Things.Count().Should().Be(2);
241-
db.Things.Find(item.ID).Should().BeNull();
240+
(await db.Things.CountAsync()).Should().Be(2);
241+
(await db.Things.FindAsync(item.ID)).Should().BeNull();
242242
}
243243

244244
[Fact]
@@ -340,7 +340,7 @@ public async Task Persist_RemoveAsync_WhenEntityDoesNotExist_ThenShouldBeUnchang
340340
db.Things.Add(new Thing { Title = "Test2" });
341341
db.Things.Add(new Thing { Title = "Test3" });
342342
db.Things.Add(new Thing { Title = "Test4" });
343-
db.SaveChanges();
343+
await db.SaveChangesAsync();
344344

345345
// Act
346346
await db.Things.Persist(mapper).RemoveAsync(new ThingDto { Title = "ignored" });
@@ -358,17 +358,17 @@ public async Task Persist_RemoveAsync_WhenEntityDoesNotExist_ThenShouldBeNoChang
358358
db.Things.Add(new Thing { Title = "Test2" });
359359
db.Things.Add(new Thing { Title = "Test3" });
360360
db.Things.Add(new Thing { Title = "Test4" });
361-
db.SaveChanges();
361+
await db.SaveChangesAsync();
362362

363-
var item = db.Things.OrderByDescending(x => x.ID).First();
363+
var item = await db.Things.OrderByDescending(x => x.ID).FirstAsync();
364364

365365
// Act
366366
await db.Things.Persist(mapper).RemoveAsync(new ThingDto { Title = "ignored" });
367-
db.SaveChanges();
367+
await db.SaveChangesAsync();
368368

369369
// Assert
370-
db.Things.Count().Should().Be(3);
371-
db.Things.Find(item.ID + 1).Should().BeNull();
370+
(await db.Things.CountAsync()).Should().Be(3);
371+
(await db.Things.FindAsync(item.ID + 1)).Should().BeNull();
372372
}
373373

374374
[Fact]
@@ -382,11 +382,9 @@ public async Task Persist_InsertOrUpdateAsync_WhenSameEntity_ThenTheEntityShould
382382
db.Things.Add(new Thing { Title = "Test2" });
383383
db.Things.Add(new Thing { Title = "Test3" });
384384
db.Things.Add(new Thing { Title = "Test4" });
385-
db.SaveChanges();
385+
await db.SaveChangesAsync();
386386

387-
//var item = db.Things.Where(x => x.Title == "Test2").First(); // first(special)
388-
var item = db.Things.Where(x => x.Title == "Test3").First(); // middleish
389-
//var item = db.Things.Where(x => x.Title == "Test4").First(); // last (special)
387+
var item = await db.Things.Where(x => x.Title == "Test3").FirstAsync();
390388

391389
// Act
392390
await db.Things.Persist(mapper).InsertOrUpdateAsync(new ThingDto { ID = item.ID, Title = item.Title });
@@ -406,19 +404,17 @@ public async Task Persist_InsertOrUpdateAsync_WhenSameEntity_ThenSavedEntityShou
406404
db.Things.Add(new Thing { Title = "Test2" });
407405
db.Things.Add(new Thing { Title = "Test3" });
408406
db.Things.Add(new Thing { Title = "Test4" });
409-
db.SaveChanges();
407+
await db.SaveChangesAsync();
410408

411-
//var item = db.Things.Where(x => x.Title == "Test2").First(); // first(special)
412-
var item = db.Things.Where(x => x.Title == "Test3").First(); // middleish
413-
//var item = db.Things.Where(x => x.Title == "Test4").First(); // last (special)
409+
var item = await db.Things.Where(x => x.Title == "Test3").FirstAsync();
414410

415411
// Act
416412
await db.Things.Persist(mapper).InsertOrUpdateAsync(new ThingDto { ID = item.ID, Title = item.Title });
417-
db.SaveChanges();
413+
await db.SaveChangesAsync();
418414

419415
// Assert
420-
db.Things.Count().Should().Be(3);
421-
db.Things.FirstOrDefault(x => x.ID == item.ID).Title.Should().Be(item.Title);
416+
(await db.Things.CountAsync()).Should().Be(3);
417+
(await db.Things.FirstOrDefaultAsync(x => x.ID == item.ID)).Title.Should().Be(item.Title);
422418
}
423419

424420
public virtual void Dispose() => db?.Dispose();

0 commit comments

Comments
 (0)