diff --git a/build/commonTest.props b/build/commonTest.props
index 55507ccdcb..ad90bc34cb 100644
--- a/build/commonTest.props
+++ b/build/commonTest.props
@@ -35,9 +35,9 @@
-
-
+
+
diff --git a/build/dependenciesTest.props b/build/dependenciesTest.props
index 037c3d4aab..b393aa6571 100644
--- a/build/dependenciesTest.props
+++ b/build/dependenciesTest.props
@@ -8,6 +8,8 @@
13.0.3
4.3.0
8.0.4
- 2.4.0
+ 2.9.0
+ 2.8.2
+ 2.9.0
diff --git a/test/Microsoft.IdentityModel.Abstractions.Tests/TelemetryEventDetailsTests.cs b/test/Microsoft.IdentityModel.Abstractions.Tests/TelemetryEventDetailsTests.cs
index 0bc9450e6c..00a1e4ef5d 100644
--- a/test/Microsoft.IdentityModel.Abstractions.Tests/TelemetryEventDetailsTests.cs
+++ b/test/Microsoft.IdentityModel.Abstractions.Tests/TelemetryEventDetailsTests.cs
@@ -71,7 +71,7 @@ public void SetPropertyWithConflict()
mock.Object.SetProperty("key1", "value");
mock.Object.SetProperty("key1", false);
- Assert.Equal(1, mock.Object.Properties.Count);
+ Assert.Single(mock.Object.Properties);
Assert.False((bool)mock.Object.Properties["key1"]);
}
@@ -81,7 +81,7 @@ public void VerifyDerivedTypesCanAddArbitraryTypes()
CustomTelemetryEventDetails eventDetails = new CustomTelemetryEventDetails();
eventDetails.SetProperty("foo", new Foo() { Bar = "bar" });
- Assert.Equal(1, eventDetails.Properties.Count);
+ Assert.Single(eventDetails.Properties);
Assert.Equal("bar", (eventDetails.Properties["foo"] as Foo)?.Bar);
}
diff --git a/test/Microsoft.IdentityModel.JsonWebTokens.Tests/JsonWebTokenHandlerTests.cs b/test/Microsoft.IdentityModel.JsonWebTokens.Tests/JsonWebTokenHandlerTests.cs
index 1ace09cb9d..662324f4c4 100644
--- a/test/Microsoft.IdentityModel.JsonWebTokens.Tests/JsonWebTokenHandlerTests.cs
+++ b/test/Microsoft.IdentityModel.JsonWebTokens.Tests/JsonWebTokenHandlerTests.cs
@@ -91,20 +91,20 @@ public void CreateTokenThrowsNullArgumentException()
}
[Theory, MemberData(nameof(TokenValidationClaimsTheoryData))]
- public void ValidateTokenValidationResult(JsonWebTokenTheoryData theoryData)
+ public async Task ValidateTokenValidationResult(JsonWebTokenTheoryData theoryData)
{
TestUtilities.WriteHeader($"{this}.ValidateTokenValidationResult");
- var tokenValidationResult = theoryData.TokenHandler.ValidateTokenAsync(theoryData.AccessToken, theoryData.ValidationParameters).Result;
+ var tokenValidationResult = await theoryData.TokenHandler.ValidateTokenAsync(theoryData.AccessToken, theoryData.ValidationParameters);
Assert.Equal(tokenValidationResult.Claims, TokenUtilities.CreateDictionaryFromClaims(tokenValidationResult.ClaimsIdentity.Claims));
}
[Theory, MemberData(nameof(TokenValidationClaimsTheoryData))]
- public void ValidateTokenDerivedHandlerValidationResult(JsonWebTokenTheoryData theoryData)
+ public async Task ValidateTokenDerivedHandlerValidationResult(JsonWebTokenTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.ValidateTokenDerivedHandlerValidationResult", theoryData);
var derivedJsonWebTokenHandler = new DerivedJsonWebTokenHandler();
- var tokenValidationResult = theoryData.TokenHandler.ValidateTokenAsync(theoryData.AccessToken, theoryData.ValidationParameters).Result;
- var tokenValidationDerivedResult = derivedJsonWebTokenHandler.ValidateTokenAsync(theoryData.AccessToken, theoryData.ValidationParameters).Result;
+ var tokenValidationResult = await theoryData.TokenHandler.ValidateTokenAsync(theoryData.AccessToken, theoryData.ValidationParameters);
+ var tokenValidationDerivedResult = await derivedJsonWebTokenHandler.ValidateTokenAsync(theoryData.AccessToken, theoryData.ValidationParameters);
IdentityComparer.AreEqual(tokenValidationResult.Claims, TokenUtilities.CreateDictionaryFromClaims(tokenValidationResult.ClaimsIdentity.Claims), context);
IdentityComparer.AreEqual(tokenValidationDerivedResult.Claims, TokenUtilities.CreateDictionaryFromClaims(tokenValidationDerivedResult.ClaimsIdentity.Claims), context);
IdentityComparer.AreEqual(tokenValidationResult.Claims, tokenValidationDerivedResult.Claims, context);
@@ -158,7 +158,7 @@ public static TheoryData TokenValidationClaimsTheoryData
}
[Theory, MemberData(nameof(TokenValidationTheoryData))]
- public void ValidateTokenValidationResultThrowsWarning(JsonWebTokenTheoryData theoryData)
+ public async Task ValidateTokenValidationResultThrowsWarning(JsonWebTokenTheoryData theoryData)
{
TestUtilities.WriteHeader($"{this}.ValidateTokenValidationResultThrowsWarning");
@@ -166,7 +166,7 @@ public void ValidateTokenValidationResultThrowsWarning(JsonWebTokenTheoryData th
SampleListener listener = SampleListener.CreateLoggerListener(EventLevel.Warning);
//validate token
- var tokenValidationResult = theoryData.TokenHandler.ValidateTokenAsync(theoryData.AccessToken, theoryData.ValidationParameters).Result;
+ var tokenValidationResult = await theoryData.TokenHandler.ValidateTokenAsync(theoryData.AccessToken, theoryData.ValidationParameters);
//access claims without checking IsValid or Exception
var claims = tokenValidationResult.Claims;
@@ -177,7 +177,7 @@ public void ValidateTokenValidationResultThrowsWarning(JsonWebTokenTheoryData th
}
[Theory, MemberData(nameof(TokenValidationTheoryData))]
- public void ValidateTokenValidationResultDoesNotThrowWarningWithIsValidRead(JsonWebTokenTheoryData theoryData)
+ public async Task ValidateTokenValidationResultDoesNotThrowWarningWithIsValidRead(JsonWebTokenTheoryData theoryData)
{
TestUtilities.WriteHeader($"{this}.ValidateTokenValidationResultDoesNotThrowWarningWithIsValidRead");
@@ -185,7 +185,7 @@ public void ValidateTokenValidationResultDoesNotThrowWarningWithIsValidRead(Json
SampleListener listener = SampleListener.CreateLoggerListener(EventLevel.Warning);
//validate token
- var tokenValidationResult = theoryData.TokenHandler.ValidateTokenAsync(theoryData.AccessToken, theoryData.ValidationParameters).Result;
+ var tokenValidationResult = await theoryData.TokenHandler.ValidateTokenAsync(theoryData.AccessToken, theoryData.ValidationParameters);
//checking IsValid first, then access claims
var isValid = tokenValidationResult.IsValid;
@@ -197,7 +197,7 @@ public void ValidateTokenValidationResultDoesNotThrowWarningWithIsValidRead(Json
}
[Theory, MemberData(nameof(TokenValidationTheoryData))]
- public void ValidateTokenValidationResultDoesNotThrowWarningWithExceptionRead(JsonWebTokenTheoryData theoryData)
+ public async Task ValidateTokenValidationResultDoesNotThrowWarningWithExceptionRead(JsonWebTokenTheoryData theoryData)
{
TestUtilities.WriteHeader($"{this}.ValidateTokenValidationResultDoesNotThrowWarningWithExceptionRead");
@@ -205,7 +205,7 @@ public void ValidateTokenValidationResultDoesNotThrowWarningWithExceptionRead(Js
SampleListener listener = SampleListener.CreateLoggerListener(EventLevel.Warning);
//validate token
- var tokenValidationResult = theoryData.TokenHandler.ValidateTokenAsync(theoryData.AccessToken, theoryData.ValidationParameters).Result;
+ var tokenValidationResult = await theoryData.TokenHandler.ValidateTokenAsync(theoryData.AccessToken, theoryData.ValidationParameters);
//checking exception first, then access claims
var exception = tokenValidationResult.Exception;
@@ -282,13 +282,13 @@ public static TheoryData SegmentTheoryData()
}
[Theory, MemberData(nameof(CreateTokenWithEmptyPayloadUsingSecurityTokenDescriptorTheoryData))]
- public void CreateTokenWithEmptyPayloadUsingSecurityTokenDescriptor(CreateTokenTheoryData theoryData)
+ public async Task CreateTokenWithEmptyPayloadUsingSecurityTokenDescriptor(CreateTokenTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.CreateEmptyJWSUsingSecurityTokenDescriptor", theoryData);
try
{
string jwtFromSecurityTokenDescriptor = theoryData.JsonWebTokenHandler.CreateToken(theoryData.TokenDescriptor);
- var tokenValidationResultFromSecurityTokenDescriptor = theoryData.JsonWebTokenHandler.ValidateTokenAsync(jwtFromSecurityTokenDescriptor, theoryData.ValidationParameters).Result;
+ var tokenValidationResultFromSecurityTokenDescriptor = await theoryData.JsonWebTokenHandler.ValidateTokenAsync(jwtFromSecurityTokenDescriptor, theoryData.ValidationParameters);
IdentityComparer.AreEqual(tokenValidationResultFromSecurityTokenDescriptor.IsValid, theoryData.IsValid, context);
var jwsTokenFromSecurityTokenDescriptor = new JsonWebToken(jwtFromSecurityTokenDescriptor);
@@ -406,7 +406,7 @@ public static TheoryData CreateTokenWithEmptyPayloadUsing
///
/// The test data.
[Theory, MemberData(nameof(CreateJWEWithAesGcmTheoryData))]
- public void TokenValidationResultsShouldMatch(CreateTokenTheoryData theoryData)
+ public async Task TokenValidationResultsShouldMatch(CreateTokenTheoryData theoryData)
{
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
@@ -421,7 +421,7 @@ public void TokenValidationResultsShouldMatch(CreateTokenTheoryData theoryData)
theoryData.ValidationParameters.ValidateLifetime = false;
var claimsPrincipal = theoryData.JwtSecurityTokenHandler.ValidateToken(jweFromJwtHandler, theoryData.ValidationParameters, out SecurityToken validatedTokenFromJwtHandler);
- var validationResult = theoryData.JwtSecurityTokenHandler.ValidateTokenAsync(jweFromJwtHandler, theoryData.ValidationParameters).Result;
+ var validationResult = await theoryData.JwtSecurityTokenHandler.ValidateTokenAsync(jweFromJwtHandler, theoryData.ValidationParameters);
// verify the results from asynchronous and synchronous are the same
IdentityComparer.AreClaimsIdentitiesEqual(claimsPrincipal.Identity as ClaimsIdentity, validationResult.ClaimsIdentity, context);
@@ -437,7 +437,7 @@ public void TokenValidationResultsShouldMatch(CreateTokenTheoryData theoryData)
}
[Theory, MemberData(nameof(CreateJWEWithAesGcmTheoryData))]
- public void CreateJWEWithAesGcm(CreateTokenTheoryData theoryData)
+ public async Task CreateJWEWithAesGcm(CreateTokenTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.CreateJWEWithAesGcm", theoryData);
try
@@ -447,7 +447,7 @@ public void CreateJWEWithAesGcm(CreateTokenTheoryData theoryData)
theoryData.ValidationParameters.ValidateLifetime = false;
var claimsPrincipal = theoryData.JwtSecurityTokenHandler.ValidateToken(jweFromJwtHandler, theoryData.ValidationParameters, out SecurityToken validatedTokenFromJwtHandler);
- var validationResult = theoryData.JsonWebTokenHandler.ValidateTokenAsync(jweFromJsonHandler, theoryData.ValidationParameters).Result;
+ var validationResult = await theoryData.JsonWebTokenHandler.ValidateTokenAsync(jweFromJsonHandler, theoryData.ValidationParameters);
IdentityComparer.AreEqual(validationResult.IsValid, theoryData.IsValid, context);
var validatedTokenFromJsonHandler = validationResult.SecurityToken;
IdentityComparer.AreEqual(validationResult.IsValid, theoryData.IsValid, context);
@@ -541,7 +541,7 @@ public static TheoryData CreateJWEWithAesGcmTheoryData
// Tests checks to make sure that the token string created by the JsonWebTokenHandler is consistent with the
// token string created by the JwtSecurityTokenHandler.
[Theory, MemberData(nameof(CreateJWETheoryData))]
- public void CreateJWE(CreateTokenTheoryData theoryData)
+ public async Task CreateJWE(CreateTokenTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.CreateJWE", theoryData);
theoryData.ValidationParameters.ValidateLifetime = false;
@@ -551,11 +551,11 @@ public void CreateJWE(CreateTokenTheoryData theoryData)
string jweFromJsonHandler = theoryData.JsonWebTokenHandler.CreateToken(theoryData.TokenDescriptor);
var claimsPrincipalFromJwtHandler = theoryData.JwtSecurityTokenHandler.ValidateToken(jweFromJwtHandler, theoryData.ValidationParameters, out SecurityToken validatedTokenFromJwtHandler);
- var validationResultFromJsonHandler = theoryData.JsonWebTokenHandler.ValidateTokenAsync(jweFromJsonHandler, theoryData.ValidationParameters).Result;
+ var validationResultFromJsonHandler = await theoryData.JsonWebTokenHandler.ValidateTokenAsync(jweFromJsonHandler, theoryData.ValidationParameters);
IdentityComparer.AreEqual(validationResultFromJsonHandler.IsValid, theoryData.IsValid, context);
var validatedTokenFromJsonHandler = validationResultFromJsonHandler.SecurityToken;
- var validationResultFromJwtJsonHandler = theoryData.JsonWebTokenHandler.ValidateTokenAsync(jweFromJwtHandler, theoryData.ValidationParameters).Result;
+ var validationResultFromJwtJsonHandler = await theoryData.JsonWebTokenHandler.ValidateTokenAsync(jweFromJwtHandler, theoryData.ValidationParameters);
IdentityComparer.AreEqual(validationResultFromJwtJsonHandler.IsValid, theoryData.IsValid, context);
IdentityComparer.AreEqual(claimsPrincipalFromJwtHandler.Identity, validationResultFromJsonHandler.ClaimsIdentity, context);
IEnumerable jwtHandlerClaims = (validatedTokenFromJwtHandler as JwtSecurityToken).Claims;
@@ -797,7 +797,7 @@ public static TheoryData SecurityTokenDecryptionTheoryDat
// CreateToken(string payload, SigningCredentials signingCredentials, EncryptingCredentials encryptingCredentials)
// is equivalent to the token string created by calling CreateToken(SecurityTokenDescriptor tokenDescriptor).
[Theory, MemberData(nameof(CreateJWEUsingSecurityTokenDescriptorTheoryData))]
- public void CreateJWEUsingSecurityTokenDescriptor(CreateTokenTheoryData theoryData)
+ public async Task CreateJWEUsingSecurityTokenDescriptor(CreateTokenTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.CreateJWEUsingSecurityTokenDescriptor", theoryData);
theoryData.ValidationParameters.ValidateLifetime = false;
@@ -818,8 +818,8 @@ public void CreateJWEUsingSecurityTokenDescriptor(CreateTokenTheoryData theoryDa
else
jweFromString = theoryData.JsonWebTokenHandler.CreateToken(theoryData.Payload, theoryData.TokenDescriptor.SigningCredentials, theoryData.TokenDescriptor.EncryptingCredentials);
- var validationResultFromSecurityTokenDescriptor = theoryData.JsonWebTokenHandler.ValidateTokenAsync(jweFromSecurityTokenDescriptor, theoryData.ValidationParameters).Result;
- var validationResultFromString = theoryData.JsonWebTokenHandler.ValidateTokenAsync(jweFromString, theoryData.ValidationParameters).Result;
+ var validationResultFromSecurityTokenDescriptor = await theoryData.JsonWebTokenHandler.ValidateTokenAsync(jweFromSecurityTokenDescriptor, theoryData.ValidationParameters);
+ var validationResultFromString = await theoryData.JsonWebTokenHandler.ValidateTokenAsync(jweFromString, theoryData.ValidationParameters);
IdentityComparer.AreEqual(validationResultFromSecurityTokenDescriptor.IsValid, theoryData.IsValid, context);
IdentityComparer.AreEqual(validationResultFromString.IsValid, theoryData.IsValid, context);
@@ -1187,7 +1187,7 @@ public static TheoryData CreateJWEUsingSecurityTokenDescr
// Tests checks to make sure that the token string created by the JsonWebTokenHandler is consistent with the
// token string created by the JwtSecurityTokenHandler.
[Theory, MemberData(nameof(CreateJWSTheoryData))]
- public void CreateJWS(CreateTokenTheoryData theoryData)
+ public async Task CreateJWS(CreateTokenTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.CreateJWS", theoryData);
theoryData.ValidationParameters.ValidateLifetime = false;
@@ -1197,7 +1197,7 @@ public void CreateJWS(CreateTokenTheoryData theoryData)
string jwsFromJsonHandler = theoryData.JsonWebTokenHandler.CreateToken(theoryData.TokenDescriptor);
var claimsPrincipal = theoryData.JwtSecurityTokenHandler.ValidateToken(jwsFromJwtHandler, theoryData.ValidationParameters, out SecurityToken validatedToken);
- var tokenValidationResult = theoryData.JsonWebTokenHandler.ValidateTokenAsync(jwsFromJsonHandler, theoryData.ValidationParameters).Result;
+ var tokenValidationResult = await theoryData.JsonWebTokenHandler.ValidateTokenAsync(jwsFromJsonHandler, theoryData.ValidationParameters);
IdentityComparer.AreEqual(tokenValidationResult.IsValid, theoryData.IsValid, context);
IdentityComparer.AreEqual(claimsPrincipal.Identity, tokenValidationResult.ClaimsIdentity, context);
@@ -1540,7 +1540,7 @@ public static TheoryData CreateJWSWithAdditionalHeaderCla
}
[Theory, MemberData(nameof(CreateJWEWithPayloadStringTheoryData))]
- public void CreateJWEWithPayloadString(CreateTokenTheoryData theoryData)
+ public async Task CreateJWEWithPayloadString(CreateTokenTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.CreateJWEWithPayloadString", theoryData);
var handler = new JsonWebTokenHandler();
@@ -1587,7 +1587,7 @@ public void CreateJWEWithPayloadString(CreateTokenTheoryData theoryData)
if (theoryData.TokenDescriptor.AdditionalInnerHeaderClaims != null)
{
theoryData.ValidationParameters.ValidateLifetime = false;
- var result = handler.ValidateTokenAsync(jwtTokenWithSigning, theoryData.ValidationParameters).Result;
+ var result = await handler.ValidateTokenAsync(jwtTokenWithSigning, theoryData.ValidationParameters);
var token = result.SecurityToken as JsonWebToken;
if (theoryData.TokenDescriptor.AdditionalInnerHeaderClaims.TryGetValue(JwtHeaderParameterNames.Cty, out object innerCtyValue))
{
@@ -1721,15 +1721,15 @@ public static TheoryData CreateJWEWithPayloadStringTheory
// This test checks to make sure that additional header claims are added as expected to the outer token header.
[Theory, MemberData(nameof(CreateJWEWithAdditionalHeaderClaimsTheoryData))]
- public void CreateJWEWithAdditionalHeaderClaims(CreateTokenTheoryData theoryData)
+ public async Task CreateJWEWithAdditionalHeaderClaims(CreateTokenTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.CreateJWEWithAdditionalHeaderClaims", theoryData);
var handler = new JsonWebTokenHandler();
theoryData.ValidationParameters.ValidateLifetime = false;
var jwtTokenFromDescriptor = handler.CreateToken(theoryData.TokenDescriptor);
- var validatedJwtTokenFromDescriptor = handler.ValidateTokenAsync(jwtTokenFromDescriptor, theoryData.ValidationParameters).Result.SecurityToken as JsonWebToken;
- var jwtTokenToCompare = handler.ValidateTokenAsync(theoryData.JwtToken, theoryData.ValidationParameters).Result.SecurityToken as JsonWebToken;
+ var validatedJwtTokenFromDescriptor = (await handler.ValidateTokenAsync(jwtTokenFromDescriptor, theoryData.ValidationParameters)).SecurityToken as JsonWebToken;
+ var jwtTokenToCompare = (await handler.ValidateTokenAsync(theoryData.JwtToken, theoryData.ValidationParameters)).SecurityToken as JsonWebToken;
context.PropertiesToIgnoreWhenComparing = new Dictionary>
{
@@ -1904,7 +1904,7 @@ public static TheoryData CreateJWEWithAdditionalHeaderCla
// Tests checks to make sure that the token string (JWS) created by calling CreateToken(string payload, SigningCredentials signingCredentials)
// is equivalent to the token string created by calling CreateToken(SecurityTokenDescriptor tokenDescriptor).
[Theory, MemberData(nameof(CreateJWSUsingSecurityTokenDescriptorTheoryData))]
- public void CreateJWSUsingSecurityTokenDescriptor(CreateTokenTheoryData theoryData)
+ public async Task CreateJWSUsingSecurityTokenDescriptor(CreateTokenTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.CreateJWSUsingSecurityTokenDescriptor", theoryData);
theoryData.ValidationParameters.ValidateLifetime = false;
@@ -1929,8 +1929,8 @@ public void CreateJWSUsingSecurityTokenDescriptor(CreateTokenTheoryData theoryDa
var jwsTokenFromSecurityTokenDescriptor = new JsonWebToken(jwtFromSecurityTokenDescriptor);
var jwsTokenFromString = new JsonWebToken(jwtPayloadAsString);
- var tokenValidationResultFromSecurityTokenDescriptor = theoryData.JsonWebTokenHandler.ValidateTokenAsync(jwtFromSecurityTokenDescriptor, theoryData.ValidationParameters).Result;
- var tokenValidationResultFromString = theoryData.JsonWebTokenHandler.ValidateTokenAsync(jwtPayloadAsString, theoryData.ValidationParameters).Result;
+ var tokenValidationResultFromSecurityTokenDescriptor = await theoryData.JsonWebTokenHandler.ValidateTokenAsync(jwtFromSecurityTokenDescriptor, theoryData.ValidationParameters);
+ var tokenValidationResultFromString = await theoryData.JsonWebTokenHandler.ValidateTokenAsync(jwtPayloadAsString, theoryData.ValidationParameters);
IdentityComparer.AreEqual(tokenValidationResultFromSecurityTokenDescriptor.IsValid, theoryData.IsValid, context);
IdentityComparer.AreEqual(tokenValidationResultFromString.IsValid, theoryData.IsValid, context);
@@ -2426,7 +2426,7 @@ public async Task AdditionalHeaderValues()
IssuerSigningKey = KeyingMaterial.JsonWebKeyRsa256SigningCredentials.Key,
};
- var tokenValidationResult = await tokenHandler.ValidateTokenAsync(jwtString, tokenValidationParameters).ConfigureAwait(false);
+ var tokenValidationResult = await tokenHandler.ValidateTokenAsync(jwtString, tokenValidationParameters);
JsonWebToken validatedToken = tokenValidationResult.SecurityToken as JsonWebToken;
if (!validatedToken.TryGetHeaderValue(JwtHeaderParameterNames.X5c, out string[] x5cFound))
@@ -2441,7 +2441,7 @@ public async Task AdditionalHeaderValues()
// Test checks to make sure that the token payload retrieved from ValidateToken is the same as the payload
// the token was initially created with.
[Fact]
- public void RoundTripJWS()
+ public async Task RoundTripJWS()
{
TestUtilities.WriteHeader($"{this}.RoundTripToken");
@@ -2456,7 +2456,7 @@ public void RoundTripJWS()
};
string jwtString = tokenHandler.CreateToken(Default.PayloadString, KeyingMaterial.JsonWebKeyRsa256SigningCredentials);
- var tokenValidationResult = tokenHandler.ValidateTokenAsync(jwtString, tokenValidationParameters).Result;
+ var tokenValidationResult = await tokenHandler.ValidateTokenAsync(jwtString, tokenValidationParameters);
var validatedToken = tokenValidationResult.SecurityToken as JsonWebToken;
IdentityComparer.AreEqual(Default.PayloadClaimsIdentity, tokenValidationResult.ClaimsIdentity, context);
IdentityComparer.AreEqual(Default.PayloadString, Base64UrlEncoder.Decode(validatedToken.EncodedPayload), context);
@@ -2466,7 +2466,7 @@ public void RoundTripJWS()
// Test ensure paths to creating a token with an empty payload are successful.
[Theory, MemberData(nameof(RoundTripWithEmptyPayloadTestCases))]
- public void RoundTripWithEmptyPayload(CreateTokenTheoryData theoryData)
+ public async Task RoundTripWithEmptyPayload(CreateTokenTheoryData theoryData)
{
TestUtilities.WriteHeader($"{this}.RoundTripWithEmptyPayload");
@@ -2480,7 +2480,7 @@ public void RoundTripWithEmptyPayload(CreateTokenTheoryData theoryData)
theoryData.AdditionalInnerHeaderClaims,
"JWT");
- var tokenValidationResult = theoryData.JsonWebTokenHandler.ValidateTokenAsync(jwtString, theoryData.ValidationParameters).Result;
+ var tokenValidationResult = await theoryData.JsonWebTokenHandler.ValidateTokenAsync(jwtString, theoryData.ValidationParameters);
var validatedToken = tokenValidationResult.SecurityToken as JsonWebToken;
var claimsIdentity = tokenValidationResult.ClaimsIdentity;
IdentityComparer.AreEqual(new CaseSensitiveClaimsIdentity("AuthenticationTypes.Federation"), claimsIdentity, context);
@@ -2611,7 +2611,7 @@ public static TheoryData RoundTripWithEmptyPayloadTestCas
}
[Theory, MemberData(nameof(RoundTripJWEDirectTestCases))]
- public void RoundTripJWEInnerJWSDirect(CreateTokenTheoryData theoryData)
+ public async Task RoundTripJWEInnerJWSDirect(CreateTokenTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.RoundTripJWEInnerJWSDirect", theoryData);
var jsonWebTokenHandler = new JsonWebTokenHandler();
@@ -2620,7 +2620,7 @@ public void RoundTripJWEInnerJWSDirect(CreateTokenTheoryData theoryData)
theoryData.ValidationParameters.ValidateLifetime = false;
try
{
- var tokenValidationResult = jsonWebTokenHandler.ValidateTokenAsync(jweCreatedInMemory, theoryData.ValidationParameters).Result;
+ var tokenValidationResult = await jsonWebTokenHandler.ValidateTokenAsync(jweCreatedInMemory, theoryData.ValidationParameters);
IdentityComparer.AreEqual(tokenValidationResult.IsValid, theoryData.IsValid, context);
if (tokenValidationResult.Exception != null)
throw tokenValidationResult.Exception;
@@ -2644,7 +2644,7 @@ public void RoundTripJWEInnerJWSDirect(CreateTokenTheoryData theoryData)
}
[Theory, MemberData(nameof(RoundTripJWEDirectTestCases))]
- public void RoundTripJWEDirect(CreateTokenTheoryData theoryData)
+ public async Task RoundTripJWEDirect(CreateTokenTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.RoundTripJWEDirect", theoryData);
var jsonWebTokenHandler = new JsonWebTokenHandler();
@@ -2654,7 +2654,7 @@ public void RoundTripJWEDirect(CreateTokenTheoryData theoryData)
theoryData.ValidationParameters.ValidateLifetime = false;
try
{
- var tokenValidationResult = jsonWebTokenHandler.ValidateTokenAsync(jweCreatedInMemory, theoryData.ValidationParameters).Result;
+ var tokenValidationResult = await jsonWebTokenHandler.ValidateTokenAsync(jweCreatedInMemory, theoryData.ValidationParameters);
IdentityComparer.AreEqual(tokenValidationResult.IsValid, theoryData.IsValid, context);
if (tokenValidationResult.Exception != null)
throw tokenValidationResult.Exception;
@@ -2743,7 +2743,7 @@ public static TheoryData RoundTripJWEDirectTestCases
}
[Theory, MemberData(nameof(RoundTripJWEKeyWrapTestCases))]
- public void RoundTripJWEInnerJWSKeyWrap(CreateTokenTheoryData theoryData)
+ public async Task RoundTripJWEInnerJWSKeyWrap(CreateTokenTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.RoundTripJWEInnerJWSKeyWrap", theoryData);
var jsonWebTokenHandler = new JsonWebTokenHandler();
@@ -2752,7 +2752,7 @@ public void RoundTripJWEInnerJWSKeyWrap(CreateTokenTheoryData theoryData)
try
{
var jweCreatedInMemory = jsonWebTokenHandler.EncryptToken(innerJws, theoryData.EncryptingCredentials);
- var tokenValidationResult = jsonWebTokenHandler.ValidateTokenAsync(jweCreatedInMemory, theoryData.ValidationParameters).Result;
+ var tokenValidationResult = await jsonWebTokenHandler.ValidateTokenAsync(jweCreatedInMemory, theoryData.ValidationParameters);
IdentityComparer.AreEqual(tokenValidationResult.IsValid, theoryData.IsValid, context);
if (tokenValidationResult.Exception != null)
throw tokenValidationResult.Exception;
@@ -2776,7 +2776,7 @@ public void RoundTripJWEInnerJWSKeyWrap(CreateTokenTheoryData theoryData)
}
[Theory, MemberData(nameof(RoundTripJWEKeyWrapTestCases))]
- public void RoundTripJWEKeyWrap(CreateTokenTheoryData theoryData)
+ public async Task RoundTripJWEKeyWrap(CreateTokenTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.RoundTripJWEKeyWrap", theoryData);
var jsonWebTokenHandler = new JsonWebTokenHandler();
@@ -2786,7 +2786,7 @@ public void RoundTripJWEKeyWrap(CreateTokenTheoryData theoryData)
try
{
var jweCreatedInMemory = jsonWebTokenHandler.CreateToken(theoryData.Payload, theoryData.SigningCredentials, theoryData.EncryptingCredentials);
- var tokenValidationResult = jsonWebTokenHandler.ValidateTokenAsync(jweCreatedInMemory, theoryData.ValidationParameters).Result;
+ var tokenValidationResult = await jsonWebTokenHandler.ValidateTokenAsync(jweCreatedInMemory, theoryData.ValidationParameters);
IdentityComparer.AreEqual(tokenValidationResult.IsValid, theoryData.IsValid, context);
if (tokenValidationResult.Exception != null)
throw tokenValidationResult.Exception;
@@ -2966,7 +2966,7 @@ public void SetDefaultTimesOnTokenCreation()
// Test checks to make sure that an access token can be successfully validated by the JsonWebTokenHandler.
// Also ensures that a non-standard claim can be successfully retrieved from the payload and validated.
[Fact]
- public void ValidateTokenClaims()
+ public async Task ValidateTokenClaims()
{
TestUtilities.WriteHeader($"{this}.ValidateTokenClaims");
@@ -2987,7 +2987,7 @@ public void ValidateTokenClaims()
ValidIssuer = "http://Default.Issuer.com",
IssuerSigningKey = KeyingMaterial.JsonWebKeyRsa256SigningCredentials.Key,
};
- var tokenValidationResult = tokenHandler.ValidateTokenAsync(accessToken, tokenValidationParameters).Result;
+ var tokenValidationResult = await tokenHandler.ValidateTokenAsync(accessToken, tokenValidationParameters);
var jsonWebToken = tokenValidationResult.SecurityToken as JsonWebToken;
var email = jsonWebToken.GetPayloadValue(JwtRegisteredClaimNames.Email);
@@ -2997,11 +2997,11 @@ public void ValidateTokenClaims()
[Theory, MemberData(nameof(ValidateTypeTheoryData))]
- public void ValidateType(JwtTheoryData theoryData)
+ public async Task ValidateType(JwtTheoryData theoryData)
{
TestUtilities.WriteHeader($"{this}.ValidateType", theoryData);
- var tokenValidationResult = new JsonWebTokenHandler().ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters).Result;
+ var tokenValidationResult = await new JsonWebTokenHandler().ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters);
if (tokenValidationResult.Exception != null)
theoryData.ExpectedException.ProcessException(tokenValidationResult.Exception);
else
@@ -3013,14 +3013,14 @@ public void ValidateType(JwtTheoryData theoryData)
public static TheoryData ValidateTypeTheoryData = JwtSecurityTokenHandlerTests.ValidateTypeTheoryData;
[Theory, MemberData(nameof(ValidateJweTestCases))]
- public void ValidateJWE(JwtTheoryData theoryData)
+ public async Task ValidateJWE(JwtTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.ValidateJWE", theoryData);
try
{
var handler = new JsonWebTokenHandler();
- var validationResult = handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters).Result;
+ var validationResult = await handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters);
if (validationResult.Exception != null)
{
if (validationResult.IsValid)
@@ -3156,8 +3156,8 @@ public async Task ValidateJWEAsync(JwtTheoryData theoryData)
{
var handler = new JsonWebTokenHandler();
var jwt = handler.ReadJsonWebToken(theoryData.Token);
- var validationResult = await handler.ValidateTokenAsync(jwt, theoryData.ValidationParameters).ConfigureAwait(false);
- var rawTokenValidationResult = await handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters).ConfigureAwait(false);
+ var validationResult = await handler.ValidateTokenAsync(jwt, theoryData.ValidationParameters);
+ var rawTokenValidationResult = await handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters);
IdentityComparer.AreEqual(validationResult, rawTokenValidationResult, context);
if (validationResult.Exception != null)
@@ -3277,15 +3277,15 @@ public static TheoryData ValidateJweTestCases
}
[Theory, MemberData(nameof(ValidateJwsTestCases))]
- public void ValidateJWSAsync(JwtTheoryData theoryData)
+ public async Task ValidateJWSAsync(JwtTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.ValidateJWSAsync", theoryData);
try
{
var handler = new JsonWebTokenHandler();
- var validationResult = handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters).Result;
- var rawTokenValidationResult = handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters).Result;
+ var validationResult = await handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters);
+ var rawTokenValidationResult = await handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters);
IdentityComparer.AreEqual(validationResult, rawTokenValidationResult, context);
if (validationResult.Exception != null)
@@ -3307,14 +3307,14 @@ public void ValidateJWSAsync(JwtTheoryData theoryData)
}
[Theory, MemberData(nameof(ValidateJwsTestCases))]
- public void ValidateJWS(JwtTheoryData theoryData)
+ public async Task ValidateJWS(JwtTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.ValidateJWS", theoryData);
try
{
var handler = new JsonWebTokenHandler();
- var validationResult = handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters).Result;
+ var validationResult = await handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters);
if (validationResult.Exception != null)
{
if (validationResult.IsValid)
@@ -3536,14 +3536,14 @@ public static TheoryData ValidateJwsTestCases
}
[Theory, MemberData(nameof(ValidateJwsWithConfigTheoryData))]
- public void ValidateJWSWithConfig(JwtTheoryData theoryData)
+ public async Task ValidateJWSWithConfig(JwtTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.ValidateJWSWithConfig", theoryData);
try
{
var handler = new JsonWebTokenHandler();
AadIssuerValidator.GetAadIssuerValidator(Default.AadV1Authority).ConfigurationManagerV1 = theoryData.ValidationParameters.ConfigurationManager;
- var validationResult = handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters).Result;
+ var validationResult = await handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters);
if (validationResult.IsValid)
{
if (theoryData.ShouldSetLastKnownConfiguration && theoryData.ValidationParameters.ConfigurationManager.LastKnownGoodConfiguration == null)
@@ -3583,8 +3583,8 @@ public async Task ValidateJWSWithConfigAsync(JwtTheoryData theoryData)
var handler = new JsonWebTokenHandler();
var jwt = handler.ReadJsonWebToken(theoryData.Token);
AadIssuerValidator.GetAadIssuerValidator(Default.AadV1Authority).ConfigurationManagerV1 = theoryData.ValidationParameters.ConfigurationManager;
- var validationResult = await handler.ValidateTokenAsync(jwt, theoryData.ValidationParameters).ConfigureAwait(false);
- var rawTokenValidationResult = await handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters).ConfigureAwait(false);
+ var validationResult = await handler.ValidateTokenAsync(jwt, theoryData.ValidationParameters);
+ var rawTokenValidationResult = await handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters);
IdentityComparer.AreEqual(validationResult, rawTokenValidationResult, context);
if (validationResult.IsValid)
@@ -3640,7 +3640,7 @@ public static TheoryData ValidateJwsWithConfigTheoryData
}
}
[Theory, MemberData(nameof(ValidateJwsWithLastKnownGoodTheoryData))]
- public void ValidateJWSWithLastKnownGood(JwtTheoryData theoryData)
+ public async Task ValidateJWSWithLastKnownGood(JwtTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.ValidateJWSWithLastKnownGood", theoryData);
try
@@ -3663,7 +3663,7 @@ public void ValidateJWSWithLastKnownGood(JwtTheoryData theoryData)
var previousValidateWithLKG = theoryData.ValidationParameters.ValidateWithLKG;
theoryData.ValidationParameters.ValidateWithLKG = false;
- var setupValidationResult = handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters).Result;
+ var setupValidationResult = await handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters);
theoryData.ValidationParameters.ValidateWithLKG = previousValidateWithLKG;
@@ -3676,7 +3676,7 @@ public void ValidateJWSWithLastKnownGood(JwtTheoryData theoryData)
}
AadIssuerValidator.GetAadIssuerValidator(Default.AadV1Authority).ConfigurationManagerV1 = theoryData.ValidationParameters.ConfigurationManager;
- var validationResult = handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters).Result;
+ var validationResult = await handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters);
if (validationResult.Exception != null)
{
if (validationResult.IsValid)
@@ -3698,7 +3698,7 @@ public void ValidateJWSWithLastKnownGood(JwtTheoryData theoryData)
public static TheoryData ValidateJwsWithLastKnownGoodTheoryData => JwtTestDatasets.ValidateJwsWithLastKnownGoodTheoryData;
[Theory, MemberData(nameof(ValidateJWEWithLastKnownGoodTheoryData))]
- public void ValidateJWEWithLastKnownGood(JwtTheoryData theoryData)
+ public async Task ValidateJWEWithLastKnownGood(JwtTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.ValidateJWEWithLastKnownGood", theoryData);
try
@@ -3720,7 +3720,7 @@ public void ValidateJWEWithLastKnownGood(JwtTheoryData theoryData)
var previousValidateWithLKG = theoryData.ValidationParameters.ValidateWithLKG;
theoryData.ValidationParameters.ValidateWithLKG = false;
- var setupValidationResult = handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters).Result;
+ var setupValidationResult = await handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters);
theoryData.ValidationParameters.ValidateWithLKG = previousValidateWithLKG;
@@ -3733,7 +3733,7 @@ public void ValidateJWEWithLastKnownGood(JwtTheoryData theoryData)
}
AadIssuerValidator.GetAadIssuerValidator(Default.AadV1Authority).ConfigurationManagerV1 = theoryData.ValidationParameters.ConfigurationManager;
- var validationResult = handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters).Result;
+ var validationResult = await handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters);
if (validationResult.Exception != null)
{
if (validationResult.IsValid)
@@ -3755,7 +3755,7 @@ public void ValidateJWEWithLastKnownGood(JwtTheoryData theoryData)
public static TheoryData ValidateJWEWithLastKnownGoodTheoryData => JwtTestDatasets.ValidateJWEWithLastKnownGoodTheoryData;
[Theory, MemberData(nameof(JWECompressionTheoryData))]
- public void EncryptExistingJWSWithCompressionTest(CreateTokenTheoryData theoryData)
+ public async Task EncryptExistingJWSWithCompressionTest(CreateTokenTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.EncryptExistingJWSWithCompressionTest", theoryData);
@@ -3770,7 +3770,7 @@ public void EncryptExistingJWSWithCompressionTest(CreateTokenTheoryData theoryDa
innerJwt = handler.CreateToken(theoryData.Payload);
var jwtToken = handler.EncryptToken(innerJwt, theoryData.EncryptingCredentials, theoryData.CompressionAlgorithm);
- var validationResult = handler.ValidateTokenAsync(jwtToken, theoryData.ValidationParameters).Result;
+ var validationResult = await handler.ValidateTokenAsync(jwtToken, theoryData.ValidationParameters);
if (validationResult.Exception != null)
throw validationResult.Exception;
@@ -3787,7 +3787,7 @@ public void EncryptExistingJWSWithCompressionTest(CreateTokenTheoryData theoryDa
}
[Theory, MemberData(nameof(JWECompressionTheoryData))]
- public void JWECompressionTest(CreateTokenTheoryData theoryData)
+ public async Task JWECompressionTest(CreateTokenTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.JWECompressionTest", theoryData);
@@ -3805,7 +3805,7 @@ public void JWECompressionTest(CreateTokenTheoryData theoryData)
else
jwtToken = handler.CreateToken(theoryData.Payload, theoryData.SigningCredentials, theoryData.EncryptingCredentials, theoryData.CompressionAlgorithm);
- var validationResult = handler.ValidateTokenAsync(jwtToken, theoryData.ValidationParameters).Result;
+ var validationResult = await handler.ValidateTokenAsync(jwtToken, theoryData.ValidationParameters);
if (validationResult.Exception != null)
throw validationResult.Exception;
@@ -3936,7 +3936,7 @@ public static TheoryData JWECompressionTheoryData
}
[Theory, MemberData(nameof(JweDecompressSizeTheoryData))]
- public void JWEDecompressionSizeTest(JWEDecompressionTheoryData theoryData)
+ public async Task JWEDecompressionSizeTest(JWEDecompressionTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.JWEDecompressionTest", theoryData);
@@ -3944,7 +3944,7 @@ public void JWEDecompressionSizeTest(JWEDecompressionTheoryData theoryData)
{
var handler = new JsonWebTokenHandler();
CompressionProviderFactory.Default = theoryData.CompressionProviderFactory;
- var validationResult = handler.ValidateTokenAsync(theoryData.JWECompressionString, theoryData.ValidationParameters).Result;
+ var validationResult = await handler.ValidateTokenAsync(theoryData.JWECompressionString, theoryData.ValidationParameters);
theoryData.ExpectedException.ProcessException(validationResult.Exception, context);
}
catch (Exception ex)
@@ -4000,7 +4000,7 @@ public static TheoryData JweDecompressSizeTheoryData
}
[Theory, MemberData(nameof(JWEDecompressionTheoryData))]
- public void JWEDecompressionTest(JWEDecompressionTheoryData theoryData)
+ public async Task JWEDecompressionTest(JWEDecompressionTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.JWEDecompressionTest", theoryData);
@@ -4008,7 +4008,7 @@ public void JWEDecompressionTest(JWEDecompressionTheoryData theoryData)
{
var handler = new JsonWebTokenHandler();
CompressionProviderFactory.Default = theoryData.CompressionProviderFactory;
- var validationResult = handler.ValidateTokenAsync(theoryData.JWECompressionString, theoryData.ValidationParameters).Result;
+ var validationResult = await handler.ValidateTokenAsync(theoryData.JWECompressionString, theoryData.ValidationParameters);
var validatedToken = validationResult.SecurityToken as JsonWebToken;
if (validationResult.Exception != null)
{
@@ -4119,7 +4119,7 @@ public static TheoryData JWEDecompressionTheoryData(
}
[Theory, MemberData(nameof(SecurityKeyNotFoundExceptionTestTheoryData))]
- public void SecurityKeyNotFoundExceptionTest(CreateTokenTheoryData theoryData)
+ public async Task SecurityKeyNotFoundExceptionTest(CreateTokenTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.SecurityKeyNotFoundExceptionTest", theoryData);
@@ -4127,7 +4127,7 @@ public void SecurityKeyNotFoundExceptionTest(CreateTokenTheoryData theoryData)
{
var handler = new JsonWebTokenHandler();
var token = handler.CreateToken(theoryData.TokenDescriptor);
- var validationResult = handler.ValidateTokenAsync(token, theoryData.ValidationParameters).Result;
+ var validationResult = await handler.ValidateTokenAsync(token, theoryData.ValidationParameters);
if (validationResult.Exception != null)
{
if (validationResult.IsValid)
@@ -4218,7 +4218,7 @@ public static TheoryData SecurityKeyNotFoundExceptionTest
}
[Theory, MemberData(nameof(IncludeSecurityTokenOnFailureTestTheoryData))]
- public void IncludeSecurityTokenOnFailedValidationTest(CreateTokenTheoryData theoryData)
+ public async Task IncludeSecurityTokenOnFailedValidationTest(CreateTokenTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.IncludeSecurityTokenOnFailedValidationTest", theoryData);
@@ -4226,7 +4226,7 @@ public void IncludeSecurityTokenOnFailedValidationTest(CreateTokenTheoryData the
{
var handler = new JsonWebTokenHandler();
var token = handler.CreateToken(theoryData.TokenDescriptor);
- var validationResult = handler.ValidateTokenAsync(token, theoryData.ValidationParameters).Result;
+ var validationResult = await handler.ValidateTokenAsync(token, theoryData.ValidationParameters);
if (theoryData.ValidationParameters.IncludeTokenOnFailedValidation)
{
Assert.NotNull(validationResult.TokenOnFailedValidation);
@@ -4315,7 +4315,7 @@ public async Task ValidateTokenAsync_ModifiedAuthNTag(CreateTokenTheoryData theo
var jweWithExtraCharacters = jwe + "_cannoli_hunts_truffles_";
// act
- var tokenValidationResult = await jsonWebTokenHandler.ValidateTokenAsync(jweWithExtraCharacters, theoryData.ValidationParameters).ConfigureAwait(false);
+ var tokenValidationResult = await jsonWebTokenHandler.ValidateTokenAsync(jweWithExtraCharacters, theoryData.ValidationParameters);
// assert
Assert.Equal(theoryData.IsValid, tokenValidationResult.IsValid);
diff --git a/test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/ConfigurationManagerTests.cs b/test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/ConfigurationManagerTests.cs
index 3d4cb1ea7f..e71ef595db 100644
--- a/test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/ConfigurationManagerTests.cs
+++ b/test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/ConfigurationManagerTests.cs
@@ -11,7 +11,6 @@
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
-using Microsoft.IdentityModel.Logging;
using Microsoft.IdentityModel.Protocols.Configuration;
using Microsoft.IdentityModel.Protocols.OpenIdConnect.Configuration;
using Microsoft.IdentityModel.TestUtils;
@@ -176,7 +175,7 @@ public void Defaults()
}
[Fact]
- public void FetchMetadataFailureTest()
+ public async Task FetchMetadataFailureTest()
{
var context = new CompareContext($"{this}.FetchMetadataFailureTest");
@@ -186,7 +185,7 @@ public void FetchMetadataFailureTest()
// First time to fetch metadata
try
{
- var configuration = configManager.GetConfigurationAsync().Result;
+ var configuration = await configManager.GetConfigurationAsync();
}
catch (Exception firstFetchMetadataFailure)
{
@@ -196,7 +195,7 @@ public void FetchMetadataFailureTest()
// Fetch metadata again during refresh interval, the exception should be same from above
try
{
- var configuration = configManager.GetConfigurationAsync().Result;
+ var configuration = await configManager.GetConfigurationAsync();
}
catch (Exception secondFetchMetadataFailure)
{
@@ -211,7 +210,7 @@ public void FetchMetadataFailureTest()
}
[Fact]
- public void BootstrapRefreshIntervalTest()
+ public async Task BootstrapRefreshIntervalTest()
{
var context = new CompareContext($"{this}.BootstrapRefreshIntervalTest");
@@ -221,7 +220,7 @@ public void BootstrapRefreshIntervalTest()
// First time to fetch metadata.
try
{
- var configuration = configManager.GetConfigurationAsync().Result;
+ var configuration = await configManager.GetConfigurationAsync();
}
catch (Exception firstFetchMetadataFailure)
{
@@ -237,7 +236,7 @@ public void BootstrapRefreshIntervalTest()
try
{
configManager.RequestRefresh();
- var configuration = configManager.GetConfigurationAsync().Result;
+ var configuration = await configManager.GetConfigurationAsync();
}
catch (Exception secondFetchMetadataFailure)
{
@@ -267,7 +266,7 @@ public void GetSets()
Type type = typeof(ConfigurationManager);
PropertyInfo[] properties = type.GetProperties();
if (properties.Length != ExpectedPropertyCount)
- Assert.True(false, $"Number of properties has changed from {ExpectedPropertyCount} to: " + properties.Length + ", adjust tests");
+ Assert.Fail($"Number of properties has changed from {ExpectedPropertyCount} to: " + properties.Length + ", adjust tests");
var defaultAutomaticRefreshInterval = ConfigurationManager.DefaultAutomaticRefreshInterval;
var defaultRefreshInterval = ConfigurationManager.DefaultRefreshInterval;
@@ -299,15 +298,15 @@ public async Task AutomaticRefreshInterval(ConfigurationManagerTheoryData("AutomaticRefreshIntervalNotHit")
- {
- ConfigurationManager = new ConfigurationManager(
+ {
+ ConfigurationManager = new ConfigurationManager(
"AADCommonV1Json",
new OpenIdConnectConfigurationRetriever(),
InMemoryDocumentRetriever),
- ExpectedConfiguration = OpenIdConfigData.AADCommonV1Config,
- ExpectedUpdatedConfiguration = OpenIdConfigData.AADCommonV1Config,
- SyncAfter = DateTime.UtcNow + TimeSpan.FromDays(2),
- UpdatedMetadataAddress = "AADCommonV2Json"
- });
+ ExpectedConfiguration = OpenIdConfigData.AADCommonV1Config,
+ ExpectedUpdatedConfiguration = OpenIdConfigData.AADCommonV1Config,
+ SyncAfter = DateTime.UtcNow + TimeSpan.FromDays(2),
+ UpdatedMetadataAddress = "AADCommonV2Json"
+ });
// AutomaticRefreshInterval should pick up new bits.
theoryData.Add(new ConfigurationManagerTheoryData("AutomaticRefreshIntervalHit")
@@ -374,7 +373,7 @@ public async Task RequestRefresh(ConfigurationManagerTheoryData 0)
Thread.Sleep(theoryData.SleepTimeInMs);
- var updatedConfiguration = await theoryData.ConfigurationManager.GetConfigurationAsync(CancellationToken.None).ConfigureAwait(false);
+ var updatedConfiguration = await theoryData.ConfigurationManager.GetConfigurationAsync(CancellationToken.None);
IdentityComparer.AreEqual(updatedConfiguration, theoryData.ExpectedUpdatedConfiguration, context);
@@ -461,7 +460,7 @@ public async Task HttpFailures(ConfigurationManagerTheoryData("OpenIdConnectMetadata.json", new OpenIdConnectConfigurationRetriever(), docRetriever);
- var configuration = await configManager.GetConfigurationAsync(CancellationToken.None).ConfigureAwait(false);
+ var configuration = await configManager.GetConfigurationAsync(CancellationToken.None);
TestUtilities.SetField(configManager, "_lastRequestRefresh", DateTimeOffset.UtcNow - TimeSpan.FromHours(1));
configManager.RequestRefresh();
configManager.MetadataAddress = "http://127.0.0.1";
- var configuration2 = await configManager.GetConfigurationAsync(CancellationToken.None).ConfigureAwait(false);
+ var configuration2 = await configManager.GetConfigurationAsync(CancellationToken.None);
IdentityComparer.AreEqual(configuration, configuration2, context);
if (!object.ReferenceEquals(configuration, configuration2))
context.Diffs.Add("!object.ReferenceEquals(configuration, configuration2)");
@@ -614,7 +613,7 @@ public void TestConfigurationComparer()
}
[Theory, MemberData(nameof(ValidateOpenIdConnectConfigurationTestCases), DisableDiscoveryEnumeration = true)]
- public void ValidateOpenIdConnectConfigurationTests(ConfigurationManagerTheoryData theoryData)
+ public async Task ValidateOpenIdConnectConfigurationTests(ConfigurationManagerTheoryData theoryData)
{
TestUtilities.WriteHeader($"{this}.ValidateOpenIdConnectConfigurationTests");
var context = new CompareContext();
@@ -628,7 +627,7 @@ public void ValidateOpenIdConnectConfigurationTests(ConfigurationManagerTheoryDa
{
//create a listener and enable it for logs
var listener = TestUtils.SampleListener.CreateLoggerListener(EventLevel.Warning);
- configuration = configurationManager.GetConfigurationAsync().Result;
+ configuration = await configurationManager.GetConfigurationAsync();
// we need to sleep here to make sure the task that updates configuration has finished.
Thread.Sleep(250);
@@ -638,16 +637,12 @@ public void ValidateOpenIdConnectConfigurationTests(ConfigurationManagerTheoryDa
theoryData.ExpectedException.ProcessNoException(context);
}
- catch (AggregateException ex)
+ catch (Exception ex)
{
// this should throw, because last configuration retrieved was null
- Assert.Throws(() => configuration = configurationManager.GetConfigurationAsync().Result);
+ await Assert.ThrowsAsync(async () => configuration = await configurationManager.GetConfigurationAsync());
- ex.Handle((x) =>
- {
- theoryData.ExpectedException.ProcessException(x, context);
- return true;
- });
+ theoryData.ExpectedException.ProcessException(ex, context);
}
TestUtilities.AssertFailIfErrors(context);
@@ -772,9 +767,9 @@ public class ConfigurationManagerTheoryData : TheoryDataBase where T : class
{
public ConfigurationManager ConfigurationManager { get; set; }
- public ConfigurationManagerTheoryData() {}
+ public ConfigurationManagerTheoryData() { }
- public ConfigurationManagerTheoryData(string testId) : base(testId) {}
+ public ConfigurationManagerTheoryData(string testId) : base(testId) { }
public TimeSpan AutomaticRefreshInterval { get; set; }
@@ -811,7 +806,7 @@ public override string ToString()
return $"{TestId}, {MetadataAddress}, {ExpectedException}";
}
- public string UpdatedMetadataAddress { get; set; }
+ public string UpdatedMetadataAddress { get; set; }
}
}
}
diff --git a/test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/End2EndTests.cs b/test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/End2EndTests.cs
index d55d095692..76721b3252 100644
--- a/test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/End2EndTests.cs
+++ b/test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/End2EndTests.cs
@@ -4,6 +4,7 @@
using System;
using System.IdentityModel.Tokens.Jwt;
using System.Threading;
+using System.Threading.Tasks;
using Microsoft.IdentityModel.TestUtils;
using Microsoft.IdentityModel.Tokens;
using Xunit;
@@ -16,12 +17,12 @@ namespace Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests
public class End2EndTests
{
[Theory, MemberData(nameof(OpenIdConnectTheoryData))]
- public void OpenIdConnect(OpenIdConnectTheoryData theoryData)
+ public async Task OpenIdConnect(OpenIdConnectTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.OpenIdConnect", theoryData);
try
{
- OpenIdConnectConfiguration configuration = OpenIdConnectConfigurationRetriever.GetAsync(theoryData.OpenIdConnectMetadataFileName, new FileDocumentRetriever(), CancellationToken.None).Result;
+ OpenIdConnectConfiguration configuration = await OpenIdConnectConfigurationRetriever.GetAsync(theoryData.OpenIdConnectMetadataFileName, new FileDocumentRetriever(), CancellationToken.None);
theoryData.AdditionalValidation?.Invoke(configuration);
diff --git a/test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/OpenIdConnectConfigurationTests.cs b/test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/OpenIdConnectConfigurationTests.cs
index d9629abcfe..4830b6935c 100644
--- a/test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/OpenIdConnectConfigurationTests.cs
+++ b/test/Microsoft.IdentityModel.Protocols.OpenIdConnect.Tests/OpenIdConnectConfigurationTests.cs
@@ -150,7 +150,7 @@ public void GetSets()
Type type = typeof(OpenIdConnectConfiguration);
PropertyInfo[] properties = type.GetProperties();
if (properties.Length != 68)
- Assert.True(false, "Number of properties has changed from 68 to: " + properties.Length + ", adjust tests");
+ Assert.Fail("Number of properties has changed from 68 to: " + properties.Length + ", adjust tests");
TestUtilities.CallAllPublicInstanceAndStaticPropertyGets(configuration, "OpenIdConnectConfiguration_GetSets");
diff --git a/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/PopKeyResolvingTests.cs b/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/PopKeyResolvingTests.cs
index 157aead84e..304e37763d 100644
--- a/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/PopKeyResolvingTests.cs
+++ b/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/PopKeyResolvingTests.cs
@@ -34,7 +34,7 @@ public async Task ResolvePopKeyFromCnfClaimAsync(ResolvePopKeyTheoryData theoryD
if (theoryData.Json != null)
cnf = new Cnf(theoryData.Json);
- _ = await handler.ResolvePopKeyFromCnfClaimAsync(cnf, theoryData.SignedHttpRequestToken, theoryData.ValidatedAccessToken, signedHttpRequestValidationContext, CancellationToken.None).ConfigureAwait(false);
+ _ = await handler.ResolvePopKeyFromCnfClaimAsync(cnf, theoryData.SignedHttpRequestToken, theoryData.ValidatedAccessToken, signedHttpRequestValidationContext, CancellationToken.None);
if ((bool)signedHttpRequestValidationContext.CallContext.PropertyBag[theoryData.MethodToCall] == false)
context.AddDiff($"{theoryData.MethodToCall} was not called.");
@@ -150,7 +150,7 @@ public async Task ResolvePopKeyAsync(ResolvePopKeyTheoryData theoryData)
{
var signedHttpRequestValidationContext = theoryData.BuildSignedHttpRequestValidationContext();
var handler = new SignedHttpRequestHandler();
- _ = await handler.ResolvePopKeyAsync(theoryData.SignedHttpRequestToken, theoryData.ValidatedAccessToken, signedHttpRequestValidationContext, CancellationToken.None).ConfigureAwait(false);
+ _ = await handler.ResolvePopKeyAsync(theoryData.SignedHttpRequestToken, theoryData.ValidatedAccessToken, signedHttpRequestValidationContext, CancellationToken.None);
if ((bool)signedHttpRequestValidationContext.CallContext.PropertyBag[theoryData.MethodToCall] == false)
context.AddDiff($"{theoryData.MethodToCall} was not called.");
@@ -277,7 +277,7 @@ public async Task ResolvePopKeyFromJweAsync(ResolvePopKeyTheoryData theoryData)
{
var signedHttpRequestValidationContext = theoryData.BuildSignedHttpRequestValidationContext();
var handler = new SignedHttpRequestHandler();
- _ = await handler.ResolvePopKeyFromJweAsync(theoryData.PopKeyString, signedHttpRequestValidationContext, CancellationToken.None).ConfigureAwait(false);
+ _ = await handler.ResolvePopKeyFromJweAsync(theoryData.PopKeyString, signedHttpRequestValidationContext, CancellationToken.None);
theoryData.ExpectedException.ProcessNoException(context);
}
@@ -401,7 +401,7 @@ public async Task ResolvePopKeyFromJkuAsync(ResolvePopKeyTheoryData theoryData)
{
var signedHttpRequestValidationContext = theoryData.BuildSignedHttpRequestValidationContext();
var handler = new SignedHttpRequestHandlerPublic();
- var popKey = await handler.ResolvePopKeyFromJkuAsync(theoryData.JkuSetUrl, null, signedHttpRequestValidationContext, CancellationToken.None).ConfigureAwait(false);
+ var popKey = await handler.ResolvePopKeyFromJkuAsync(theoryData.JkuSetUrl, null, signedHttpRequestValidationContext, CancellationToken.None);
if (popKey == null)
context.AddDiff("Resolved Pop key is null.");
@@ -634,7 +634,7 @@ public async Task ResolvePopKeyFromJkuKidAsync(ResolvePopKeyTheoryData theoryDat
var signedHttpRequestValidationContext = theoryData.BuildSignedHttpRequestValidationContext();
var handler = new SignedHttpRequestHandlerPublic();
Cnf cnf = new Cnf { Kid = theoryData.Kid };
- var popKey = await handler.ResolvePopKeyFromJkuAsync(theoryData.JkuSetUrl, cnf, signedHttpRequestValidationContext, CancellationToken.None).ConfigureAwait(false);
+ var popKey = await handler.ResolvePopKeyFromJkuAsync(theoryData.JkuSetUrl, cnf, signedHttpRequestValidationContext, CancellationToken.None);
if (popKey == null)
context.AddDiff("Resolved Pop key is null.");
@@ -750,7 +750,7 @@ public async Task GetPopKeysFromJkuAsync(ResolvePopKeyTheoryData theoryData)
{
var signedHttpRequestValidationContext = theoryData.BuildSignedHttpRequestValidationContext();
var handler = new SignedHttpRequestHandler();
- var popKeys = await handler.GetPopKeysFromJkuAsync(theoryData.JkuSetUrl, signedHttpRequestValidationContext, CancellationToken.None).ConfigureAwait(false);
+ var popKeys = await handler.GetPopKeysFromJkuAsync(theoryData.JkuSetUrl, signedHttpRequestValidationContext, CancellationToken.None);
if (popKeys.Count != theoryData.ExpectedNumberOfPopKeysReturned)
context.AddDiff($"Number of returned pop keys {popKeys.Count} is not the same as the expected: {theoryData.ExpectedNumberOfPopKeysReturned}.");
@@ -864,7 +864,7 @@ public async Task ResolvePopKeyFromKeyIdentifierAsync(ResolvePopKeyTheoryData th
{
var signedHttpRequestValidationContext = theoryData.BuildSignedHttpRequestValidationContext();
var handler = new SignedHttpRequestHandlerPublic();
- var popKeys = await handler.ResolvePopKeyFromKeyIdentifierAsync(theoryData.Kid, theoryData.SignedHttpRequestToken, theoryData.ValidatedAccessToken, signedHttpRequestValidationContext, CancellationToken.None).ConfigureAwait(false);
+ var popKeys = await handler.ResolvePopKeyFromKeyIdentifierAsync(theoryData.Kid, theoryData.SignedHttpRequestToken, theoryData.ValidatedAccessToken, signedHttpRequestValidationContext, CancellationToken.None);
theoryData.ExpectedException.ProcessNoException(context);
}
catch (Exception ex)
diff --git a/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestCreationTests.cs b/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestCreationTests.cs
index 1675a7cafa..246322d335 100644
--- a/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestCreationTests.cs
+++ b/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestCreationTests.cs
@@ -7,6 +7,7 @@
using System.Text;
using System.Text.Encodings.Web;
using System.Text.Json;
+using System.Threading.Tasks;
using Microsoft.IdentityModel.JsonWebTokens;
using Microsoft.IdentityModel.TestUtils;
using Microsoft.IdentityModel.Tokens;
@@ -18,7 +19,7 @@ namespace Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests
public class SignedHttpRequestCreationTests
{
[Fact]
- public void CreateSignedHttpRequest()
+ public async Task CreateSignedHttpRequest()
{
var context = TestUtilities.WriteHeader($"{this}.CreateSignedHttpRequest", "", true);
@@ -45,7 +46,7 @@ public void CreateSignedHttpRequest()
IssuerSigningKey = SignedHttpRequestTestUtils.DefaultSigningCredentials.Key
};
- var result = new JsonWebTokenHandler().ValidateTokenAsync(signedHttpRequestString, tvp).Result;
+ var result = await new JsonWebTokenHandler().ValidateTokenAsync(signedHttpRequestString, tvp);
if (result.IsValid == false)
context.AddDiff($"Not able to create and validate signed http request token");
@@ -53,7 +54,7 @@ public void CreateSignedHttpRequest()
}
[Fact]
- public void CreateSignedHttpRequestWithAdditionalHeaderClaims()
+ public async Task CreateSignedHttpRequestWithAdditionalHeaderClaims()
{
var context = TestUtilities.WriteHeader($"{this}.CreateSignedHttpRequestWithAdditionalHeaderClaims", "", true);
@@ -83,7 +84,7 @@ public void CreateSignedHttpRequestWithAdditionalHeaderClaims()
IssuerSigningKey = SignedHttpRequestTestUtils.DefaultSigningCredentials.Key
};
- var result = new JsonWebTokenHandler().ValidateTokenAsync(signedHttpRequestString, tvp).Result;
+ var result = await new JsonWebTokenHandler().ValidateTokenAsync(signedHttpRequestString, tvp);
if (result.IsValid == false)
context.AddDiff($"Not able to create and validate signed http request token");
@@ -185,7 +186,8 @@ public void CreateAtClaim(CreateSignedHttpRequestTheoryData theoryData)
{
writer = theoryData.GetWriter();
theoryData.Handler.AddAtClaim(ref writer, theoryData.BuildSignedHttpRequestDescriptor());
- CheckClaimValue(ref writer, theoryData, context); theoryData.ExpectedException.ProcessNoException(context);
+ CheckClaimValue(ref writer, theoryData, context);
+ theoryData.ExpectedException.ProcessNoException(context);
theoryData.ExpectedException.ProcessNoException(context);
}
catch (Exception ex)
diff --git a/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestE2ETests.cs b/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestE2ETests.cs
index 67c388c080..40ddf556de 100644
--- a/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestE2ETests.cs
+++ b/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestE2ETests.cs
@@ -49,7 +49,7 @@ public async Task Roundtrips(RoundtripSignedHttpRequestTheoryData theoryData)
var signedHttpRequestValidationContext = new SignedHttpRequestValidationContext(signedHttpRequest, theoryData.HttpRequestData, theoryData.TokenValidationParameters, theoryData.SignedHttpRequestValidationParameters);
- var result = await handler.ValidateSignedHttpRequestAsync(signedHttpRequestValidationContext, CancellationToken.None).ConfigureAwait(false);
+ var result = await handler.ValidateSignedHttpRequestAsync(signedHttpRequestValidationContext, CancellationToken.None);
if (cryptoProviderFactory.CryptoProviderCache.TryGetSignatureProvider(
signedHttpRequestDescriptor.SigningCredentials.Key,
signedHttpRequestDescriptor.SigningCredentials.Algorithm,
diff --git a/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestUtilityTests.cs b/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestUtilityTests.cs
index 56cd48a826..79c50066e4 100644
--- a/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestUtilityTests.cs
+++ b/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestUtilityTests.cs
@@ -263,7 +263,7 @@ public async Task ToHttpRequestDataAsync(SignedHttpRequestUtilityTheoryData theo
var context = TestUtilities.WriteHeader($"{this}.ToHttpRequestDataAsync", theoryData);
try
{
- var httpRequestData = await SignedHttpRequestUtilities.ToHttpRequestDataAsync(theoryData.HttpRequestMessage).ConfigureAwait(false);
+ var httpRequestData = await SignedHttpRequestUtilities.ToHttpRequestDataAsync(theoryData.HttpRequestMessage);
IdentityComparer.AreStringsEqual(httpRequestData.Method, theoryData.ExpectedHttpRequestData.Method, context);
IdentityComparer.AreUrisEqual(httpRequestData.Uri, theoryData.ExpectedHttpRequestData.Uri, context);
IdentityComparer.AreBytesEqual(httpRequestData.Body, theoryData.ExpectedHttpRequestData.Body, context);
diff --git a/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestValidationTests.cs b/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestValidationTests.cs
index 1282bee4ed..66c5c5d181 100644
--- a/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestValidationTests.cs
+++ b/test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/SignedHttpRequestValidationTests.cs
@@ -21,7 +21,7 @@ namespace Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests
public class SignedHttpRequestValidationTests
{
[Fact]
- public async void SignedHttpRequestReplayValidation()
+ public async Task SignedHttpRequestReplayValidation()
{
HashSet nonceCache = new HashSet();
@@ -53,15 +53,15 @@ public async void SignedHttpRequestReplayValidation()
};
var signedHttpRequestValidationContext1 = new SignedHttpRequestValidationContext(signedHttpRequest1, new HttpRequestData(), SignedHttpRequestTestUtils.DefaultTokenValidationParameters, signedHttpRequestValidationParameters);
- var result1 = await handler.ValidateSignedHttpRequestAsync(signedHttpRequestValidationContext1, CancellationToken.None).ConfigureAwait(false);
+ var result1 = await handler.ValidateSignedHttpRequestAsync(signedHttpRequestValidationContext1, CancellationToken.None);
Assert.True(result1.IsValid);
var signedHttpRequestValidationContext2 = new SignedHttpRequestValidationContext(signedHttpRequest2, new HttpRequestData(), SignedHttpRequestTestUtils.DefaultTokenValidationParameters, signedHttpRequestValidationParameters);
- var result2 = await handler.ValidateSignedHttpRequestAsync(signedHttpRequestValidationContext2, CancellationToken.None).ConfigureAwait(false);
+ var result2 = await handler.ValidateSignedHttpRequestAsync(signedHttpRequestValidationContext2, CancellationToken.None);
Assert.True(result2.IsValid);
var signedHttpRequestValidationContext3 = new SignedHttpRequestValidationContext(signedHttpRequest3, new HttpRequestData(), SignedHttpRequestTestUtils.DefaultTokenValidationParameters, signedHttpRequestValidationParameters);
- var result3 = await handler.ValidateSignedHttpRequestAsync(signedHttpRequestValidationContext3, CancellationToken.None).ConfigureAwait(false);
+ var result3 = await handler.ValidateSignedHttpRequestAsync(signedHttpRequestValidationContext3, CancellationToken.None);
Assert.False(result3.IsValid);
Assert.IsType(result3.Exception);
Assert.Equal("Replay detected", result3.Exception.Message);
@@ -925,7 +925,7 @@ public async Task ValidateSignedHttpRequestCalls(ValidateSignedHttpRequestTheory
var signedHttpRequestValidationContext = theoryData.BuildSignedHttpRequestValidationContext();
var handler = new SignedHttpRequestHandlerPublic();
- var signedHttpRequest = await handler.ValidateSignedHttpRequestPayloadAsync(theoryData.SignedHttpRequestToken, signedHttpRequestValidationContext, CancellationToken.None).ConfigureAwait(false);
+ var signedHttpRequest = await handler.ValidateSignedHttpRequestPayloadAsync(theoryData.SignedHttpRequestToken, signedHttpRequestValidationContext, CancellationToken.None);
var methodCalledStatus = (bool)signedHttpRequestValidationContext.CallContext.PropertyBag["onlyTrack_ValidateTsClaimCall"];
if (methodCalledStatus != signedHttpRequestValidationContext.SignedHttpRequestValidationParameters.ValidateTs &&
@@ -1267,7 +1267,7 @@ public async Task ValidateSignedHttpRequestSignature(ValidateSignedHttpRequestTh
{
var handler = new SignedHttpRequestHandler();
var signedHttpRequestValidationContext = theoryData.BuildSignedHttpRequestValidationContext();
- var signingKey = await handler.ValidateSignatureAsync(theoryData.SignedHttpRequestToken, theoryData.PopKey, signedHttpRequestValidationContext, CancellationToken.None).ConfigureAwait(false);
+ var signingKey = await handler.ValidateSignatureAsync(theoryData.SignedHttpRequestToken, theoryData.PopKey, signedHttpRequestValidationContext, CancellationToken.None);
IdentityComparer.AreSecurityKeysEqual(signingKey, theoryData.ExpectedPopKey, context);
theoryData.ExpectedException.ProcessNoException(context);
}
@@ -1375,7 +1375,7 @@ public async Task ValidateSignedHttpRequest(ValidateSignedHttpRequestTheoryData
if (signedHttpRequestValidationContext.CallContext.PropertyBag != null && signedHttpRequestValidationContext.CallContext.PropertyBag.ContainsKey("makeSignedHttpRequestValidationContextNull"))
signedHttpRequestValidationContext = null;
- var result = await handler.ValidateSignedHttpRequestAsync(signedHttpRequestValidationContext, CancellationToken.None).ConfigureAwait(false);
+ var result = await handler.ValidateSignedHttpRequestAsync(signedHttpRequestValidationContext, CancellationToken.None);
if (result.Exception != null)
{
diff --git a/test/Microsoft.IdentityModel.Protocols.Tests/ExtensibilityTests.cs b/test/Microsoft.IdentityModel.Protocols.Tests/ExtensibilityTests.cs
index 1bc00d5a19..1b50a81f58 100644
--- a/test/Microsoft.IdentityModel.Protocols.Tests/ExtensibilityTests.cs
+++ b/test/Microsoft.IdentityModel.Protocols.Tests/ExtensibilityTests.cs
@@ -49,22 +49,18 @@ internal class IssuerMetadata
public class ExtensibilityTests
{
[Theory, MemberData(nameof(GetMetadataTheoryData))]
- public void GetMetadataTest(DocumentRetrieverTheoryData theoryData)
+ public async Task GetMetadataTest(DocumentRetrieverTheoryData theoryData)
{
TestUtilities.WriteHeader($"{this}.GetMetadataTest", theoryData);
try
{
- string doc = theoryData.DocumentRetriever.GetDocumentAsync(theoryData.Address, CancellationToken.None).Result;
+ string doc = await theoryData.DocumentRetriever.GetDocumentAsync(theoryData.Address, CancellationToken.None);
Assert.NotNull(doc);
theoryData.ExpectedException.ProcessNoException();
}
- catch (AggregateException aex)
+ catch (Exception ex)
{
- aex.Handle((x) =>
- {
- theoryData.ExpectedException.ProcessException(x);
- return true;
- });
+ theoryData.ExpectedException.ProcessException(ex);
}
}
@@ -75,16 +71,16 @@ public async Task ConfigurationManagerUsingCustomClass()
var configManager = new ConfigurationManager("IssuerMetadata.json", new IssuerConfigurationRetriever(), docRetriever);
var context = new CompareContext($"{this}.ConfigurationManagerUsingCustomClass");
- var configuration = configManager.GetConfigurationAsync().Result;
+ var configuration = await configManager.GetConfigurationAsync();
configManager.MetadataAddress = "IssuerMetadata.json";
- var configuration2 = configManager.GetConfigurationAsync().Result;
+ var configuration2 = await configManager.GetConfigurationAsync();
if (!IdentityComparer.AreEqual(configuration.Issuer, configuration2.Issuer, context))
context.Diffs.Add("!IdentityComparer.AreEqual(configuration, configuration2)");
// AutomaticRefreshInterval should pick up new bits.
configManager = new ConfigurationManager("IssuerMetadata.json", new IssuerConfigurationRetriever(), docRetriever);
configManager.RequestRefresh();
- configuration = configManager.GetConfigurationAsync().Result;
+ configuration = await configManager.GetConfigurationAsync();
TestUtilities.SetField(configManager, "_lastRequestRefresh", DateTimeOffset.UtcNow - TimeSpan.FromHours(1));
configManager.MetadataAddress = "IssuerMetadata2.json";
configManager.RequestRefresh();
diff --git a/test/Microsoft.IdentityModel.Protocols.Tests/FileDocumentRetrieverTests.cs b/test/Microsoft.IdentityModel.Protocols.Tests/FileDocumentRetrieverTests.cs
index a81d1d53fe..78aabe7f52 100644
--- a/test/Microsoft.IdentityModel.Protocols.Tests/FileDocumentRetrieverTests.cs
+++ b/test/Microsoft.IdentityModel.Protocols.Tests/FileDocumentRetrieverTests.cs
@@ -4,6 +4,7 @@
using System;
using System.IO;
using System.Threading;
+using System.Threading.Tasks;
using Microsoft.IdentityModel.TestUtils;
using Xunit;
@@ -15,22 +16,18 @@ public class FileDocumentRetrieverTests
{
[Theory, MemberData(nameof(GetMetadataTheoryData))]
- public void GetMetadataTest(DocumentRetrieverTheoryData theoryData)
+ public async Task GetMetadataTest(DocumentRetrieverTheoryData theoryData)
{
TestUtilities.WriteHeader($"{this}.GetMetadataTest", theoryData);
try
{
- string doc = theoryData.DocumentRetriever.GetDocumentAsync(theoryData.Address, CancellationToken.None).Result;
+ string doc = await theoryData.DocumentRetriever.GetDocumentAsync(theoryData.Address, CancellationToken.None);
Assert.NotNull(doc);
theoryData.ExpectedException.ProcessNoException();
}
- catch (AggregateException aex)
+ catch (Exception ex)
{
- aex.Handle((x) =>
- {
- theoryData.ExpectedException.ProcessException(x);
- return true;
- });
+ theoryData.ExpectedException.ProcessException(ex);
}
}
diff --git a/test/Microsoft.IdentityModel.Protocols.Tests/HttpDocumentRetrieverTests.cs b/test/Microsoft.IdentityModel.Protocols.Tests/HttpDocumentRetrieverTests.cs
index bed457c1ca..379bab4945 100644
--- a/test/Microsoft.IdentityModel.Protocols.Tests/HttpDocumentRetrieverTests.cs
+++ b/test/Microsoft.IdentityModel.Protocols.Tests/HttpDocumentRetrieverTests.cs
@@ -7,6 +7,7 @@
using System.Net;
using System.Reflection;
using System.Threading;
+using System.Threading.Tasks;
using Microsoft.IdentityModel.TestUtils;
using Xunit;
@@ -55,30 +56,26 @@ public void GetSets()
}
[Theory, MemberData(nameof(GetMetadataTheoryData))]
- public void GetMetadataTest(DocumentRetrieverTheoryData theoryData)
+ public async Task GetMetadataTest(DocumentRetrieverTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.GetMetadataTest", theoryData);
try
{
- string doc = theoryData.DocumentRetriever.GetDocumentAsync(theoryData.Address, CancellationToken.None).Result;
+ string doc = await theoryData.DocumentRetriever.GetDocumentAsync(theoryData.Address, CancellationToken.None);
Assert.NotNull(doc);
theoryData.ExpectedException.ProcessNoException();
}
- catch (AggregateException aex)
+ catch (Exception ex)
{
- aex.Handle((x) =>
+ if (ex.Data.Count > 0)
{
- if (x.Data.Count > 0)
- {
- if (!x.Data.Contains(HttpDocumentRetriever.StatusCode))
- context.AddDiff("!x.Data.Contains(HttpResponseConstants.StatusCode)");
- if (!x.Data.Contains(HttpDocumentRetriever.ResponseContent))
- context.AddDiff("!x.Data.Contains(HttpResponseConstants.ResponseContent)");
- IdentityComparer.AreEqual(x.Data[HttpDocumentRetriever.StatusCode], theoryData.ExpectedStatusCode, context);
- }
- theoryData.ExpectedException.ProcessException(x);
- return true;
- });
+ if (!ex.Data.Contains(HttpDocumentRetriever.StatusCode))
+ context.AddDiff("!x.Data.Contains(HttpResponseConstants.StatusCode)");
+ if (!ex.Data.Contains(HttpDocumentRetriever.ResponseContent))
+ context.AddDiff("!x.Data.Contains(HttpResponseConstants.ResponseContent)");
+ IdentityComparer.AreEqual(ex.Data[HttpDocumentRetriever.StatusCode], theoryData.ExpectedStatusCode, context);
+ }
+ theoryData.ExpectedException.ProcessException(ex);
}
TestUtilities.AssertFailIfErrors(context);
diff --git a/test/Microsoft.IdentityModel.Tokens.Saml.Tests/Saml2SecurityTokenHandlerTests.cs b/test/Microsoft.IdentityModel.Tokens.Saml.Tests/Saml2SecurityTokenHandlerTests.cs
index 9b6303dc04..5592563962 100644
--- a/test/Microsoft.IdentityModel.Tokens.Saml.Tests/Saml2SecurityTokenHandlerTests.cs
+++ b/test/Microsoft.IdentityModel.Tokens.Saml.Tests/Saml2SecurityTokenHandlerTests.cs
@@ -63,7 +63,7 @@ public void CanReadToken(Saml2TheoryData theoryData)
{
// TODO - need to pass actual Saml2Token
if (theoryData.CanRead != theoryData.Handler.CanReadToken(theoryData.Token))
- Assert.False(true, $"Expected CanRead != CanRead, token: {theoryData.Token}");
+ Assert.Fail($"Expected CanRead != CanRead, token: {theoryData.Token}");
theoryData.ExpectedException.ProcessNoException(context);
}
diff --git a/test/Microsoft.IdentityModel.Tokens.Saml.Tests/SamlSecurityTokenHandlerTests.cs b/test/Microsoft.IdentityModel.Tokens.Saml.Tests/SamlSecurityTokenHandlerTests.cs
index 51e0da011b..bdc24a5472 100644
--- a/test/Microsoft.IdentityModel.Tokens.Saml.Tests/SamlSecurityTokenHandlerTests.cs
+++ b/test/Microsoft.IdentityModel.Tokens.Saml.Tests/SamlSecurityTokenHandlerTests.cs
@@ -70,7 +70,7 @@ public void CanReadToken(SamlTheoryData theoryData)
try
{
if (theoryData.CanRead != theoryData.Handler.CanReadToken(theoryData.Token))
- Assert.False(true, $"Expected CanRead != CanRead, token: {theoryData.Token}");
+ Assert.Fail($"Expected CanRead != CanRead, token: {theoryData.Token}");
theoryData.ExpectedException.ProcessNoException(context);
}
diff --git a/test/Microsoft.IdentityModel.Tokens.Tests/AbstractVirtualsTests.cs b/test/Microsoft.IdentityModel.Tokens.Tests/AbstractVirtualsTests.cs
index 2e6fd63a22..de178161da 100644
--- a/test/Microsoft.IdentityModel.Tokens.Tests/AbstractVirtualsTests.cs
+++ b/test/Microsoft.IdentityModel.Tokens.Tests/AbstractVirtualsTests.cs
@@ -15,13 +15,13 @@ public class AbstractVirtualsTests
{
#region BaseConfigurationManager
[Fact]
- public void BaseConfigurationManager_GetBaseConfigurationAsync()
+ public async Task BaseConfigurationManager_GetBaseConfigurationAsync()
{
TestUtilities.WriteHeader($"{this}.BaseConfigurationManager_GetBaseConfigurationAsync");
try
{
- new DerivedBaseConfigurationManager().GetBaseConfigurationAsync(default).GetAwaiter().GetResult();
+ await new DerivedBaseConfigurationManager().GetBaseConfigurationAsync(default);
}
catch (Exception ex)
{
@@ -116,7 +116,7 @@ public async Task TokenHandler_ValidateTokenAsyncString()
try
{
- await new DerivedTokenHandler().ValidateTokenAsync("token", new TokenValidationParameters()).ConfigureAwait(false);
+ await new DerivedTokenHandler().ValidateTokenAsync("token", new TokenValidationParameters());
}
catch (Exception ex)
{
@@ -131,7 +131,7 @@ public async Task TokenHandler_ValidateTokenAsyncToken()
try
{
- await new DerivedTokenHandler().ValidateTokenAsync(new DerivedSecurityToken(), new TokenValidationParameters()).ConfigureAwait(false);
+ await new DerivedTokenHandler().ValidateTokenAsync(new DerivedSecurityToken(), new TokenValidationParameters());
}
catch (Exception ex)
{
diff --git a/test/Microsoft.IdentityModel.Tokens.Tests/AuthenticatedEncryptionProviderTests.cs b/test/Microsoft.IdentityModel.Tokens.Tests/AuthenticatedEncryptionProviderTests.cs
index 778e2c976b..62b02bc8d7 100644
--- a/test/Microsoft.IdentityModel.Tokens.Tests/AuthenticatedEncryptionProviderTests.cs
+++ b/test/Microsoft.IdentityModel.Tokens.Tests/AuthenticatedEncryptionProviderTests.cs
@@ -109,7 +109,7 @@ public void AesGcm_Dispose()
#endif
[Theory, MemberData(nameof(AEPConstructorTheoryData))]
- public void Constructors(string testId, SymmetricSecurityKey key, string algorithm, ExpectedException ee)
+ public void Constructors(string testId, SecurityKey key, string algorithm, ExpectedException ee)
{
TestUtilities.WriteHeader("Constructors - " + testId, true);
try
diff --git a/test/Microsoft.IdentityModel.Tokens.Tests/CallContextTests.cs b/test/Microsoft.IdentityModel.Tokens.Tests/CallContextTests.cs
index e0480a2167..d874147046 100644
--- a/test/Microsoft.IdentityModel.Tokens.Tests/CallContextTests.cs
+++ b/test/Microsoft.IdentityModel.Tokens.Tests/CallContextTests.cs
@@ -1,8 +1,7 @@
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
using System;
-using System.CodeDom;
using Microsoft.IdentityModel.Logging;
using Microsoft.IdentityModel.TestUtils;
using Xunit;
@@ -26,11 +25,11 @@ public void LoggerInstanceTests(CallContextTheoryData theoryData)
Assert.Null(context.PropertyBag);
}
- public static TheoryData CallContextTestTheoryData
+ public static TheoryData CallContextTestTheoryData
{
get
{
- var theoryData = new TheoryData();
+ var theoryData = new TheoryData();
theoryData.Add(new CallContextTheoryData
{
diff --git a/test/Microsoft.IdentityModel.Tokens.Tests/ClaimsIdentityFactoryTests.cs b/test/Microsoft.IdentityModel.Tokens.Tests/ClaimsIdentityFactoryTests.cs
index 32944833dc..f1878a638b 100644
--- a/test/Microsoft.IdentityModel.Tokens.Tests/ClaimsIdentityFactoryTests.cs
+++ b/test/Microsoft.IdentityModel.Tokens.Tests/ClaimsIdentityFactoryTests.cs
@@ -12,6 +12,11 @@ namespace Microsoft.IdentityModel.Tokens.Tests
[Collection(nameof(ClaimsIdentityFactoryTests))]
public class ClaimsIdentityFactoryTests
{
+ public ClaimsIdentityFactoryTests()
+ {
+ AppContextSwitches.ResetAllSwitches();
+ }
+
[Theory]
[InlineData(true)]
[InlineData(false)]
diff --git a/test/Microsoft.IdentityModel.Tokens.Tests/CryptoProviderFactoryTests.cs b/test/Microsoft.IdentityModel.Tokens.Tests/CryptoProviderFactoryTests.cs
index 8c680f7e5f..0abf57f1c5 100644
--- a/test/Microsoft.IdentityModel.Tokens.Tests/CryptoProviderFactoryTests.cs
+++ b/test/Microsoft.IdentityModel.Tokens.Tests/CryptoProviderFactoryTests.cs
@@ -130,7 +130,7 @@ public void GetSets()
Type type = typeof(CryptoProviderFactory);
PropertyInfo[] properties = type.GetProperties();
if (properties.Length != 7)
- Assert.True(false, "Number of public fields has changed from 7 to: " + properties.Length + ", adjust tests");
+ Assert.Fail("Number of public fields has changed from 7 to: " + properties.Length + ", adjust tests");
CustomCryptoProvider customCryptoProvider = new CustomCryptoProvider();
GetSetContext getSetContext =
@@ -924,7 +924,7 @@ public void ReferenceCountingTest_Caching()
}
[Fact(Skip = "too long")]
- public void ReferenceCountingTest_MultiThreaded()
+ public async Task ReferenceCountingTest_MultiThreaded()
{
var context = new CompareContext($"{this}.ReferenceCountingTest_MultiThreaded");
var cryptoProviderFactory = new CryptoProviderFactory(CryptoProviderCacheTests.CreateCacheForTesting());
@@ -957,7 +957,7 @@ public void ReferenceCountingTest_MultiThreaded()
});
}
- Task.WaitAll(tasks);
+ await Task.WhenAll(tasks);
cryptoProviderFactory.CacheSignatureProviders = false;
diff --git a/test/Microsoft.IdentityModel.Tokens.Tests/EventBasedLRUCacheTests.cs b/test/Microsoft.IdentityModel.Tokens.Tests/EventBasedLRUCacheTests.cs
index 8713c1e81a..47a0289d68 100644
--- a/test/Microsoft.IdentityModel.Tokens.Tests/EventBasedLRUCacheTests.cs
+++ b/test/Microsoft.IdentityModel.Tokens.Tests/EventBasedLRUCacheTests.cs
@@ -360,7 +360,7 @@ internal bool IsDescending(LinkedList> data)
}
[Fact(Skip = "Large test meant to be run manually.")]
- public void CacheOverflowTestMultithreaded()
+ public async Task CacheOverflowTestMultithreaded()
{
TestUtilities.WriteHeader($"{this}.CacheOverflowTestMultithreaded");
var context = new CompareContext($"{this}.CacheOverflowTestMultithreaded");
@@ -376,7 +376,7 @@ public void CacheOverflowTestMultithreaded()
}));
}
- Task.WaitAll(taskList.ToArray());
+ await Task.WhenAll(taskList.ToArray());
cache.WaitForProcessing();
// Cache size should be less than the capacity (somewhere between 800 - 1000 items).
diff --git a/test/Microsoft.IdentityModel.Tokens.Tests/JsonWebKeySetTests.cs b/test/Microsoft.IdentityModel.Tokens.Tests/JsonWebKeySetTests.cs
index 625e22f991..7ff0ffb654 100644
--- a/test/Microsoft.IdentityModel.Tokens.Tests/JsonWebKeySetTests.cs
+++ b/test/Microsoft.IdentityModel.Tokens.Tests/JsonWebKeySetTests.cs
@@ -6,6 +6,7 @@
using System.Linq;
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
+using System.Threading.Tasks;
using Microsoft.IdentityModel.TestUtils;
using Xunit;
@@ -159,7 +160,7 @@ public void Defaults()
}
[Fact]
- public void SigningKeysExtensibility()
+ public async Task SigningKeysExtensibility()
{
var context = new CompareContext($"{this}.SigningKeysExtensibility");
TestUtilities.WriteHeader($"{this}.SigningKeysExtensibility");
@@ -180,7 +181,7 @@ public void SigningKeysExtensibility()
ValidateLifetime = false,
};
- var tokenValidationResult = new JsonWebTokens.JsonWebTokenHandler().ValidateTokenAsync(Default.AsymmetricJwt, tokenValidationParameters).Result;
+ var tokenValidationResult = await new JsonWebTokens.JsonWebTokenHandler().ValidateTokenAsync(Default.AsymmetricJwt, tokenValidationParameters);
if (tokenValidationResult.IsValid != true)
context.Diffs.Add("tokenValidationResult.IsValid != true");
diff --git a/test/Microsoft.IdentityModel.Tokens.Tests/JweUsingEchdTests.cs b/test/Microsoft.IdentityModel.Tokens.Tests/JweUsingEchdTests.cs
index 161834b4ad..1c0d56ee9f 100644
--- a/test/Microsoft.IdentityModel.Tokens.Tests/JweUsingEchdTests.cs
+++ b/test/Microsoft.IdentityModel.Tokens.Tests/JweUsingEchdTests.cs
@@ -4,22 +4,20 @@
#if NET472 || NET6_0_OR_GREATER
using System;
-using System.Collections;
using System.Collections.Generic;
using System.IdentityModel.Tokens.Jwt;
+using System.Threading.Tasks;
using Microsoft.IdentityModel.JsonWebTokens;
using Microsoft.IdentityModel.TestUtils;
-using Microsoft.IdentityModel.Tokens;
using Newtonsoft.Json.Linq;
using Xunit;
-using KEY = Microsoft.IdentityModel.TestUtils.KeyingMaterial;
namespace Microsoft.IdentityModel.Tokens.Tests
{
public class JweUsingEcdhEsTests
{
[Theory, MemberData(nameof(CreateEcdhEsTestcases))]
- public void CreateJweEcdhEsTests(CreateEcdhEsTheoryData theoryData)
+ public async Task CreateJweEcdhEsTests(CreateEcdhEsTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.CreateJweEcdhEsTests", theoryData);
context.AddClaimTypesToIgnoreWhenComparing("exp", "iat", "nbf");
@@ -44,10 +42,10 @@ public void CreateJweEcdhEsTests(CreateEcdhEsTheoryData theoryData)
string jsonJwe = jsonWebTokenHandler.CreateToken(securityTokenDescriptor);
string jwtJwe = jwtSecurityTokenHandler.CreateEncodedJwt(securityTokenDescriptor);
- TokenValidationResult tokenValidationResult1 = jsonWebTokenHandler.ValidateTokenAsync(jsonJwe, theoryData.TokenValidationParameters).Result;
- TokenValidationResult tokenValidationResult2 = jsonWebTokenHandler.ValidateTokenAsync(jwtJwe, theoryData.TokenValidationParameters).Result;
- TokenValidationResult tokenValidationResult3 = jwtSecurityTokenHandler.ValidateTokenAsync(jsonJwe, theoryData.TokenValidationParameters).GetAwaiter().GetResult();
- TokenValidationResult tokenValidationResult4 = jwtSecurityTokenHandler.ValidateTokenAsync(jwtJwe, theoryData.TokenValidationParameters).GetAwaiter().GetResult();
+ TokenValidationResult tokenValidationResult1 = await jsonWebTokenHandler.ValidateTokenAsync(jsonJwe, theoryData.TokenValidationParameters);
+ TokenValidationResult tokenValidationResult2 = await jsonWebTokenHandler.ValidateTokenAsync(jwtJwe, theoryData.TokenValidationParameters);
+ TokenValidationResult tokenValidationResult3 = await jwtSecurityTokenHandler.ValidateTokenAsync(jsonJwe, theoryData.TokenValidationParameters);
+ TokenValidationResult tokenValidationResult4 = await jwtSecurityTokenHandler.ValidateTokenAsync(jwtJwe, theoryData.TokenValidationParameters);
if (tokenValidationResult1.IsValid != theoryData.ExpectedIsValid)
context.AddDiff($"tokenValidationResult1.IsValid != theoryData.ExpectedIsValid");
diff --git a/test/Microsoft.IdentityModel.Tokens.Tests/RsaSecurityKeyTests.cs b/test/Microsoft.IdentityModel.Tokens.Tests/RsaSecurityKeyTests.cs
index b41074c639..59245df430 100644
--- a/test/Microsoft.IdentityModel.Tokens.Tests/RsaSecurityKeyTests.cs
+++ b/test/Microsoft.IdentityModel.Tokens.Tests/RsaSecurityKeyTests.cs
@@ -55,7 +55,7 @@ private void RsaSecurityKeyConstructorWithRsa(RSA rsa, ExpectedException ee)
}
[Theory, MemberData(nameof(HasPrivateKeyTheoryData))]
- public void HasPrivateKey(string testId, AsymmetricSecurityKey key, bool expected)
+ public void HasPrivateKey(string testId, RsaSecurityKey key, bool expected)
{
if (expected)
Assert.True(key.PrivateKeyStatus == PrivateKeyStatus.Exists, testId);
@@ -63,9 +63,9 @@ public void HasPrivateKey(string testId, AsymmetricSecurityKey key, bool expecte
Assert.True(key.PrivateKeyStatus != PrivateKeyStatus.Exists, testId);
}
- public static TheoryData HasPrivateKeyTheoryData()
+ public static TheoryData HasPrivateKeyTheoryData()
{
- var theoryData = new TheoryData();
+ var theoryData = new TheoryData();
#if NET462
theoryData.Add(
"KeyingMaterial.RsaSecurityKeyWithCspProvider_2048",
diff --git a/test/Microsoft.IdentityModel.Tokens.Tests/SignatureProviderTests.cs b/test/Microsoft.IdentityModel.Tokens.Tests/SignatureProviderTests.cs
index f30a601628..18a647ba75 100644
--- a/test/Microsoft.IdentityModel.Tokens.Tests/SignatureProviderTests.cs
+++ b/test/Microsoft.IdentityModel.Tokens.Tests/SignatureProviderTests.cs
@@ -337,7 +337,7 @@ private void SignatureProvider_DisposeVariation(string testCase, SignatureProvid
else if (testCase.StartsWith("Dispose"))
provider.Dispose();
else
- Assert.True(false, "Test case does not match any scenario");
+ Assert.Fail("Test case does not match any scenario");
expectedException.ProcessNoException();
}
diff --git a/test/Microsoft.IdentityModel.Tokens.Tests/TokenValidationParametersTests.cs b/test/Microsoft.IdentityModel.Tokens.Tests/TokenValidationParametersTests.cs
index f8fcadb3cb..3f80091899 100644
--- a/test/Microsoft.IdentityModel.Tokens.Tests/TokenValidationParametersTests.cs
+++ b/test/Microsoft.IdentityModel.Tokens.Tests/TokenValidationParametersTests.cs
@@ -24,7 +24,7 @@ public void Publics()
Type type = typeof(TokenValidationParameters);
PropertyInfo[] properties = type.GetProperties(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic);
if (properties.Length != ExpectedPropertyCount)
- Assert.True(false, $"Number of properties has changed from {ExpectedPropertyCount} to: " + properties.Length + ", adjust tests");
+ Assert.Fail($"Number of properties has changed from {ExpectedPropertyCount} to: " + properties.Length + ", adjust tests");
TokenValidationParameters actorValidationParameters = new TokenValidationParameters();
SecurityKey issuerSigningKey = KeyingMaterial.DefaultX509Key_2048_Public;
diff --git a/test/Microsoft.IdentityModel.Tokens.Tests/TokenValidationResultTests.cs b/test/Microsoft.IdentityModel.Tokens.Tests/TokenValidationResultTests.cs
index 50f081924e..f1830c46e3 100644
--- a/test/Microsoft.IdentityModel.Tokens.Tests/TokenValidationResultTests.cs
+++ b/test/Microsoft.IdentityModel.Tokens.Tests/TokenValidationResultTests.cs
@@ -4,7 +4,6 @@
using System;
using System.Collections.Generic;
using System.Reflection;
-using System.Security.Claims;
using Microsoft.IdentityModel.JsonWebTokens;
using Microsoft.IdentityModel.TestUtils;
using Xunit;
@@ -22,7 +21,7 @@ public void GetSets()
Type type = typeof(TokenValidationResult);
PropertyInfo[] properties = type.GetProperties();
if (properties.Length != 10)
- Assert.True(false, "Number of public fields has changed from 10 to: " + properties.Length + ", adjust tests");
+ Assert.Fail("Number of public fields has changed from 10 to: " + properties.Length + ", adjust tests");
GetSetContext context =
new GetSetContext
diff --git a/test/Microsoft.IdentityModel.Tokens.Tests/Validation/AsyncValidatorsTests.cs b/test/Microsoft.IdentityModel.Tokens.Tests/Validation/AsyncValidatorsTests.cs
index d96f7bc596..459a32c88b 100644
--- a/test/Microsoft.IdentityModel.Tokens.Tests/Validation/AsyncValidatorsTests.cs
+++ b/test/Microsoft.IdentityModel.Tokens.Tests/Validation/AsyncValidatorsTests.cs
@@ -22,7 +22,7 @@ public async Task AsyncIssuerValidatorTests(IssuerValidatorTheoryData theoryData
theoryData.SecurityToken,
theoryData.ValidationParameters,
null,
- CancellationToken.None).ConfigureAwait(false);
+ CancellationToken.None);
Exception exception = result.Exception;
context.Diffs.Add("Exception: " + exception.ToString());
}
diff --git a/test/Microsoft.IdentityModel.Tokens.Tests/Validation/IssuerValidationResultTests.cs b/test/Microsoft.IdentityModel.Tokens.Tests/Validation/IssuerValidationResultTests.cs
index 2a887b10d3..75f96dddc1 100644
--- a/test/Microsoft.IdentityModel.Tokens.Tests/Validation/IssuerValidationResultTests.cs
+++ b/test/Microsoft.IdentityModel.Tokens.Tests/Validation/IssuerValidationResultTests.cs
@@ -29,7 +29,7 @@ public async Task IssuerValidatorAsyncTests(IssuerValidationResultsTheoryData th
theoryData.SecurityToken,
theoryData.ValidationParameters,
new CallContext(),
- CancellationToken.None).ConfigureAwait(false);
+ CancellationToken.None);
if (issuerValidationResult.Exception != null)
theoryData.ExpectedException.ProcessException(issuerValidationResult.Exception, context);
diff --git a/test/Microsoft.IdentityModel.Tokens.Tests/Validation/ValidationParametersTests.cs b/test/Microsoft.IdentityModel.Tokens.Tests/Validation/ValidationParametersTests.cs
index 7cc0afc899..1ae3383d3d 100644
--- a/test/Microsoft.IdentityModel.Tokens.Tests/Validation/ValidationParametersTests.cs
+++ b/test/Microsoft.IdentityModel.Tokens.Tests/Validation/ValidationParametersTests.cs
@@ -26,7 +26,7 @@ public void ValidIssuers_GetReturnsEmptyList()
{
var validationParameters = new ValidationParameters();
- Assert.Equal(0, validationParameters.ValidIssuers.Count);
+ Assert.Empty(validationParameters.ValidIssuers);
}
[Fact]
@@ -34,7 +34,7 @@ public void ValidAudiences_Get_ReturnsEmptyList()
{
var validationParameters = new ValidationParameters();
- Assert.Equal(0, validationParameters.ValidAudiences.Count);
+ Assert.Empty(validationParameters.ValidAudiences);
Assert.True(validationParameters.ValidAudiences is IList);
}
@@ -42,8 +42,8 @@ public void ValidAudiences_Get_ReturnsEmptyList()
public void ValidTypes_Get_ReturnsEmptyList()
{
var validationParameters = new ValidationParameters();
-
- Assert.Equal(0, validationParameters.ValidTypes.Count);
+
+ Assert.Empty(validationParameters.ValidTypes);
Assert.True(validationParameters.ValidTypes is IList);
}
}
diff --git a/test/Microsoft.IdentityModel.Validators.Tests/AadSigningKeyIssuerValidatorTests.cs b/test/Microsoft.IdentityModel.Validators.Tests/AadSigningKeyIssuerValidatorTests.cs
index d69004ddd7..d5b7554a0d 100644
--- a/test/Microsoft.IdentityModel.Validators.Tests/AadSigningKeyIssuerValidatorTests.cs
+++ b/test/Microsoft.IdentityModel.Validators.Tests/AadSigningKeyIssuerValidatorTests.cs
@@ -45,7 +45,7 @@ public async Task EnableAadSigningKeyIssuerValidationTests(AadSigningKeyIssuerTh
AadIssuerValidator.GetAadIssuerValidator(Default.AadV1Authority).ConfigurationManagerV1 = theoryData.TokenValidationParameters.ConfigurationManager;
theoryData.TokenValidationParameters.EnableAadSigningKeyIssuerValidation();
- var validationResult = await handler.ValidateTokenAsync(jwt, theoryData.TokenValidationParameters).ConfigureAwait(false);
+ var validationResult = await handler.ValidateTokenAsync(jwt, theoryData.TokenValidationParameters);
theoryData.ExpectedException.ProcessNoException(context);
Assert.NotNull(theoryData.TokenValidationParameters.IssuerSigningKeyValidatorUsingConfiguration);
Assert.True(validationResult.IsValid);
diff --git a/test/Microsoft.IdentityModel.Xml.Tests/EnvelopedSignatureReaderTests.cs b/test/Microsoft.IdentityModel.Xml.Tests/EnvelopedSignatureReaderTests.cs
index 431fe671fe..fe71251c6e 100644
--- a/test/Microsoft.IdentityModel.Xml.Tests/EnvelopedSignatureReaderTests.cs
+++ b/test/Microsoft.IdentityModel.Xml.Tests/EnvelopedSignatureReaderTests.cs
@@ -53,7 +53,7 @@ public void Constructor(EnvelopedSignatureTheoryData theoryData)
if (theoryData.ExpectSignature)
{
if (envelopedReader.Signature == null)
- Assert.False(true, "theoryData.ExpectSignature == true && envelopedReader.ExpectSignature == null");
+ Assert.Fail("theoryData.ExpectSignature == true && envelopedReader.ExpectSignature == null");
envelopedReader.Signature.Verify(theoryData.SecurityKey, theoryData.SecurityKey.CryptoProviderFactory);
}
@@ -97,7 +97,7 @@ public void ReadSignedXml(EnvelopedSignatureTheoryData theoryData)
if (theoryData.ExpectSignature)
{
if (envelopedReader.Signature == null)
- Assert.False(true, "theoryData.ExpectSignature == true && envelopedReader.Signature == null");
+ Assert.Fail("theoryData.ExpectSignature == true && envelopedReader.Signature == null");
envelopedReader.Signature.Verify(theoryData.SecurityKey, theoryData.CryptoProviderFactory);
}
diff --git a/test/System.IdentityModel.Tokens.Jwt.Tests/JwtPayloadTest.cs b/test/System.IdentityModel.Tokens.Jwt.Tests/JwtPayloadTest.cs
index 659639f9b4..a62c203f3a 100644
--- a/test/System.IdentityModel.Tokens.Jwt.Tests/JwtPayloadTest.cs
+++ b/test/System.IdentityModel.Tokens.Jwt.Tests/JwtPayloadTest.cs
@@ -30,19 +30,19 @@ public void Defaults()
foreach (Claim c in jwtPayload.Claims)
{
- Assert.True(false, "jwtPayload.Claims should be empty");
+ Assert.Fail("jwtPayload.Claims should be empty");
}
Assert.True(jwtPayload.Aud != null, "jwtPayload.Aud should not be null");
foreach (string audience in jwtPayload.Aud)
{
- Assert.True(false, "jwtPayload.Aud should be empty");
+ Assert.Fail("jwtPayload.Aud should be empty");
}
Assert.True(jwtPayload.Amr != null, "jwtPayload.Amr should not be null");
foreach (string audience in jwtPayload.Amr)
{
- Assert.True(false, "jwtPayload.Amr should be empty");
+ Assert.Fail("jwtPayload.Amr should be empty");
}
Assert.True(jwtPayload.ValidFrom == DateTime.MinValue, "jwtPayload.ValidFrom != DateTime.MinValue");
@@ -60,10 +60,10 @@ public void GetSets()
PropertyInfo[] properties = type.GetProperties();
#if NET9_0_OR_GREATER
if (properties.Length != 26) //Additional inherited "Capacity" property from Dictionary is added in .NET 9
- Assert.True(false, "Number of properties has changed from 26 to: " + properties.Length + ", adjust tests");
+ Assert.Fail("Number of properties has changed from 26 to: " + properties.Length + ", adjust tests");
#else
if (properties.Length != 25)
- Assert.True(false, "Number of properties has changed from 25 to: " + properties.Length + ", adjust tests");
+ Assert.Fail("Number of properties has changed from 25 to: " + properties.Length + ", adjust tests");
#endif
GetSetContext context =
new GetSetContext
@@ -165,7 +165,7 @@ public void TestClaimWithNullValue()
}
if (!claimFound)
- Assert.True(false, "Claim with expected type: nullClaim is not found");
+ Assert.Fail("Claim with expected type: nullClaim is not found");
Assert.Equal(payload.SerializeToJson(), compareTo);
}
diff --git a/test/System.IdentityModel.Tokens.Jwt.Tests/JwtSecurityTokenHandlerTests.cs b/test/System.IdentityModel.Tokens.Jwt.Tests/JwtSecurityTokenHandlerTests.cs
index 3bbc83a453..8eeefc13c0 100644
--- a/test/System.IdentityModel.Tokens.Jwt.Tests/JwtSecurityTokenHandlerTests.cs
+++ b/test/System.IdentityModel.Tokens.Jwt.Tests/JwtSecurityTokenHandlerTests.cs
@@ -259,7 +259,7 @@ public static TheoryData CreateJWEWithPayloadStringTheory
// Tests for expected differences between the JwtSecurityTokenHandler and the JsonWebTokenHandler.
[Theory, MemberData(nameof(CreateJWEUsingSecurityTokenDescriptorTheoryData))]
- public void CheckExpectedDifferenceInAudClaimUsingSecurityTokenDescriptor(CreateTokenTheoryData theoryData)
+ public async Task CheckExpectedDifferenceInAudClaimUsingSecurityTokenDescriptor(CreateTokenTheoryData theoryData)
{
if (theoryData.TokenDescriptor == null)
return;
@@ -295,7 +295,7 @@ public void CheckExpectedDifferenceInAudClaimUsingSecurityTokenDescriptor(Create
string jweFromJsonHandler = theoryData.JsonWebTokenHandler.CreateToken(theoryData.TokenDescriptor);
ClaimsPrincipal claimsPrincipalJwtHandler = theoryData.JwtSecurityTokenHandler.ValidateToken(tokenFromJwtHandler, theoryData.ValidationParameters, out SecurityToken validatedTokenFromJwtHandler);
- TokenValidationResult validationResultJsonHandler = theoryData.JsonWebTokenHandler.ValidateTokenAsync(jweFromJsonHandler, theoryData.ValidationParameters).Result;
+ TokenValidationResult validationResultJsonHandler = await theoryData.JsonWebTokenHandler.ValidateTokenAsync(jweFromJsonHandler, theoryData.ValidationParameters);
int expectedAudClaimCount = 0;
int additionalAudClaimsForJwtHandler = 0;
@@ -340,7 +340,7 @@ public void CheckExpectedDifferenceInAudClaimUsingSecurityTokenDescriptor(Create
Assert.True(expectedAudClaimCount == enumerable.Count());
break;
default:
- Assert.True(false, "Unexpected type for 'aud' claim.");
+ Assert.Fail("Unexpected type for 'aud' claim.");
break;
}
}
@@ -384,7 +384,7 @@ private static int GetClaimCountFromTokenDescriptorSubject(SecurityTokenDescript
// Tests checks to make sure that the token string created by the JwtSecurityTokenHandler is consistent with the
// token string created by the JsonWebTokenHandler.
[Theory, MemberData(nameof(CreateJWEUsingSecurityTokenDescriptorTheoryData))]
- public void CreateJWEUsingSecurityTokenDescriptor(CreateTokenTheoryData theoryData)
+ public async Task CreateJWEUsingSecurityTokenDescriptor(CreateTokenTheoryData theoryData)
{
CompareContext context = TestUtilities.WriteHeader($"{this}.CreateJWEUsingSecurityTokenDescriptor", theoryData);
theoryData.ValidationParameters.ValidateLifetime = false;
@@ -403,7 +403,7 @@ public void CreateJWEUsingSecurityTokenDescriptor(CreateTokenTheoryData theoryDa
string jweFromJsonHandler = theoryData.JsonWebTokenHandler.CreateToken(theoryData.TokenDescriptor);
var claimsPrincipalJwt = theoryData.JwtSecurityTokenHandler.ValidateToken(tokenFromTokenDescriptor, theoryData.ValidationParameters, out SecurityToken validatedTokenFromJwtHandler);
- var validationResultJson = theoryData.JsonWebTokenHandler.ValidateTokenAsync(jweFromJsonHandler, theoryData.ValidationParameters).Result;
+ var validationResultJson = await theoryData.JsonWebTokenHandler.ValidateTokenAsync(jweFromJsonHandler, theoryData.ValidationParameters);
if (validationResultJson.Exception != null && validationResultJson.IsValid)
context.Diffs.Add("validationResultJsonHandler.IsValid, validationResultJsonHandler.Exception != null");
@@ -411,7 +411,7 @@ public void CreateJWEUsingSecurityTokenDescriptor(CreateTokenTheoryData theoryDa
IdentityComparer.AreEqual(validationResultJson.IsValid, theoryData.IsValid, context);
var validatedTokenFromJsonHandler = validationResultJson.SecurityToken;
- var validationResult2 = theoryData.JsonWebTokenHandler.ValidateTokenAsync(tokenFromTokenDescriptor, theoryData.ValidationParameters).Result;
+ var validationResult2 = await theoryData.JsonWebTokenHandler.ValidateTokenAsync(tokenFromTokenDescriptor, theoryData.ValidationParameters);
if (validationResult2.Exception != null && validationResult2.IsValid)
{
@@ -1136,7 +1136,7 @@ public void MapInboundClaims()
handler = new JwtSecurityTokenHandler();
// Make sure that we don't populate the InboundClaimTypeMap if DefaultMapInboundClaims was previously set to false.
- Assert.Equal(0, handler.InboundClaimTypeMap.Count);
+ Assert.Empty(handler.InboundClaimTypeMap);
var claims = new List
{
@@ -1331,7 +1331,7 @@ public async Task JWEDecompressionSizeTest(JWEDecompressionTheoryData theoryData
{
var handler = new JwtSecurityTokenHandler();
CompressionProviderFactory.Default = theoryData.CompressionProviderFactory;
- var validationResult = await handler.ValidateTokenAsync(theoryData.JWECompressionString, theoryData.ValidationParameters).ConfigureAwait(false);
+ var validationResult = await handler.ValidateTokenAsync(theoryData.JWECompressionString, theoryData.ValidationParameters);
theoryData.ExpectedException.ProcessException(validationResult.Exception, context);
}
catch (Exception ex)
@@ -2433,7 +2433,7 @@ public static TheoryData ValidateJwsWithConfigTheoryData
}
[Theory, MemberData(nameof(ValidateJwsWithLastKnownGoodTheoryData))]
- public void ValidateJWSWithLastKnownGood(JwtTheoryData theoryData)
+ public async Task ValidateJWSWithLastKnownGood(JwtTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.ValidateJWSWithLastKnownGood", theoryData);
@@ -2457,7 +2457,7 @@ public void ValidateJWSWithLastKnownGood(JwtTheoryData theoryData)
var previousValidateWithLKG = theoryData.ValidationParameters.ValidateWithLKG;
theoryData.ValidationParameters.ValidateWithLKG = false;
- var setupValidationResult = handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters).Result;
+ var setupValidationResult = await handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters);
theoryData.ValidationParameters.ValidateWithLKG = previousValidateWithLKG;
@@ -2484,7 +2484,7 @@ public void ValidateJWSWithLastKnownGood(JwtTheoryData theoryData)
public static TheoryData ValidateJwsWithLastKnownGoodTheoryData => JwtTestDatasets.ValidateJwsWithLastKnownGoodTheoryData;
[Theory, MemberData(nameof(ValidateJWEWithLastKnownGoodTheoryData))]
- public void ValidateJWEWithLastKnownGood(JwtTheoryData theoryData)
+ public async Task ValidateJWEWithLastKnownGood(JwtTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.ValidateJWEWithLastKnownGood", theoryData);
@@ -2508,7 +2508,7 @@ public void ValidateJWEWithLastKnownGood(JwtTheoryData theoryData)
var previousValidateWithLKG = theoryData.ValidationParameters.ValidateWithLKG;
theoryData.ValidationParameters.ValidateWithLKG = false;
- var setupValidationResult = handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters).Result;
+ var setupValidationResult = await handler.ValidateTokenAsync(theoryData.Token, theoryData.ValidationParameters);
theoryData.ValidationParameters.ValidateWithLKG = previousValidateWithLKG;
diff --git a/test/System.IdentityModel.Tokens.Jwt.Tests/JwtSecurityTokenTests.cs b/test/System.IdentityModel.Tokens.Jwt.Tests/JwtSecurityTokenTests.cs
index 2c723e7c24..a80ae3397d 100644
--- a/test/System.IdentityModel.Tokens.Jwt.Tests/JwtSecurityTokenTests.cs
+++ b/test/System.IdentityModel.Tokens.Jwt.Tests/JwtSecurityTokenTests.cs
@@ -88,7 +88,7 @@ public void Defaults()
foreach (Claim c in jwt.Claims)
{
- Assert.True(false, "claims.Count != 0");
+ Assert.Fail("claims.Count != 0");
break;
}
@@ -96,7 +96,7 @@ public void Defaults()
Assert.NotNull(jwt.Audiences);
foreach (string aud in jwt.Audiences)
{
- Assert.True(false, "jwt.Audiences should be empty");
+ Assert.Fail("jwt.Audiences should be empty");
}
Assert.Null(jwt.Id);
Assert.Null(jwt.Issuer);
@@ -234,7 +234,7 @@ public void EmbeddedTokenConstructor1(string testId, JwtSecurityTokenTestVariati
}
catch (Exception ex)
{
- Assert.True(false, string.Format("Testcase: {0}. UnExpected when getting a properties: '{1}'", outerTokenVariation.Name, ex.ToString()));
+ Assert.Fail(string.Format("Testcase: {0}. UnExpected when getting a properties: '{1}'", outerTokenVariation.Name, ex.ToString()));
}
try
@@ -252,7 +252,7 @@ public void EmbeddedTokenConstructor1(string testId, JwtSecurityTokenTestVariati
}
catch (Exception ex)
{
- Assert.True(false, string.Format("Testcase: {0}. UnExpected when getting a properties: '{1}'", testId, ex.ToString()));
+ Assert.Fail(string.Format("Testcase: {0}. UnExpected when getting a properties: '{1}'", testId, ex.ToString()));
}
try
@@ -267,7 +267,7 @@ public void EmbeddedTokenConstructor1(string testId, JwtSecurityTokenTestVariati
}
catch (Exception ex)
{
- Assert.True(false, string.Format("Testcase: {0}. Unexpected inequality between outer and inner token properties: '{1}'", testId, ex.ToString()));
+ Assert.Fail(string.Format("Testcase: {0}. Unexpected inequality between outer and inner token properties: '{1}'", testId, ex.ToString()));
}
}
@@ -419,7 +419,7 @@ private void RunConstructionTest(JwtSecurityTokenTestVariation variation)
}
catch (Exception ex)
{
- Assert.True(false, string.Format("Testcase: {0}. UnExpected when getting a properties: '{1}'", variation.Name, ex.ToString()));
+ Assert.Fail(string.Format("Testcase: {0}. UnExpected when getting a properties: '{1}'", variation.Name, ex.ToString()));
}
}