Update tests

Author: leastprivilege

test/IdentityModel.OidcClient.Tests/CodeFlowResponseTests.cs

@@ -252,7 +252,7 @@ public async Task malformed_identity_token_on_token_response_should_fail()
             var result = await client.ProcessResponseAsync(url, state);
 
             result.IsError.Should().BeTrue();
-            result.Error.Should().StartWith("Error validating token response: Error validating identity token: System.ArgumentException: IDX10709: JWT is not well formed");
+            result.Error.Should().Contain("IDX12709: JWT is not well formed");
         }
 
         [Fact]
@@ -299,7 +299,7 @@ public async Task untrusted_identity_token_should_fail()
             var result = await client.ProcessResponseAsync(url, state);
 
             result.IsError.Should().BeTrue();
-            result.Error.Should().StartWith("Error validating token response: Error validating identity token: Microsoft.IdentityModel.Tokens.SecurityTokenSignatureKeyNotFoundException: IDX10501: Signature validation failed. Unable to match 'kid'");
+            result.Error.Should().Contain("IDX10501: Signature validation failed");
         }
 
         [Theory]

test/IdentityModel.OidcClient.Tests/ConfigurationTests.cs

@@ -21,7 +21,7 @@ public void null_options_should_throw_exception()
 
             Action act = () => new OidcClient(options);
 
-            act.ShouldThrow<ArgumentNullException>();
+            act.Should().Throw<ArgumentNullException>();
         }
 
         [Fact]
@@ -31,7 +31,7 @@ public void no_authority_and_no_static_config_should_throw_exception()
 
             Action act = () => new OidcClient(options);
 
-            act.ShouldThrow<ArgumentException>().Where(e => e.Message.StartsWith("No authority specified"));
+            act.Should().Throw<ArgumentException>().Where(e => e.Message.StartsWith("No authority specified"));
         }
 
         [Fact]
@@ -52,7 +52,7 @@ public void providing_required_provider_information_should_not_throw()
 
             Func<Task> act = async () => { await client.EnsureProviderInformationAsync(); };
 
-            act.ShouldNotThrow();
+            act.Should().NotThrow();
         }
 
         [Fact]
@@ -73,7 +73,7 @@ public void missing_issuer_should_throw()
 
             Func<Task> act = async () => { await client.EnsureProviderInformationAsync(); };
 
-            act.ShouldThrow<InvalidOperationException>().Where(e => e.Message.Equals("Issuer name is missing in provider information"));
+            act.Should().Throw<InvalidOperationException>().Where(e => e.Message.Equals("Issuer name is missing in provider information"));
         }
 
         [Fact]
@@ -94,7 +94,7 @@ public void missing_authorize_endpoint_should_throw()
 
             Func<Task> act = async () => { await client.EnsureProviderInformationAsync(); };
 
-            act.ShouldThrow<InvalidOperationException>().Where(e => e.Message.Equals("Authorize endpoint is missing in provider information"));
+            act.Should().Throw<InvalidOperationException>().Where(e => e.Message.Equals("Authorize endpoint is missing in provider information"));
         }
 
         [Fact]
@@ -115,7 +115,7 @@ public void missing_token_endpoint_should_throw()
 
             Func<Task> act = async () => { await client.EnsureProviderInformationAsync(); };
 
-            act.ShouldThrow<InvalidOperationException>().Where(e => e.Message.Equals("Token endpoint is missing in provider information"));
+            act.Should().Throw<InvalidOperationException>().Where(e => e.Message.Equals("Token endpoint is missing in provider information"));
         }
 
         [Fact]
@@ -136,7 +136,7 @@ public void missing_keyset_should_throw()
 
             Func<Task> act = async () => { await client.EnsureProviderInformationAsync(); };
 
-            act.ShouldThrow<InvalidOperationException>().Where(e => e.Message.Equals("Key set is missing in provider information"));
+            act.Should().Throw<InvalidOperationException>().Where(e => e.Message.Equals("Key set is missing in provider information"));
         }
 
         [Fact]
@@ -153,7 +153,7 @@ public void exception_while_loading_discovery_document_should_throw()
 
             Func<Task> act = async () => { await client.EnsureProviderInformationAsync(); };
 
-            act.ShouldThrow<InvalidOperationException>().Where(e => e.Message.Equals("Error loading discovery document: Error connecting to https://authority/.well-known/openid-configuration: error"));
+            act.Should().Throw<InvalidOperationException>().Where(e => e.Message.Equals("Error loading discovery document: Error connecting to https://authority/.well-known/openid-configuration: error"));
         }
 
         [Fact]
@@ -170,7 +170,7 @@ public void error401_while_loading_discovery_document_should_throw()
 
             Func<Task> act = async () => { await client.EnsureProviderInformationAsync(); };
 
-            act.ShouldThrow<InvalidOperationException>().Where(e => e.Message.Equals("Error loading discovery document: Error connecting to https://authority/.well-known/openid-configuration: not found"));
+            act.Should().Throw<InvalidOperationException>().Where(e => e.Message.Equals("Error loading discovery document: Error connecting to https://authority/.well-known/openid-configuration: not found"));
         }
     }
 }

test/IdentityModel.OidcClient.Tests/IdentityModel.OidcClient.Tests.csproj

@@ -9,10 +9,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
     <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="FluentAssertions" Version="4.19.4" />
+    <PackageReference Include="FluentAssertions" Version="5.1.2" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">