Skip to content

Commit 0c7277b

Browse files
JoshLozenskyJoshLozensky
authored
removed ConfigureAwait(false) from all tests (#3051)
1 parent 070153c commit 0c7277b

14 files changed

Lines changed: 83 additions & 83 deletions

‎tests/Microsoft.Identity.Web.Test.Common/TestHelpers/TestMsalDistributedTokenCacheAdapter.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,22 @@ public TestMsalDistributedTokenCacheAdapter(
3131

3232
public async Task TestRemoveKeyAsync(string cacheKey)
3333
{
34-
await RemoveKeyAsync(cacheKey).ConfigureAwait(false);
34+
await RemoveKeyAsync(cacheKey);
3535
}
3636

3737
public async Task TestWriteCacheBytesAsync(string cacheKey, byte[] bytes, CacheSerializerHints? cacheSerializerHints = null)
3838
{
39-
await WriteCacheBytesAsync(cacheKey, bytes, cacheSerializerHints).ConfigureAwait(false);
39+
await WriteCacheBytesAsync(cacheKey, bytes, cacheSerializerHints);
4040
}
4141

4242
public async Task<byte[]?> TestReadCacheBytesAsync(string cacheKey)
4343
{
44-
return await ReadCacheBytesAsync(cacheKey).ConfigureAwait(false);
44+
return await ReadCacheBytesAsync(cacheKey);
4545
}
4646

4747
public async Task<byte[]?> TestReadCacheBytesAsync(string cacheKey, TelemetryData telemetryData)
4848
{
49-
return await ReadCacheBytesAsync(cacheKey, new CacheSerializerHints() { TelemetryData = telemetryData }).ConfigureAwait(false);
49+
return await ReadCacheBytesAsync(cacheKey, new CacheSerializerHints() { TelemetryData = telemetryData });
5050
}
5151
}
5252
}

‎tests/Microsoft.Identity.Web.Test/AzureADB2COpenIDConnectEventHandlersTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public async Task OnRedirectToIdentityProvider_CustomUserFlow_UpdatesContext(boo
5555
},
5656
};
5757

58-
await handler.OnRedirectToIdentityProvider(context).ConfigureAwait(false);
58+
await handler.OnRedirectToIdentityProvider(context);
5959

6060
errorAccessor.DidNotReceive().SetMessage(httpContext, Arg.Any<string>());
6161
Assert.Equal(TestConstants.Scopes, context.ProtocolMessage.Scope);
@@ -82,7 +82,7 @@ public async Task OnRedirectToIdentityProvider_DefaultUserFlow_DoesntUpdateConte
8282
authProperties.Items.Add(OidcConstants.PolicyKey, DefaultUserFlow);
8383
var context = new RedirectContext(httpContext, _authScheme, new OpenIdConnectOptions(), authProperties) { ProtocolMessage = new OpenIdConnectMessage() { IssuerAddress = _defaultIssuer } };
8484

85-
await handler.OnRedirectToIdentityProvider(context).ConfigureAwait(false);
85+
await handler.OnRedirectToIdentityProvider(context);
8686

8787
errorAccessor.DidNotReceive().SetMessage(httpContext, Arg.Any<string>());
8888
Assert.Null(context.ProtocolMessage.Scope);
@@ -101,7 +101,7 @@ public async Task OnRemoteFailure_PasswordReset_RedirectsSuccessfully()
101101

102102
var passwordResetException = "'access_denied', error_description: 'AADB2C90118: The user has forgotten their password. Correlation ID: f99deff4-f43b-43cc-b4e7-36141dbaf0a0 Timestamp: 2018-03-05 02:49:35Z', error_uri: 'error_uri is null'";
103103

104-
await handler.OnRemoteFailure(new RemoteFailureContext(httpContext, _authScheme, new OpenIdConnectOptions(), new OpenIdConnectProtocolException(passwordResetException))).ConfigureAwait(false);
104+
await handler.OnRemoteFailure(new RemoteFailureContext(httpContext, _authScheme, new OpenIdConnectOptions(), new OpenIdConnectProtocolException(passwordResetException)));
105105

