Skip to content

Restore PopKeyResolvingTests.GetPopKeysFromJkuAsync #2947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kllysng merged 2 commits into from
Oct 29, 2024
Merged

Restore PopKeyResolvingTests.GetPopKeysFromJkuAsync #2947

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
418bc45
restore GetPopKeysFromJkuAsync
kllysng Oct 28, 2024
865c989
instantiate theory datas w/ testId via ctor
kllysng Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 19 additions & 29 deletions test/Microsoft.IdentityModel.Protocols.SignedHttpRequest.Tests/PopKeyResolvingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@ public static TheoryData<ResolvePopKeyTheoryData> ResolvePopKeyFromJkuKidTheoryD
}
}

[Theory(Skip = "flaky"), MemberData(nameof(GetPopKeysFromJkuAsyncTheoryData), DisableDiscoveryEnumeration = true)]
[Theory, MemberData(nameof(GetPopKeysFromJkuAsyncTheoryData), DisableDiscoveryEnumeration = true)]
public async Task GetPopKeysFromJkuAsync(ResolvePopKeyTheoryData theoryData)
{
var context = TestUtilities.WriteHeader($"{this}.GetPopKeysFromJkuAsync", theoryData);
Expand Down Expand Up @@ -771,36 +771,32 @@ public static TheoryData<ResolvePopKeyTheoryData> GetPopKeysFromJkuAsyncTheoryDa
{
return new TheoryData<ResolvePopKeyTheoryData>
{
new ResolvePopKeyTheoryData
new ResolvePopKeyTheoryData("InvalidJkuUrlNull")
{
First = true,
JkuSetUrl = null,
ExpectedException = ExpectedException.ArgumentNullException(),
TestId = "InvalidJkuUrlNull",
},
new ResolvePopKeyTheoryData
new ResolvePopKeyTheoryData("InvalidJkuUrlEmptyString")
{
JkuSetUrl = string.Empty,
ExpectedException = ExpectedException.ArgumentNullException(),
TestId = "InvalidJkuUrlEmptyString",
},
new ResolvePopKeyTheoryData
new ResolvePopKeyTheoryData("InvalidHttpsRequired")
{
JkuSetUrl = "http://www.contoso.com",
ExpectedException = new ExpectedException(typeof(SignedHttpRequestInvalidPopKeyException), "IDX23006"),
TestId = "InvalidHttpsRequired",
},
new ResolvePopKeyTheoryData
new ResolvePopKeyTheoryData("InvalidNoContentReturned")
{
JkuSetUrl = "https://www.contoso.com",
SignedHttpRequestValidationParameters = new SignedHttpRequestValidationParameters()
{
HttpClientProvider = () => HttpResponseMessageUtils.SetupHttpClientThatReturns(string.Empty),
},
ExpectedException = new ExpectedException(typeof(SignedHttpRequestInvalidPopKeyException), "IDX23022", null, true),
TestId = "InvalidNoContentReturned",
},
new ResolvePopKeyTheoryData
new ResolvePopKeyTheoryData("InvalidHttpNoContentReturned")
{
JkuSetUrl = "http://www.contoso.com",
SignedHttpRequestValidationParameters = new SignedHttpRequestValidationParameters()
Expand All @@ -809,48 +805,42 @@ public static TheoryData<ResolvePopKeyTheoryData> GetPopKeysFromJkuAsyncTheoryDa
HttpClientProvider = () => HttpResponseMessageUtils.SetupHttpClientThatReturns(string.Empty),
},
ExpectedException = new ExpectedException(typeof(SignedHttpRequestInvalidPopKeyException), "IDX23022", null, true),
TestId = "InvalidHttpNoContentReturned",
},
// TODO - find out why test is timing out in the AzureDevOps build, appears to be unrelated to the caching changes
//new ResolvePopKeyTheoryData
//{
// JkuSetUrl = "http://www.contoso.com",
// SignedHttpRequestValidationParameters = new SignedHttpRequestValidationParameters()
// {
// RequireHttpsForJkuResourceRetrieval = false,
// },
// ExpectedException = new ExpectedException(typeof(SignedHttpRequestInvalidPopKeyException), "IDX23022", typeof(ArgumentException)),
// TestId = "Valid0KeysReturnedLive",
//},
new ResolvePopKeyTheoryData
},
new ResolvePopKeyTheoryData("Valid0KeysReturnedLive")
{
JkuSetUrl = "http://www.contoso.com",
SignedHttpRequestValidationParameters = new SignedHttpRequestValidationParameters()
{
RequireHttpsForJkuResourceRetrieval = false,
},
ExpectedException = new ExpectedException(typeof(SignedHttpRequestInvalidPopKeyException), "IDX23022", typeof(ArgumentException)),
},
new ResolvePopKeyTheoryData("Valid0KeysReturned")
{
JkuSetUrl = "https://www.contoso.com",
SignedHttpRequestValidationParameters = new SignedHttpRequestValidationParameters()
{
HttpClientProvider = () => HttpResponseMessageUtils.SetupHttpClientThatReturns("{\"test\": 1}"),
},
ExpectedNumberOfPopKeysReturned = 0,
TestId = "Valid0KeysReturned",
},
new ResolvePopKeyTheoryData
new ResolvePopKeyTheoryData("Valid2KeysReturned")
{
JkuSetUrl = "https://www.contoso.com",
SignedHttpRequestValidationParameters = new SignedHttpRequestValidationParameters()
{
HttpClientProvider = () => HttpResponseMessageUtils.SetupHttpClientThatReturns(DataSets.JsonWebKeySetString1),
},
ExpectedNumberOfPopKeysReturned = 2,
TestId = "Valid2KeysReturned",
},
new ResolvePopKeyTheoryData
new ResolvePopKeyTheoryData("Valid3KeysReturned")
{
JkuSetUrl = "https://www.contoso.com",
SignedHttpRequestValidationParameters = new SignedHttpRequestValidationParameters()
{
HttpClientProvider = () => HttpResponseMessageUtils.SetupHttpClientThatReturns(DataSets.JsonWebKeySetECCString),
},
ExpectedNumberOfPopKeysReturned = 3,
TestId = "Valid3KeysReturned",
},
};
}
Expand Down