diff --git a/Directory.Packages.props b/Directory.Packages.props index b02d0c4f0..3ea8c9ffd 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,7 +4,6 @@ - diff --git a/tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj b/tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj index 48bc1c094..e72522b2b 100644 --- a/tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj +++ b/tests/KubernetesClient.Tests/KubernetesClient.Tests.csproj @@ -7,7 +7,6 @@ - diff --git a/tests/KubernetesClient.Tests/OidcAuthTests.cs b/tests/KubernetesClient.Tests/OidcAuthTests.cs index c05a52f10..b8f65c041 100644 --- a/tests/KubernetesClient.Tests/OidcAuthTests.cs +++ b/tests/KubernetesClient.Tests/OidcAuthTests.cs @@ -1,4 +1,3 @@ -using FluentAssertions; using k8s.Authentication; using k8s.Exceptions; using System; @@ -27,16 +26,16 @@ public async Task TestOidcAuth() // use unexpired id token as bearer, do not attempt to refresh var auth = new OidcTokenProvider(clientId, clientSecret, idpIssuerUrl, unexpiredIdToken, refreshToken); var result = await auth.GetAuthenticationHeaderAsync(CancellationToken.None).ConfigureAwait(true); - result.Scheme.Should().Be("Bearer"); - result.Parameter.Should().Be(unexpiredIdToken); + Assert.Equal("Bearer", result.Scheme); + Assert.Equal(unexpiredIdToken, result.Parameter); try { // attempt to refresh id token when expired auth = new OidcTokenProvider(clientId, clientSecret, idpIssuerUrl, expiredIdToken, refreshToken); result = await auth.GetAuthenticationHeaderAsync(CancellationToken.None).ConfigureAwait(true); - result.Scheme.Should().Be("Bearer"); - result.Parameter.Should().Be(expiredIdToken); + Assert.Equal("Bearer", result.Scheme); + Assert.Equal(expiredIdToken, result.Parameter); Assert.Fail("should not be here"); } catch (KubernetesClientException e) @@ -49,8 +48,8 @@ public async Task TestOidcAuth() // attempt to refresh id token when null auth = new OidcTokenProvider(clientId, clientSecret, idpIssuerUrl, null, refreshToken); result = await auth.GetAuthenticationHeaderAsync(CancellationToken.None).ConfigureAwait(true); - result.Scheme.Should().Be("Bearer"); - result.Parameter.Should().Be(expiredIdToken); + Assert.Equal("Bearer", result.Scheme); + Assert.Equal(expiredIdToken, result.Parameter); Assert.Fail("should not be here"); } catch (KubernetesClientException e) @@ -89,23 +88,23 @@ public async Task TestOidcAuthWithWireMock() var result = await auth.GetAuthenticationHeaderAsync(CancellationToken.None); // Assert - result.Scheme.Should().Be("Bearer"); - result.Parameter.Should().Be(newIdToken); + Assert.Equal("Bearer", result.Scheme); + Assert.Equal(newIdToken, result.Parameter); // Verify that the expiry is set correctly var expectedExpiry = DateTimeOffset.UtcNow.AddSeconds(expiresIn); var actualExpiry = typeof(OidcTokenProvider) .GetField("_expiry", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance) ?.GetValue(auth) as DateTimeOffset?; - actualExpiry.Should().NotBeNull(); - actualExpiry.Value.Should().BeCloseTo(expectedExpiry, precision: TimeSpan.FromSeconds(5)); + Assert.NotNull(actualExpiry); + Assert.Equal(expectedExpiry, actualExpiry.Value, TimeSpan.FromSeconds(5)); // Verify that the refresh token is set correctly var actualRefreshToken = typeof(OidcTokenProvider) .GetField("_refreshToken", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance) ?.GetValue(auth) as string; - actualRefreshToken.Should().NotBeNull(); - actualRefreshToken.Should().Be(refreshToken); + Assert.NotNull(actualRefreshToken); + Assert.Equal(refreshToken, actualRefreshToken); // Stop the server server.Stop(); @@ -134,8 +133,8 @@ public async Task TestOidcAuthWithServerError() // Act & Assert var exception = await Assert.ThrowsAsync( () => auth.GetAuthenticationHeaderAsync(CancellationToken.None)); - exception.Message.Should().StartWith("Unable to refresh OIDC token."); - exception.InnerException.Message.Should().Contain("500"); + Assert.StartsWith("Unable to refresh OIDC token.", exception.Message); + Assert.Contains("500", exception.InnerException.Message); // Stop the server server.Stop(); diff --git a/tests/KubernetesClient.Tests/TokenFileAuthTests.cs b/tests/KubernetesClient.Tests/TokenFileAuthTests.cs index 5824917db..d36855373 100644 --- a/tests/KubernetesClient.Tests/TokenFileAuthTests.cs +++ b/tests/KubernetesClient.Tests/TokenFileAuthTests.cs @@ -1,4 +1,3 @@ -using FluentAssertions; using k8s.Authentication; using System; using System.Threading; @@ -14,18 +13,18 @@ public async Task TestToken() { var auth = new TokenFileAuth("assets/token1"); var result = await auth.GetAuthenticationHeaderAsync(CancellationToken.None).ConfigureAwait(true); - result.Scheme.Should().Be("Bearer"); - result.Parameter.Should().Be("token1"); + Assert.Equal("Bearer", result.Scheme); + Assert.Equal("token1", result.Parameter); auth.TokenFile = "assets/token2"; result = await auth.GetAuthenticationHeaderAsync(CancellationToken.None).ConfigureAwait(true); - result.Scheme.Should().Be("Bearer"); - result.Parameter.Should().Be("token1"); + Assert.Equal("Bearer", result.Scheme); + Assert.Equal("token1", result.Parameter); auth.TokenExpiresAt = DateTime.UtcNow.AddSeconds(-1); result = await auth.GetAuthenticationHeaderAsync(CancellationToken.None).ConfigureAwait(true); - result.Scheme.Should().Be("Bearer"); - result.Parameter.Should().Be("token2"); + Assert.Equal("Bearer", result.Scheme); + Assert.Equal("token2", result.Parameter); } } }