106106
errorAccessor.DidNotReceive().SetMessage(httpContext, Arg.Any<string>());
107107
httpContext.Response.Received().Redirect($"{httpContext.Request.PathBase}/MicrosoftIdentity/Account/ResetPassword/{OpenIdConnectDefaults.AuthenticationScheme}");
@@ -122,7 +122,7 @@ await handler.OnRemoteFailure(
122122
httpContext,
123123
_authScheme,
124124
new OpenIdConnectOptions(),
125-
new OpenIdConnectProtocolException(cancelException))).ConfigureAwait(false);
125+
new OpenIdConnectProtocolException(cancelException)));
126126

127127
errorAccessor.DidNotReceive().SetMessage(httpContext, Arg.Any<string>());
128128

@@ -144,7 +144,7 @@ await handler.OnRemoteFailure(
144144
httpContext,
145145
_authScheme,
146146
new OpenIdConnectOptions(),
147-
new OpenIdConnectProtocolException(otherException))).ConfigureAwait(false);
147+
new OpenIdConnectProtocolException(otherException)));
148148

149149
errorAccessor.Received(1).SetMessage(httpContext, otherException);
150150
httpContext.Response.Received().Redirect($"{httpContext.Request.PathBase}/MicrosoftIdentity/Account/Error");

‎tests/Microsoft.Identity.Web.Test/CacheEncryptionTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ public async Task EncryptionTestAsync(bool isEncrypted)
4141
_testCacheAdapter.Initialize(tokenCache);
4242

4343
// Act
44-
await tokenCache._beforeAccess(args).ConfigureAwait(false);
44+
await tokenCache._beforeAccess(args);
4545
tokenCache.cache = cache;
46-
await tokenCache._afterAccess(args).ConfigureAwait(false);
46+
await tokenCache._afterAccess(args);
4747

4848
// Assert
4949
Assert.NotNull(_testCacheAdapter._memoryCache);

‎tests/Microsoft.Identity.Web.Test/Certificates/WithClientCredentialsTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public async Task FicFails_CertificateFallback()
6565
credentialDescriptions,
6666
logger,
6767
credLoader,
68-
null).ConfigureAwait(false);
68+
null);
6969
#pragma warning restore CS8600 // Converting null literal or possible null value to non-nullable type.
7070

7171
Assert.Equal(credentialDescriptions[1], cd);

‎tests/Microsoft.Identity.Web.Test/ClientAssertionTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ public async Task TestClientAssertion()
3131
TestClientAssertion clientAssertionDescription = new TestClientAssertion();
3232
AssertionRequestOptions options = new AssertionRequestOptions();
3333

34-
string assertion = await clientAssertionDescription.GetSignedAssertionAsync(options).ConfigureAwait(false);
34+
string assertion = await clientAssertionDescription.GetSignedAssertionAsync(options);
3535

3636
Assert.Equal("1", assertion);
37-
assertion = await clientAssertionDescription.GetSignedAssertionAsync(options).ConfigureAwait(false);
37+
assertion = await clientAssertionDescription.GetSignedAssertionAsync(options);
3838
Assert.Equal("1", assertion);
3939

4040
Assert.NotNull(clientAssertionDescription.Expiry);
41-
await Task.Delay(clientAssertionDescription.Expiry.Value - DateTimeOffset.Now + TimeSpan.FromMilliseconds(100)).ConfigureAwait(false);
42-
assertion = await clientAssertionDescription.GetSignedAssertionAsync(options).ConfigureAwait(false);
41+
await Task.Delay(clientAssertionDescription.Expiry.Value - DateTimeOffset.Now + TimeSpan.FromMilliseconds(100));
42+
assertion = await clientAssertionDescription.GetSignedAssertionAsync(options);
4343
Assert.Equal("2", assertion);
4444
}
4545

‎tests/Microsoft.Identity.Web.Test/L1L2CacheTests.cs‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public async Task WriteCache_WritesInL1L2_TestAsync(bool enableAsyncL2Write)
5252

