huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Relax test SkuTelemetry strictness #1875

This commit is contained in:
Chris Ross (ASP.NET) 2018-10-11 15:27:24 -07:00
parent fcfa161cb7
commit 5d5438a7f0
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/TestSettings.cs
View File

@ -195,7 +195,7 @@ namespace Microsoft.AspNetCore.Authentication.Test.OpenIdConnect
ValidateState(actualValues, errors, htmlEncoded); ValidateState(actualValues, errors, htmlEncoded);
break; break;
case OpenIdConnectParameterNames.SkuTelemetry: case OpenIdConnectParameterNames.SkuTelemetry:
ValidateSkuTelemetry(actualValues, errors, htmlEncoded); ValidateSkuTelemetry(actualValues, errors);
break; break;
case OpenIdConnectParameterNames.VersionTelemetry: case OpenIdConnectParameterNames.VersionTelemetry:
ValidateVersionTelemetry(actualValues, errors, htmlEncoded); 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) => private void ValidateState(IDictionary<string, string> actualParams, ICollection<string> errors, bool htmlEncoded) =>
ValidateParameter(OpenIdConnectParameterNames.State, ExpectedState, actualParams, errors, htmlEncoded); ValidateParameter(OpenIdConnectParameterNames.State, ExpectedState, actualParams, errors, htmlEncoded);
private void ValidateSkuTelemetry(IDictionary<string, string> actualParams, ICollection<string> errors, bool htmlEncoded) => private static void ValidateSkuTelemetry(IDictionary<string, string> actualParams, ICollection<string> errors)
#if NETCOREAPP2_2 {
ValidateParameter(OpenIdConnectParameterNames.SkuTelemetry, "ID_NETSTANDARD1_4", actualParams, errors, htmlEncoded); if (!actualParams.ContainsKey(OpenIdConnectParameterNames.SkuTelemetry))
#elif NET461 {
ValidateParameter(OpenIdConnectParameterNames.SkuTelemetry, "ID_NET451", actualParams, errors, htmlEncoded); errors.Add($"Parameter {OpenIdConnectParameterNames.SkuTelemetry} is missing");
#else }
#error Invalid target framework. }
#endif
private void ValidateVersionTelemetry(IDictionary<string, string> actualParams, ICollection<string> errors, bool htmlEncoded) => 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); ValidateParameter(OpenIdConnectParameterNames.VersionTelemetry, typeof(OpenIdConnectMessage).GetTypeInfo().Assembly.GetName().Version.ToString(), actualParams, errors, htmlEncoded);