Skip to content

Commit b16f758

Browse files
author
Brent Schmaltz
committed
Merged PR 10217: Disable test that set statics.
Disable test that set statics. ---- #### AI-Generated Description The pull request modifies two test files related to compression algorithms for JSON web tokens. The main changes are: - Commenting out the lines that set the `CompressionProviderFactory.Default` property, as it is a static field that affects other tests and needs to be replaced by a different model. - Adding a link to a work item that tracks the replacement of the compression model. - Skipping some test cases that rely on custom or null compression providers, as they are not compatible with the current model. - Removing some redundant test cases that are already covered by other scenarios.
1 parent ceeff41 commit b16f758

File tree

2 files changed

+70
-57
lines changed

2 files changed

+70
-57
lines changed

‎test/Microsoft.IdentityModel.JsonWebTokens.Tests/JsonWebTokenHandlerTests.cs

Lines changed: 41 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3446,7 +3446,9 @@ public void JWECompressionTest(CreateTokenTheoryData theoryData)
34463446
try
34473447
{
34483448
var handler = new JsonWebTokenHandler();
3449-
CompressionProviderFactory.Default = theoryData.CompressionProviderFactory;
3449+
// We need to have a replacement model for custom compression
3450+
// https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2719954
3451+
//CompressionProviderFactory.Default = theoryData.CompressionProviderFactory;
34503452
string jwtToken;
34513453
if (theoryData.SigningCredentials == null)
34523454
jwtToken = handler.CreateToken(theoryData.Payload, theoryData.EncryptingCredentials, theoryData.CompressionAlgorithm);
@@ -3524,17 +3526,20 @@ public static TheoryData<CreateTokenTheoryData> JWECompressionTheoryData
35243526
EncryptingCredentials = new EncryptingCredentials(KeyingMaterial.DefaultX509Key_2048, SecurityAlgorithms.RsaPKCS1, SecurityAlgorithms.Aes128CbcHmacSha256),
35253527
ExpectedException = new ExpectedException(typeof(SecurityTokenCompressionFailedException), "IDX10680:", typeof(NotSupportedException))
35263528
},
3527-
new CreateTokenTheoryData()
3528-
{
3529-
TestId = "NullCompressionProviderFactory",
3530-
CompressionAlgorithm = CompressionAlgorithms.Deflate,
3531-
CompressionProviderFactory = null,
3532-
ValidationParameters = Default.JWECompressionTokenValidationParameters,
3533-
Payload = Default.PayloadString,
3534-
SigningCredentials = KeyingMaterial.DefaultSymmetricSigningCreds_256_Sha2,
3535-
EncryptingCredentials = new EncryptingCredentials(KeyingMaterial.DefaultX509Key_2048, SecurityAlgorithms.RsaPKCS1, SecurityAlgorithms.Aes128CbcHmacSha256),
3536-
ExpectedException = ExpectedException.ArgumentNullException("IDX10000:")
3537-
},
3529+
// Skip these tests as they set a static
3530+
// We need to have a replacement model for custom compression
3531+
// https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2719954
3532+
//new CreateTokenTheoryData()
3533+
//{
3534+
// TestId = "NullCompressionProviderFactory",
3535+
// CompressionAlgorithm = CompressionAlgorithms.Deflate,
3536+
// CompressionProviderFactory = null,
3537+
// ValidationParameters = Default.JWECompressionTokenValidationParameters,
3538+
// Payload = Default.PayloadString,
3539+
// SigningCredentials = KeyingMaterial.DefaultSymmetricSigningCreds_256_Sha2,
3540+
// EncryptingCredentials = new EncryptingCredentials(KeyingMaterial.DefaultX509Key_2048, SecurityAlgorithms.RsaPKCS1, SecurityAlgorithms.Aes128CbcHmacSha256),
3541+
// ExpectedException = ExpectedException.ArgumentNullException("IDX10000:")
3542+
//},
35383543
new CreateTokenTheoryData()
35393544
{
35403545
TestId = "NullSigningCredentialsRequireSignedTokensFalse",
@@ -3554,27 +3559,30 @@ public static TheoryData<CreateTokenTheoryData> JWECompressionTheoryData
35543559
EncryptingCredentials = new EncryptingCredentials(KeyingMaterial.DefaultX509Key_2048, SecurityAlgorithms.RsaPKCS1, SecurityAlgorithms.Aes128CbcHmacSha256),
35553560
ExpectedException = ExpectedException.SecurityTokenInvalidSignatureException("IDX10504:")
35563561
},
3557-
new CreateTokenTheoryData()
3558-
{
3559-
TestId = "CustomCompressProviderSucceeds",
3560-
CompressionAlgorithm = CompressionAlgorithms.Deflate,
3561-
CompressionProviderFactory = compressionProviderFactoryForCustom,
3562-
ValidationParameters = Default.JWECompressionTokenValidationParameters,
3563-
Payload = Default.PayloadString,
3564-
SigningCredentials = KeyingMaterial.DefaultSymmetricSigningCreds_256_Sha2,
3565-
EncryptingCredentials = new EncryptingCredentials(KeyingMaterial.DefaultX509Key_2048, SecurityAlgorithms.RsaPKCS1, SecurityAlgorithms.Aes128CbcHmacSha256),
3566-
},
3567-
new CreateTokenTheoryData()
3568-
{
3569-
TestId = "CustomCompressionProviderFails",
3570-
CompressionAlgorithm = CompressionAlgorithms.Deflate,
3571-
CompressionProviderFactory = compressionProviderFactoryForCustom2,
3572-
ValidationParameters = Default.JWECompressionTokenValidationParameters,
3573-
Payload = Default.PayloadString,
3574-
SigningCredentials = KeyingMaterial.DefaultSymmetricSigningCreds_256_Sha2,
3575-
EncryptingCredentials = new EncryptingCredentials(KeyingMaterial.DefaultX509Key_2048, SecurityAlgorithms.RsaPKCS1, SecurityAlgorithms.Aes128CbcHmacSha256),
3576-
ExpectedException = new ExpectedException(typeof(SecurityTokenCompressionFailedException), "IDX10680:", typeof(InvalidOperationException))
3577-
},
3562+
// Skip these tests as they set a static
3563+
// We need to have a replacement model for custom compression
3564+
// https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2719954
3565+
//new CreateTokenTheoryData()
3566+
//{
3567+
// TestId = "CustomCompressProviderSucceeds",
3568+
// CompressionAlgorithm = CompressionAlgorithms.Deflate,
3569+
// CompressionProviderFactory = compressionProviderFactoryForCustom,
3570+
// ValidationParameters = Default.JWECompressionTokenValidationParameters,
3571+
// Payload = Default.PayloadString,
3572+
// SigningCredentials = KeyingMaterial.DefaultSymmetricSigningCreds_256_Sha2,
3573+
// EncryptingCredentials = new EncryptingCredentials(KeyingMaterial.DefaultX509Key_2048, SecurityAlgorithms.RsaPKCS1, SecurityAlgorithms.Aes128CbcHmacSha256),
3574+
//},
3575+
//new CreateTokenTheoryData()
3576+
//{
3577+
// TestId = "CustomCompressionProviderFails",
3578+
// CompressionAlgorithm = CompressionAlgorithms.Deflate,
3579+
// CompressionProviderFactory = compressionProviderFactoryForCustom2,
3580+
// ValidationParameters = Default.JWECompressionTokenValidationParameters,
3581+
// Payload = Default.PayloadString,
3582+
// SigningCredentials = KeyingMaterial.DefaultSymmetricSigningCreds_256_Sha2,
3583+
// EncryptingCredentials = new EncryptingCredentials(KeyingMaterial.DefaultX509Key_2048, SecurityAlgorithms.RsaPKCS1, SecurityAlgorithms.Aes128CbcHmacSha256),
3584+
// ExpectedException = new ExpectedException(typeof(SecurityTokenCompressionFailedException), "IDX10680:", typeof(InvalidOperationException))
3585+
//},
35783586
};
35793587
}
35803588
}