5353
// Act
5454
TestDistributedCache.ResetEvent.Reset();
55-
await _testCacheAdapter.TestWriteCacheBytesAsync(DefaultCacheKey, cache).ConfigureAwait(false);
55+
await _testCacheAdapter.TestWriteCacheBytesAsync(DefaultCacheKey, cache);
5656

5757
// Assert
5858
Assert.Equal(1, _testCacheAdapter._memoryCache.Count);
@@ -64,29 +64,29 @@ public async Task WriteCache_WritesInL1L2_TestAsync(bool enableAsyncL2Write)
6464
public async Task WriteCache_NegativeExpiry_TestAsync()
6565
{
6666
// Arrange & Act
67-
await CreateL1L2TestWithSerializerHints(System.DateTimeOffset.Now - System.TimeSpan.FromHours(1), 0).ConfigureAwait(false);
67+
await CreateL1L2TestWithSerializerHints(System.DateTimeOffset.Now - System.TimeSpan.FromHours(1), 0);
6868

6969
// Assert
7070
Assert.NotNull(_testCacheAdapter._memoryCache);
7171
Assert.Null(_testCacheAdapter._memoryCache.Get(DefaultCacheKey));
7272

73-
await _testCacheAdapter.TestReadCacheBytesAsync(DefaultCacheKey).ConfigureAwait(false);
73+
await _testCacheAdapter.TestReadCacheBytesAsync(DefaultCacheKey);
7474
Assert.Equal(1, _testCacheAdapter._memoryCache.Count);
7575
}
7676

7777
[Fact]
7878
public async Task WriteCacheL1L2_NegativeExpiry_TestAsync()
7979
{
8080
// Arrange & Act
81-
await CreateL1L2TestWithSerializerHints(System.DateTimeOffset.Now - System.TimeSpan.FromHours(1), 0).ConfigureAwait(false);
81+
await CreateL1L2TestWithSerializerHints(System.DateTimeOffset.Now - System.TimeSpan.FromHours(1), 0);
8282

8383
// Assert
8484
Assert.NotNull(_testCacheAdapter._memoryCache);
8585
Assert.Null(_testCacheAdapter._memoryCache.Get(DefaultCacheKey));
8686
var options = (_testCacheAdapter._distributedCache as TestDistributedCache)!.GetDistributedCacheEntryOptions(DefaultCacheKey);
8787
Assert.NotNull(options);
8888
Assert.NotNull(options.AbsoluteExpiration);
89-
await _testCacheAdapter.TestReadCacheBytesAsync(DefaultCacheKey).ConfigureAwait(false);
89+
await _testCacheAdapter.TestReadCacheBytesAsync(DefaultCacheKey);
9090
Assert.Equal(1, _testCacheAdapter._memoryCache.Count);
9191
}
9292

@@ -96,7 +96,7 @@ public async Task WriteCacheL1L2_PositiveExpiry_TestAsync()
9696
// Arrange & Act
9797
var timespan = System.TimeSpan.FromHours(1);
9898
var expiry = System.DateTimeOffset.UtcNow + timespan;
99-
await CreateL1L2TestWithSerializerHints(expiry, 1).ConfigureAwait(false);
99+
await CreateL1L2TestWithSerializerHints(expiry, 1);
100100

101101
// Assert
102102
Assert.NotNull(_testCacheAdapter._memoryCache);
@@ -107,20 +107,20 @@ public async Task WriteCacheL1L2_PositiveExpiry_TestAsync()
107107
Assert.NotNull(options);
108108
Assert.NotNull(options.AbsoluteExpiration);
109109
Assert.Equal(expiry, options.AbsoluteExpiration.Value);
110-
await _testCacheAdapter.TestReadCacheBytesAsync(DefaultCacheKey).ConfigureAwait(false);
110+
await _testCacheAdapter.TestReadCacheBytesAsync(DefaultCacheKey);
111111
Assert.Equal(1, _testCacheAdapter._memoryCache.Count);
112112
}
113113

114114
[Fact]
115115
public async Task WriteCacheL1L2_PositiveExpiryAndAbsoluteOptions_TestAsync()
116116
{
117-
await CreateL1L2TestWithAbsoluteOptions(1.5).ConfigureAwait(false);
117+
await CreateL1L2TestWithAbsoluteOptions(1.5);
118118
}
119119

