Skip to content

Commit 8aa9443

Browse files
Shane32Shane32
authored
Add ConfigureAwait(false) to various tests (graphql-dotnet#3070)
1 parent ce15a01 commit 8aa9443

File tree

6 files changed

+57
-57
lines changed

6 files changed

+57
-57
lines changed

‎src/GraphQL.DataLoader.Tests/BatchDataLoaderTests.cs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,9 @@ public async Task All_Requested_Keys_Should_Be_Cached()
251251
var task3 = result3.GetResultAsync();
252252

253253
// Now await tasks
254-
user1 = await task1;
255-
user2 = await task2;
256-
user3 = await task3;
254+
user1 = await task1.ConfigureAwait(false);
255+
user2 = await task2.ConfigureAwait(false);
256+
user3 = await task3.ConfigureAwait(false);
257257

258258
// Load key 3 again.
259259
var result3b = loader.LoadAsync(3);
@@ -263,9 +263,9 @@ public async Task All_Requested_Keys_Should_Be_Cached()
263263
task3b.Status.ShouldBe(TaskStatus.RanToCompletion,
264264
"Should be cached because it was requested in the first batch even though it wasn't in the result dictionary");
265265

266-
await loader.DispatchAsync();
266+
await loader.DispatchAsync().ConfigureAwait(false);
267267

268-
var user3b = await task3b;
268+
var user3b = await task3b.ConfigureAwait(false);
269269

270270
user3.ShouldBeSameAs(nullObjectUser, "The DataLoader should use the supplied default value");
271271

@@ -301,9 +301,9 @@ public async Task ToDictionary_Exception()
301301
Exception ex = await Should.ThrowAsync<ArgumentException>(async () =>
302302
{
303303
// Now await tasks
304-
var user1 = await task1.GetResultAsync();
305-
var user2 = await task2.GetResultAsync();
306-
});
304+
var user1 = await task1.GetResultAsync().ConfigureAwait(false);
305+
var user2 = await task2.GetResultAsync().ConfigureAwait(false);
306+
}).ConfigureAwait(false);
307307

