From 779a8524e4b9f455c4ac55db379237f0a21b9ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Chalet?= Date: Mon, 7 Nov 2022 22:32:06 +0100 Subject: [PATCH] Fix global.json to reference Arcade 7.0.0-beta.22513.4 --- global.json | 4 +-- .../Primitives/OpenIddictConverterTests.cs | 2 +- .../Primitives/OpenIddictMessageTests.cs | 2 +- .../Primitives/OpenIddictParameterTests.cs | 34 ++++++++++++++----- ...nIddictServerAspNetCoreIntegrationTests.cs | 10 +++--- ...nIddictServerIntegrationTests.Discovery.cs | 25 ++++++++++---- .../OpenIddictServerIntegrationTests.cs | 2 +- 7 files changed, 54 insertions(+), 25 deletions(-) diff --git a/global.json b/global.json index bc4165e4..dc508b53 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21519.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21519.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22513.4", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22513.4" } } diff --git a/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictConverterTests.cs b/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictConverterTests.cs index 6d7e1372..056a96e7 100644 --- a/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictConverterTests.cs +++ b/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictConverterTests.cs @@ -155,7 +155,7 @@ public class OpenIddictConverterTests Assert.NotNull(message.GetParameter("string")); Assert.NotNull(message.GetParameter("array")); Assert.NotNull(message.GetParameter("object")); - Assert.Empty((string?) message.GetParameter("string")); + Assert.Empty(((string?) message.GetParameter("string"))!); Assert.NotNull((JsonElement?) message.GetParameter("array")); Assert.NotNull((JsonElement?) message.GetParameter("object")); diff --git a/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictMessageTests.cs b/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictMessageTests.cs index e0aea9cd..f5d5048d 100644 --- a/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictMessageTests.cs +++ b/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictMessageTests.cs @@ -196,7 +196,7 @@ public class OpenIddictMessageTests #endif // Assert - Assert.Empty((string?) message.GetParameter("string")); + Assert.Empty(((string?) message.GetParameter("string"))!); Assert.NotNull((JsonElement?) message.GetParameter("array")); Assert.NotNull((JsonElement?) message.GetParameter("object")); Assert.NotNull((JsonElement?) message.GetParameter("value")); diff --git a/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictParameterTests.cs b/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictParameterTests.cs index b31d6ddc..40360453 100644 --- a/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictParameterTests.cs +++ b/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictParameterTests.cs @@ -1148,8 +1148,12 @@ public class OpenIddictParameterTests // Arrange var parameter = new OpenIddictParameter(); - // Act and assert - Assert.Empty(parameter.ToString()); + // Act + var result = parameter.ToString(); + + // Assert + Assert.NotNull(result); + Assert.Empty(result); } [Fact] @@ -1212,8 +1216,12 @@ public class OpenIddictParameterTests var parameter = new OpenIddictParameter( JsonSerializer.Deserialize(@"{""field"":null}").GetProperty("field")); - // Act and assert - Assert.Empty(parameter.ToString()); + // Act + var result = parameter.ToString(); + + // Assert + Assert.NotNull(result); + Assert.Empty(result); } [Fact] @@ -1222,8 +1230,12 @@ public class OpenIddictParameterTests // Arrange var parameter = new OpenIddictParameter(default(JsonElement)); - // Act and assert - Assert.Empty(parameter.ToString()); + // Act + var result = parameter.ToString(); + + // Assert + Assert.NotNull(result); + Assert.Empty(result); } #if SUPPORTS_JSON_NODES @@ -1233,8 +1245,12 @@ public class OpenIddictParameterTests // Arrange var parameter = new OpenIddictParameter((JsonNode?) null); - // Act and assert - Assert.Empty(parameter.ToString()); + // Act + var result = parameter.ToString(); + + // Assert + Assert.NotNull(result); + Assert.Empty(result); } #endif @@ -1699,7 +1715,7 @@ public class OpenIddictParameterTests Assert.Equal(42L, ((JsonElement) new OpenIddictParameter(42)).GetInt64()); Assert.Equal(JsonValueKind.String, ((JsonElement) new OpenIddictParameter(string.Empty)).ValueKind); - Assert.Empty(((JsonElement) new OpenIddictParameter(string.Empty)).GetString()); + Assert.Empty(((JsonElement) new OpenIddictParameter(string.Empty)).GetString()!); Assert.Equal(JsonValueKind.String, ((JsonElement) new OpenIddictParameter("value")).ValueKind); Assert.Equal("value", ((JsonElement) new OpenIddictParameter("value")).GetString()); diff --git a/test/OpenIddict.Server.AspNetCore.IntegrationTests/OpenIddictServerAspNetCoreIntegrationTests.cs b/test/OpenIddict.Server.AspNetCore.IntegrationTests/OpenIddictServerAspNetCoreIntegrationTests.cs index 27c9f641..e5b53aec 100644 --- a/test/OpenIddict.Server.AspNetCore.IntegrationTests/OpenIddictServerAspNetCoreIntegrationTests.cs +++ b/test/OpenIddict.Server.AspNetCore.IntegrationTests/OpenIddictServerAspNetCoreIntegrationTests.cs @@ -173,9 +173,9 @@ public partial class OpenIddictServerAspNetCoreIntegrationTests : OpenIddictServ }); // Assert - Assert.NotEmpty(response.Error); - Assert.NotEmpty(response.ErrorDescription); - Assert.NotEmpty(response.ErrorUri); + Assert.NotNull(response.Error); + Assert.NotNull(response.ErrorDescription); + Assert.NotNull(response.ErrorUri); } [Fact] @@ -813,7 +813,7 @@ public partial class OpenIddictServerAspNetCoreIntegrationTests : OpenIddictServ }); // Assert - Assert.NotEmpty(response.AccessToken); + Assert.NotNull(response.AccessToken); } [Fact] @@ -900,7 +900,7 @@ public partial class OpenIddictServerAspNetCoreIntegrationTests : OpenIddictServ }); // Assert - Assert.NotEmpty(response.State); + Assert.NotNull(response.State); } [Fact] diff --git a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Discovery.cs b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Discovery.cs index d09162ca..4907f04c 100644 --- a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Discovery.cs +++ b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.Discovery.cs @@ -432,6 +432,7 @@ public abstract partial class OpenIddictServerIntegrationTests var methods = (string[]?) response[Metadata.TokenEndpointAuthMethodsSupported]; // Assert + Assert.NotNull(methods); Assert.Contains(ClientAuthenticationMethods.ClientSecretBasic, methods); Assert.Contains(ClientAuthenticationMethods.ClientSecretPost, methods); } @@ -466,6 +467,7 @@ public abstract partial class OpenIddictServerIntegrationTests var methods = (string[]?) response[Metadata.IntrospectionEndpointAuthMethodsSupported]; // Assert + Assert.NotNull(methods); Assert.Contains(ClientAuthenticationMethods.ClientSecretBasic, methods); Assert.Contains(ClientAuthenticationMethods.ClientSecretPost, methods); } @@ -500,6 +502,7 @@ public abstract partial class OpenIddictServerIntegrationTests var methods = (string[]?) response[Metadata.RevocationEndpointAuthMethodsSupported]; // Assert + Assert.NotNull(methods); Assert.Contains(ClientAuthenticationMethods.ClientSecretBasic, methods); Assert.Contains(ClientAuthenticationMethods.ClientSecretPost, methods); } @@ -522,7 +525,8 @@ public abstract partial class OpenIddictServerIntegrationTests var types = (string[]?) response[Metadata.GrantTypesSupported]; // Assert - Assert.Equal(2, types?.Length); + Assert.NotNull(types); + Assert.Equal(2, types.Length); Assert.Contains(GrantTypes.AuthorizationCode, types); Assert.Contains(GrantTypes.Password, types); } @@ -563,7 +567,8 @@ public abstract partial class OpenIddictServerIntegrationTests var methods = (string[]?) response[Metadata.CodeChallengeMethodsSupported]; // Assert - Assert.Equal(2, methods?.Length); + Assert.NotNull(methods); + Assert.Equal(2, methods.Length); Assert.Contains(CodeChallengeMethods.Sha256, methods); Assert.Contains(CodeChallengeMethods.Plain, methods); } @@ -604,7 +609,8 @@ public abstract partial class OpenIddictServerIntegrationTests var modes = (string[]?) response[Metadata.ResponseModesSupported]; // Assert - Assert.Equal(2, modes?.Length); + Assert.NotNull(modes); + Assert.Equal(2, modes.Length); Assert.Contains(ResponseModes.FormPost, modes); Assert.Contains(ResponseModes.Fragment, modes); } @@ -645,7 +651,8 @@ public abstract partial class OpenIddictServerIntegrationTests var types = (string[]?) response[Metadata.ResponseTypesSupported]; // Assert - Assert.Equal(2, types?.Length); + Assert.NotNull(types); + Assert.Equal(2, types.Length); Assert.Contains(ResponseTypes.Code, types); Assert.Contains(ResponseTypes.Code + ' ' + ResponseTypes.IdToken, types); } @@ -686,7 +693,8 @@ public abstract partial class OpenIddictServerIntegrationTests var scopes = (string[]?) response[Metadata.ScopesSupported]; // Assert - Assert.Equal(2, scopes?.Length); + Assert.NotNull(scopes); + Assert.Equal(2, scopes.Length); Assert.Contains(Scopes.OpenId, scopes); Assert.Contains("custom_scope", scopes); } @@ -727,7 +735,8 @@ public abstract partial class OpenIddictServerIntegrationTests var claims = (string[]?) response[Metadata.ClaimsSupported]; // Assert - Assert.Equal(2, claims?.Length); + Assert.NotNull(claims); + Assert.Equal(2, claims.Length); Assert.Contains(Claims.Profile, claims); Assert.Contains("custom_claim", claims); } @@ -744,6 +753,7 @@ public abstract partial class OpenIddictServerIntegrationTests var types = (string[]?) response[Metadata.SubjectTypesSupported]; // Assert + Assert.NotNull(types); Assert.Contains(SubjectTypes.Public, types); } @@ -774,6 +784,7 @@ public abstract partial class OpenIddictServerIntegrationTests var algorithms = (string[]?) response[Metadata.IdTokenSigningAlgValuesSupported]; // Assert + Assert.NotNull(algorithms); Assert.Contains(algorithm, algorithms); } @@ -795,6 +806,7 @@ public abstract partial class OpenIddictServerIntegrationTests var algorithms = (string[]?) response[Metadata.IdTokenSigningAlgValuesSupported]; // Assert + Assert.NotNull(algorithms); Assert.Single(algorithms); Assert.Contains(Algorithms.RsaSha256, algorithms); } @@ -820,6 +832,7 @@ public abstract partial class OpenIddictServerIntegrationTests var algorithms = (string[]?) response[Metadata.IdTokenSigningAlgValuesSupported]; // Assert + Assert.NotNull(algorithms); Assert.Single(algorithms); } diff --git a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.cs b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.cs index 127e9c62..ecbc1bec 100644 --- a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.cs +++ b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTests.cs @@ -1758,7 +1758,7 @@ public abstract partial class OpenIddictServerIntegrationTests { builder.UseInlineHandler(context => { - Assert.Equal(new[] { Scopes.Profile }, context.AccessTokenPrincipal?.GetScopes()); + Assert.Equal(new[] { Scopes.Profile }, context.AccessTokenPrincipal!.GetScopes()); return default; });