120120
[Fact]
121121
public async Task WriteCacheL1L2_PositiveExpiryAndAbsoluteOptionsLessThanSuggestedExpiry_TestAsync()
122122
{
123-
await CreateL1L2TestWithAbsoluteOptions(.5).ConfigureAwait(false);
123+
await CreateL1L2TestWithAbsoluteOptions(.5);
124124
}
125125

126126
private async Task CreateL1L2TestWithAbsoluteOptions(double time)
@@ -131,7 +131,7 @@ private async Task CreateL1L2TestWithAbsoluteOptions(double time)
131131
var absoluteOptions = Provider.GetService<IOptions<MsalDistributedTokenCacheAdapterOptions>>();
132132
Assert.NotNull(absoluteOptions);
133133
absoluteOptions.Value.AbsoluteExpiration = System.DateTimeOffset.Now + System.TimeSpan.FromHours(time);
134-
await CreateL1L2TestWithSerializerHints(suggestedExpiry, 1).ConfigureAwait(false);
134+
await CreateL1L2TestWithSerializerHints(suggestedExpiry, 1);
135135

136136
// Assert
137137
Assert.NotNull(_testCacheAdapter._memoryCache);
@@ -150,7 +150,7 @@ private async Task CreateL1L2TestWithAbsoluteOptions(double time)
150150
}
151151

152152
absoluteOptions.Value.AbsoluteExpiration = null;
153-
await _testCacheAdapter.TestReadCacheBytesAsync(DefaultCacheKey).ConfigureAwait(false);
153+
await _testCacheAdapter.TestReadCacheBytesAsync(DefaultCacheKey);
154154
Assert.Equal(1, _testCacheAdapter._memoryCache.Count);
155155
}
156156