308308
var actualException = Should.Throw<ArgumentException>(() =>
309309
{
@@ -340,13 +340,13 @@ public async Task Failing_DataLoaders_Only_Execute_Once()
340340
Exception ex = await Should.ThrowAsync<ApplicationException>(async () =>
341341
{
342342
// Now await tasks
343-
var user1 = await task1.GetResultAsync();
343+
var user1 = await task1.GetResultAsync().ConfigureAwait(false);
344344
});
345345

346346
Exception ex2 = await Should.ThrowAsync<ApplicationException>(async () =>
347347
{
348348
// Now await tasks
349-
var user2 = await task2.GetResultAsync();
349+
var user2 = await task2.GetResultAsync().ConfigureAwait(false);
350350
});
351351

352352
mock.Verify(x => x.GetUsersByIdAsync(new[] { 1, 2 }, default));
@@ -371,14 +371,14 @@ public async Task Keys_Are_DeDuped()
371371
var result2 = loader.LoadAsync(1);
372372

373373
// Dispatch loading
374-
await loader.DispatchAsync();
374+
await loader.DispatchAsync().ConfigureAwait(false);
375375

376376
var task1 = result1.GetResultAsync();
377377
var task2 = result2.GetResultAsync();
378378

379379
// Now await tasks
380-
var user1 = await task1;
381-
var user1b = await task2;
380+
var user1 = await task1.ConfigureAwait(false);
381+
var user1b = await task2.ConfigureAwait(false);
382382

383383
user1.ShouldBeSameAs(users[0]);
384384
user1b.ShouldBeSameAs(users[0]);
@@ -391,13 +391,13 @@ public async Task Keys_Are_DeDuped()
391391
public async Task Returns_Null_For_Null_Reference_Types()
392392
{
393393
var loader = new BatchDataLoader<object, string>((_, _) => throw new Exception());
394-
(await loader.LoadAsync(null).GetResultAsync()).ShouldBeNull();
394+
(await loader.LoadAsync(null).GetResultAsync().ConfigureAwait(false)).ShouldBeNull();
395395
}
396396

397397
[Fact]
398398
public async Task Returns_Null_For_Null_Value_Types()
399399
{
400400
var loader = new BatchDataLoader<int?, string>((_, _) => throw new Exception());
401-
(await loader.LoadAsync(null).GetResultAsync()).ShouldBeNull();
401+
(await loader.LoadAsync(null).GetResultAsync().ConfigureAwait(false)).ShouldBeNull();
402402
}
403403
}

‎src/GraphQL.DataLoader.Tests/CollectionBatchLoaderTests.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ public async Task NonExistent_Key_Should_Return_Empty()
2626
var result2 = loader.LoadAsync(2);
2727

2828
// Dispatch loading
29-
await loader.DispatchAsync();
29+
await loader.DispatchAsync().ConfigureAwait(false);
3030

3131
var task1 = result1.GetResultAsync();
3232
var task2 = result2.GetResultAsync();
3333

34-
var user1Orders = await task1;
35-
var user2Orders = await task2;
34+
var user1Orders = await task1.ConfigureAwait(false);
35+
var user2Orders = await task2.ConfigureAwait(false);
3636

3737
user1Orders.ShouldNotBeNull();
3838
user2Orders.ShouldNotBeNull();
@@ -67,13 +67,13 @@ public async Task All_Requested_Keys_Should_Be_Cached()
6767
var result2 = loader.LoadAsync(2);
6868

6969
// Dispatch loading
70-
await loader.DispatchAsync();
70+
await loader.DispatchAsync().ConfigureAwait(false);
7171

7272
var task1 = result1.GetResultAsync();
7373
var task2 = result2.GetResultAsync();
7474

75-
var user1Orders = await task1;
76-
var user2Orders = await task2;
75+
var user1Orders = await task1.ConfigureAwait(false);
76+
var user2Orders = await task2.ConfigureAwait(false);
7777

7878
user1Orders.ShouldNotBeNull();
7979
user2Orders.ShouldNotBeNull();
@@ -94,7 +94,7 @@ public async Task All_Requested_Keys_Should_Be_Cached()
9494
//task3.Status.ShouldNotBe(TaskStatus.RanToCompletion, "Result should already be cached");
9595

9696
// Dispatch loading
97-
await loader.DispatchAsync();
97+
await loader.DispatchAsync().ConfigureAwait(false);
9898

9999
var user1bOrders = await task1b;
100100
var user2bOrders = await task2b;
@@ -134,14 +134,14 @@ public async Task Keys_Are_DeDuped()
134134
var result2 = loader.LoadAsync(1);
135135

136136
// Dispatch loading
137-
await loader.DispatchAsync();
137+
await loader.DispatchAsync().ConfigureAwait(false);
138138

139139
var task1 = result1.GetResultAsync();
140140
var task2 = result2.GetResultAsync();
141141

142142
// Now await tasks
143-
var user1Orders = await task1;
144-
var user1bOrders = await task2;
143+
var user1Orders = await task1.ConfigureAwait(false);
144+
var user1bOrders = await task2.ConfigureAwait(false);
145145

146146
mock.Verify(x => x.GetOrdersByUserIdAsync(new[] { 1 }, default), Times.Once,
147147
"The keys passed to the fetch delegate should be de-duplicated");
@@ -151,13 +151,13 @@ public async Task Keys_Are_DeDuped()
151151
public async Task Returns_Null_For_Null_Reference_Types()
152152
{
153153
var loader = new CollectionBatchDataLoader<object, string>((_, _) => throw new Exception());
154-
(await loader.LoadAsync(null).GetResultAsync()).ShouldBeNull();
154+
(await loader.LoadAsync(null).GetResultAsync().ConfigureAwait(false)).ShouldBeNull();
155155
}
156156

157157
[Fact]
158158
public async Task Returns_Null_For_Null_Value_Types()
159159
{
160160
var loader = new CollectionBatchDataLoader<int?, string>((_, _) => throw new Exception());
161-
(await loader.LoadAsync(null).GetResultAsync()).ShouldBeNull();
161+
(await loader.LoadAsync(null).GetResultAsync().ConfigureAwait(false)).ShouldBeNull();
162162
}
163163
}