‎test/System.IdentityModel.Tokens.Jwt.Tests/JwtSecurityTokenHandlerTests.cs

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,7 +1186,9 @@ public void JWEDecompressionTest(JWEDecompressionTheoryData theoryData)
11861186
try
11871187
{
11881188
var handler = new JwtSecurityTokenHandler();
1189-
CompressionProviderFactory.Default = theoryData.CompressionProviderFactory;
1189+
// We need to have a replacement model for custom compression
1190+
// https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2719954
1191+
//CompressionProviderFactory.Default = theoryData.CompressionProviderFactory;
11901192
var claimsPrincipal = handler.ValidateToken(theoryData.JWECompressionString, theoryData.ValidationParameters, out var validatedToken);
11911193

11921194
if (!claimsPrincipal.Claims.Any())
@@ -1238,29 +1240,32 @@ public static TheoryData<JWEDecompressionTheoryData> JWEDecompressionTheoryData(
12381240
TestId = "InvalidToken",
12391241
ExpectedException = new ExpectedException(typeof(SecurityTokenDecompressionFailedException), "IDX10679:", typeof(InvalidDataException))
12401242
},
1241-
new JWEDecompressionTheoryData
1242-
{
1243-
ValidationParameters = Default.JWECompressionTokenValidationParameters,
1244-
JWECompressionString = ReferenceTokens.JWECompressionTokenWithDEF,
1245-
CompressionProviderFactory = null,
1246-
TestId = "NullCompressionProviderFactory",
1247-
ExpectedException = ExpectedException.ArgumentNullException("IDX10000:")
1248-
},
1249-
new JWEDecompressionTheoryData
1250-
{
1251-
ValidationParameters = Default.JWECompressionTokenValidationParameters,
1252-
CompressionProviderFactory = compressionProviderFactoryForCustom,
1253-
JWECompressionString = ReferenceTokens.JWECompressionTokenWithCustomAlgorithm,
1254-
TestId = "CustomCompressionProviderSucceeds"
1255-
},
1256-
new JWEDecompressionTheoryData
1257-
{
1258-
ValidationParameters = Default.JWECompressionTokenValidationParameters,
1259-
JWECompressionString = ReferenceTokens.JWECompressionTokenWithDEF,
1260-
CompressionProviderFactory = compressionProviderFactoryForCustom2,
1261-
TestId = "CustomCompressionProviderFails",
1262-
ExpectedException = new ExpectedException(typeof(SecurityTokenDecompressionFailedException), "IDX10679:", typeof(SecurityTokenDecompressionFailedException))
1263-
}
1243+
// Skip these tests as they set a static
1244+
// We need to have a replacement model for custom compression
1245+
// https://identitydivision.visualstudio.com/Engineering/_workitems/edit/2719954
1246+
//new JWEDecompressionTheoryData
1247+
//{
1248+
// ValidationParameters = Default.JWECompressionTokenValidationParameters,
1249+
// JWECompressionString = ReferenceTokens.JWECompressionTokenWithDEF,
1250+
// CompressionProviderFactory = null,
1251+
// TestId = "NullCompressionProviderFactory",
1252+
// ExpectedException = ExpectedException.ArgumentNullException("IDX10000:")
1253+
//},
1254+
//new JWEDecompressionTheoryData
1255+
//{
1256+
// ValidationParameters = Default.JWECompressionTokenValidationParameters,
1257+
// CompressionProviderFactory = compressionProviderFactoryForCustom,
1258+
// JWECompressionString = ReferenceTokens.JWECompressionTokenWithCustomAlgorithm,
1259+
// TestId = "CustomCompressionProviderSucceeds"
1260+
//},
1261+
//new JWEDecompressionTheoryData
1262+
//{
1263+
// ValidationParameters = Default.JWECompressionTokenValidationParameters,
1264+
// JWECompressionString = ReferenceTokens.JWECompressionTokenWithDEF,
1265+
// CompressionProviderFactory = compressionProviderFactoryForCustom2,
1266+
// TestId = "CustomCompressionProviderFails",
1267+
// ExpectedException = new ExpectedException(typeof(SecurityTokenDecompressionFailedException), "IDX10679:", typeof(SecurityTokenDecompressionFailedException))
1268+
//}
12641269
};
12651270
}
12661271

0 commit comments

Comments
 (0)