@@ -169,7 +169,7 @@ private async Task CreateL1L2TestWithSerializerHints(
169169

170170
// Act
171171
TestDistributedCache.ResetEvent.Reset();
172-
await _testCacheAdapter.TestWriteCacheBytesAsync(DefaultCacheKey, cache, cacheSerializerHints).ConfigureAwait(false);
172+
await _testCacheAdapter.TestWriteCacheBytesAsync(DefaultCacheKey, cache, cacheSerializerHints);
173173

174174
// Assert
175175
Assert.Equal(memoryCacheExpectedCount, _testCacheAdapter._memoryCache.Count);
@@ -192,7 +192,7 @@ public async Task SetL1Cache_ReadL1_TestAsync()
192192
Assert.Empty(L2Cache._dict);
193193

194194
// Act
195-
byte[]? result = await _testCacheAdapter.TestReadCacheBytesAsync(DefaultCacheKey, telemetryData).ConfigureAwait(false);
195+
byte[]? result = await _testCacheAdapter.TestReadCacheBytesAsync(DefaultCacheKey, telemetryData);
196196

197197
// Assert
198198
Assert.NotNull(result);
@@ -214,7 +214,7 @@ public async Task EmptyL1Cache_ReadL2AndSetL1_TestAsync()
214214
Assert.Equal(0, _testCacheAdapter._memoryCache.Count);
215215

216216
// Act
217-
byte[]? result = await _testCacheAdapter.TestReadCacheBytesAsync(DefaultCacheKey, telemetryData).ConfigureAwait(false);
217+
byte[]? result = await _testCacheAdapter.TestReadCacheBytesAsync(DefaultCacheKey, telemetryData);
218218

219219
// Assert
220220
Assert.NotNull(result);
@@ -238,7 +238,7 @@ public async Task EmptyL1Cache_ReadL2AndSetL1_ForTelemetryTestAsync()
238238
Assert.Equal(0, _testCacheAdapter._memoryCache.Count);
239239

240240
// Act
241-
byte[]? result = await _testCacheAdapter.TestReadCacheBytesAsync(DefaultCacheKey, telemetryData).ConfigureAwait(false);
241+
byte[]? result = await _testCacheAdapter.TestReadCacheBytesAsync(DefaultCacheKey, telemetryData);
242242

243243
// Assert
244244
Assert.NotNull(result);
@@ -248,7 +248,7 @@ public async Task EmptyL1Cache_ReadL2AndSetL1_ForTelemetryTestAsync()
248248
Assert.Equal(CacheLevel.L2Cache, telemetryData.CacheLevel);
249249

250250
// Act
251-
result = await _testCacheAdapter.TestReadCacheBytesAsync(DefaultCacheKey, telemetryData).ConfigureAwait(false);
251+
result = await _testCacheAdapter.TestReadCacheBytesAsync(DefaultCacheKey, telemetryData);
252252

253253
// Assert
254254
Assert.NotNull(result);
@@ -270,7 +270,7 @@ public async Task EmptyL1L2Cache_ReturnNullCacheResult_TestAsync()
270270
Assert.Equal(0, _testCacheAdapter._memoryCache.Count);
271271

272272
// Act
273-
byte[]? result = await _testCacheAdapter.TestReadCacheBytesAsync(DefaultCacheKey, telemetryData).ConfigureAwait(false);
273+
byte[]? result = await _testCacheAdapter.TestReadCacheBytesAsync(DefaultCacheKey, telemetryData);
274274

275275
// Assert
276276
Assert.Null(result);
@@ -293,7 +293,7 @@ public async Task SetL1Cache_ReadL1WithDifferentCacheKey__ReturnNullCacheResult_
293293
Assert.Equal(1, _testCacheAdapter._memoryCache.Count);
294294

295295
// Act
296-
byte[]? result = await _testCacheAdapter.TestReadCacheBytesAsync(DefaultCacheKey).ConfigureAwait(false);
296+
byte[]? result = await _testCacheAdapter.TestReadCacheBytesAsync(DefaultCacheKey);
297297

298298
// Assert
299299
Assert.Null(result);
@@ -317,13 +317,13 @@ public async Task SetL1CacheAndL2CacheWithDifferentCache_ReadL1WithCacheKey__Ret
317317
Assert.Single(L2Cache._dict);
318318

319319
// Act & Assert
320-
byte[]? result = await _testCacheAdapter.TestReadCacheBytesAsync(DefaultCacheKey).ConfigureAwait(false);
320+
byte[]? result = await _testCacheAdapter.TestReadCacheBytesAsync(DefaultCacheKey);
321321
Assert.NotNull(result);
322322
Assert.Equal(9, result[0]);
323323
Assert.Equal(2, _testCacheAdapter._memoryCache.Count);
324324
Assert.Single(L2Cache._dict);
325325

326-
byte[]? result2 = await _testCacheAdapter.TestReadCacheBytesAsync(AnotherCacheKey).ConfigureAwait(false);
326+
byte[]? result2 = await _testCacheAdapter.TestReadCacheBytesAsync(AnotherCacheKey);
327327
Assert.NotNull(result2);
328328
Assert.Equal(4, result2[0]);
329329
Assert.Equal(2, _testCacheAdapter._memoryCache.Count);
@@ -343,7 +343,7 @@ public async Task RemoveL1CacheItem_TestAsync()
343343
Assert.Equal(1, _testCacheAdapter._memoryCache.Count);
344344

345345
// Act
346-
await _testCacheAdapter.TestRemoveKeyAsync(DefaultCacheKey).ConfigureAwait(false);
346+
await _testCacheAdapter.TestRemoveKeyAsync(DefaultCacheKey);
347347

348348
// Assert
349349
Assert.Equal(0, _testCacheAdapter._memoryCache.Count);
@@ -362,7 +362,7 @@ public async Task RemoveL2CacheItem_TestAsync()
362362
Assert.Single(L2Cache._dict);
363363

364364
// Act
365-
await _testCacheAdapter.TestRemoveKeyAsync(DefaultCacheKey).ConfigureAwait(false);
365+
await _testCacheAdapter.TestRemoveKeyAsync(DefaultCacheKey);
366366

367367
// Assert
368368
Assert.Equal(0, _testCacheAdapter._memoryCache.Count);
@@ -382,10 +382,10 @@ public async Task RemoveOneCacheItem_OneCacheItemsRemains_TestAsync()
382382
_testCacheAdapter._distributedCache.Set(DefaultCacheKey, cacheL2);
383383

384384
// Act & Assert
385-
await _testCacheAdapter.TestRemoveKeyAsync(DefaultCacheKey).ConfigureAwait(false);
385+
await _testCacheAdapter.TestRemoveKeyAsync(DefaultCacheKey);
386386
Assert.Equal(1, _testCacheAdapter._memoryCache.Count);
387387
Assert.Empty(L2Cache._dict);
388-
await _testCacheAdapter.TestRemoveKeyAsync(AnotherCacheKey).ConfigureAwait(false);
388+
await _testCacheAdapter.TestRemoveKeyAsync(AnotherCacheKey);
389389
Assert.Equal(0, _testCacheAdapter._memoryCache.Count);
390390
Assert.Empty(L2Cache._dict);
391391
}