‎src/GraphQL.DataLoader.Tests/DataLoaderExtensionsTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public async Task LoadAsync_MultipleKeys_CallsSingularMultipleTimes()
2020
{
2121
var mock = GetMockDataLoader();
2222
var keys = new[] { 1, 2 };
23-
var users = await DataLoaderExtensions.LoadAsync(mock.Object, keys).GetResultAsync();
23+
var users = await DataLoaderExtensions.LoadAsync(mock.Object, keys).GetResultAsync().ConfigureAwait(false);
2424

2525
users.ShouldNotBeNull();
2626
users.Length.ShouldBe(keys.Length, "Should return array of same length as number of keys provided");
@@ -38,7 +38,7 @@ public async Task LoadAsync_MultipleKeys_CallsSingularMultipleTimes()
3838
public async Task LoadAsync_MultipleKeysAsParams_CallsSingularMultipleTimes()
3939
{
4040
var mock = GetMockDataLoader();
41-
var users = await DataLoaderExtensions.LoadAsync(mock.Object, 1, 2).GetResultAsync();
41+
var users = await DataLoaderExtensions.LoadAsync(mock.Object, 1, 2).GetResultAsync().ConfigureAwait(false);
4242

4343
users.ShouldNotBeNull();
4444
users.Length.ShouldBe(2, "Should return array of same length as number of keys provided");
@@ -79,17 +79,17 @@ public void LoadAsync_MultipleKeys_Works()
7979
var result2 = loader.LoadAsync(new int[] { 1, 2, 3 });
8080

8181
// Dispatch loading
82-
await loader.DispatchAsync();
82+
await loader.DispatchAsync().ConfigureAwait(false);
8383
var task1 = result1.GetResultAsync();
8484
var task2 = result2.GetResultAsync();
8585

8686
// Now await tasks
87-
users1 = await task1;
87+
users1 = await task1.ConfigureAwait(false);
8888
users1.ShouldNotBeNull();
8989
user1 = users1[0];
9090
user2 = users1[1];
9191

92-
users2 = await task2;
92+
users2 = await task2.ConfigureAwait(false);
9393
users2.ShouldNotBeNull();
9494
user3 = users2[2];
9595
});

‎src/GraphQL.DataLoader.Tests/DataLoaderSubscriptionTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public async Task OneResultOverSubscription_Works()
2626
ordersMock.Setup(x => x.GetOrderObservable()).Returns(orderStream);
2727
orderStream.OnNext(order);
2828

29-
var result = await ExecuteSubscribeAsync("subscription OrderAdded { orderAdded { orderId } }");
29+
var result = await ExecuteSubscribeAsync("subscription OrderAdded { orderAdded { orderId } }").ConfigureAwait(false);
3030

3131
/* Then */
3232
var stream = result.Streams.Values.FirstOrDefault();

‎src/GraphQL.DataLoader.Tests/SimpleDataLoaderTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public async Task Result_Is_Cached()
2222

2323
var delayResult = loader.LoadAsync();
2424

25-
await loader.DispatchAsync();
25+
await loader.DispatchAsync().ConfigureAwait(false);
2626

2727
var result1 = await delayResult.GetResultAsync();
2828

@@ -35,7 +35,7 @@ public async Task Result_Is_Cached()
3535

3636
task2.Status.ShouldBe(TaskStatus.RanToCompletion);
3737

38-
var result2 = await task2;
38+
var result2 = await task2.ConfigureAwait(false);
3939

4040
// Results should be the same instance
4141
result2.ShouldBeSameAs(result1);
@@ -70,7 +70,7 @@ public async Task Operation_Can_Be_Cancelled()
7070

7171
var task = result.GetResultAsync(cts.Token);
7272

73-
await Should.ThrowAsync<TaskCanceledException>(task);
73+
await Should.ThrowAsync<TaskCanceledException>(task).ConfigureAwait(false);
7474

7575
mock.Verify(x => x.GetAllUsersAsync(cts.Token), Times.Once);
7676
}
@@ -93,7 +93,7 @@ public async Task Operation_Cancelled_Before_Dispatch_Does_Not_Execute()
9393

9494
cts.Cancel();
9595

96-
await Should.ThrowAsync<OperationCanceledException>(() => result.GetResultAsync(cts.Token));
96+
await Should.ThrowAsync<OperationCanceledException>(() => result.GetResultAsync(cts.Token)).ConfigureAwait(false);
9797

9898
// Fetch delegate should not be called
9999
mock.VerifyNoOtherCalls();
@@ -138,7 +138,7 @@ public async Task Immediate_Exception_Is_Bubbled_Properly()
138138

139139
var result = loader.LoadAsync();
140140

141-
var ex = await Should.ThrowAsync<Exception>(() => result.GetResultAsync());
141+
var ex = await Should.ThrowAsync<Exception>(() => result.GetResultAsync()).ConfigureAwait(false);
142142

143143
ex.Message.ShouldBe("Immediate");
144144
}

0 commit comments

Comments
 (0)