| 1234567891011121314151617181920212223242526272829303132333435363738394041 |
- commit 5d5438a7f0842019e852b2bb911ed86dc0360cf7
- Author: Chris Ross (ASP.NET) <[email protected]>
- Date: Thu Oct 11 15:27:24 2018 -0700
- Relax test SkuTelemetry strictness #1875
- diff --git a/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/TestSettings.cs b/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/TestSettings.cs
- index b32e0723f37..eb045b43812 100644
- --- a/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/TestSettings.cs
- +++ b/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/TestSettings.cs
- @@ -195,7 +195,7 @@ namespace Microsoft.AspNetCore.Authentication.Test.OpenIdConnect
- ValidateState(actualValues, errors, htmlEncoded);
- break;
- case OpenIdConnectParameterNames.SkuTelemetry:
- - ValidateSkuTelemetry(actualValues, errors, htmlEncoded);
- + ValidateSkuTelemetry(actualValues, errors);
- break;
- case OpenIdConnectParameterNames.VersionTelemetry:
- ValidateVersionTelemetry(actualValues, errors, htmlEncoded);
- @@ -258,14 +258,13 @@ namespace Microsoft.AspNetCore.Authentication.Test.OpenIdConnect
- private void ValidateState(IDictionary<string, string> actualParams, ICollection<string> errors, bool htmlEncoded) =>
- ValidateParameter(OpenIdConnectParameterNames.State, ExpectedState, actualParams, errors, htmlEncoded);
-
- - private void ValidateSkuTelemetry(IDictionary<string, string> actualParams, ICollection<string> errors, bool htmlEncoded) =>
- -#if NETCOREAPP2_2
- - ValidateParameter(OpenIdConnectParameterNames.SkuTelemetry, "ID_NETSTANDARD1_4", actualParams, errors, htmlEncoded);
- -#elif NET461
- - ValidateParameter(OpenIdConnectParameterNames.SkuTelemetry, "ID_NET451", actualParams, errors, htmlEncoded);
- -#else
- -#error Invalid target framework.
- -#endif
- + private static void ValidateSkuTelemetry(IDictionary<string, string> actualParams, ICollection<string> errors)
- + {
- + if (!actualParams.ContainsKey(OpenIdConnectParameterNames.SkuTelemetry))
- + {
- + errors.Add($"Parameter {OpenIdConnectParameterNames.SkuTelemetry} is missing");
- + }
- + }
-
- private void ValidateVersionTelemetry(IDictionary<string, string> actualParams, ICollection<string> errors, bool htmlEncoded) =>
- ValidateParameter(OpenIdConnectParameterNames.VersionTelemetry, typeof(OpenIdConnectMessage).GetTypeInfo().Assembly.GetName().Version.ToString(), actualParams, errors, htmlEncoded);
|