‎tests/Microsoft.Identity.Web.Test/MicrosoftIdentityAuthenticationMessageHandlerTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public async Task MicrosoftIdentityAuthenticationMessageHandler_Adds_Authorizati
9898
using var request = new HttpRequestMessage(HttpMethod.Get, TestConstants.GraphBaseUrlBeta);
9999

100100
// act
101-
var response = await client.SendAsync(request).ConfigureAwait(false);
101+
var response = await client.SendAsync(request);
102102

103103
// assert
104104
if (useApp)
@@ -108,7 +108,7 @@ await tokenAcquisition.Received().GetAuthenticationResultForAppAsync(
108108
_handlerOptions.AuthenticationScheme,
109109
_handlerOptions.Tenant,
110110
Arg.Any<TokenAcquisitionOptions>() /* options are cloned */)
111-
.ConfigureAwait(false);
111+
;
112112
}
113113
else
114114
{
@@ -118,7 +118,7 @@ await tokenAcquisition.Received().GetAuthenticationResultForUserAsync(
118118
tenantId: _handlerOptions.Tenant,
119119
userFlow: _handlerOptions.UserFlow,
120120
tokenAcquisitionOptions: Arg.Any<TokenAcquisitionOptions>() /* options are cloned */)
121-
.ConfigureAwait(false);
121+
;
122122
}
123123

124124
Assert.True(_mockedMessageHandler.Requests[0].Headers.Contains(Constants.Authorization));
@@ -166,7 +166,7 @@ public async Task MicrosoftIdentityAuthenticationMessageHandler_Replaces_Authori
166166
request.Headers.Add(Constants.Authorization, "auth");
167167

168168
// act
169-
var response = await client.SendAsync(request).ConfigureAwait(false);
169+
var response = await client.SendAsync(request);
170170

171171
// assert
172172
Assert.True(_mockedMessageHandler.Requests[0].Headers.Contains(Constants.Authorization));

‎tests/Microsoft.Identity.Web.Test/Resource/JwtBearerEventsClaimsValidationTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected override HttpContext CreateHttpContext()
5353
public async Task TokenValidated_MissingScopesAndRoles_AuthenticationFails()
5454
{
5555
Assert.True(_tokenContext.Result.Succeeded);
56-
await _jwtEvents.TokenValidated(_tokenContext).ConfigureAwait(false);
56+
await _jwtEvents.TokenValidated(_tokenContext);
5757
Assert.False(_tokenContext.Result.Succeeded);
5858
}
5959
}
@@ -69,7 +69,7 @@ protected override HttpContext CreateHttpContext()
6969
public async Task TokenValidated_WithScopesAndRoles_AuthenticationSucceeds()
7070
{
7171
Assert.True(_tokenContext.Result.Succeeded);
72-
await _jwtEvents.TokenValidated(_tokenContext).ConfigureAwait(false);
72+
await _jwtEvents.TokenValidated(_tokenContext);
7373
Assert.True(_tokenContext.Result.Succeeded);
7474
}
7575
}

0 commit comments

Comments
 (0)