Updated NuGet packages for validation library and tests.

Mihkel Kivisild · mrts · commit c2c7a00254df · 2024-06-18T16:28:57.000+03:00
Fixed a typo in Ocsp/OcspRequestBuiderTests file name.

WE2-888

Signed-off-by: Mihkel Kivisild mihkel.kivisild@cgi.com
diff --git a/src/WebEid.Security.Tests/TestUtils/TestingExtensions.cs b/src/WebEid.Security.Tests/TestUtils/TestingExtensions.cs
@@ -1,4 +1,4 @@
-﻿/*
+/*
  * Copyright © 2020-2024 Estonian Information System Authority
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -27,17 +27,17 @@ namespace WebEid.Security.Tests.TestUtils
     internal static class TestingExtensions
     {
         public static void WithMessage(this Exception exception, string expectedMessage) =>
-            Assert.AreEqual(expectedMessage, exception.Message);
+            Assert.That(expectedMessage, Is.EqualTo(exception.Message));
 
         public static void HasMessageStartingWith(this Exception exception, string expectedMessage) =>
-            Assert.True(exception.Message.StartsWith(expectedMessage, StringComparison.InvariantCulture), $"Exception message: '{exception.Message}' does not start with: '{expectedMessage}'");
+            Assert.That(exception.Message.StartsWith(expectedMessage, StringComparison.InvariantCulture), $"Exception message: '{exception.Message}' does not start with: '{expectedMessage}'");
 
         public static void HasMessage(this Exception exception, string expectedMessage) =>
-            Assert.True(exception.Message.Contains(expectedMessage, StringComparison.InvariantCulture), $"Exception message: '{exception.Message}' does not start with: '{expectedMessage}'");
+            Assert.That(exception.Message.Contains(expectedMessage, StringComparison.InvariantCulture), $"Exception message: '{exception.Message}' does not start with: '{expectedMessage}'");
 
         public static Exception IsInstanceOf<T>(this Exception exception) where T : Exception
         {
-            Assert.True(exception.GetType() == typeof(T),
+            Assert.That(exception.GetType() == typeof(T),
                 $"Exception of type {exception.GetType()} is not equal to expected type: {typeof(T)}");
             return exception;
         }
diff --git a/src/WebEid.Security.Tests/Util/X509CertificateExtensionsTests.cs b/src/WebEid.Security.Tests/Util/X509CertificateExtensionsTests.cs
@@ -1,4 +1,4 @@
-﻿/*
+/*
  * Copyright © 2020-2024 Estonian Information System Authority
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -40,23 +40,23 @@ public void SetUp() =>
 
         [Test]
         public void GetSubjectIdCodeReturnsCorrectValue() =>
-            Assert.AreEqual("PNOEE-38001085718", this.certificate.GetSubjectIdCode());
+            Assert.That("PNOEE-38001085718", Is.EqualTo(this.certificate.GetSubjectIdCode()));
 
         [Test]
         public void GetSubjectCnReturnsCorrectValue() =>
-            Assert.AreEqual("JÕEORG,JAAK-KRISTJAN,38001085718", this.certificate.GetSubjectCn());
+            Assert.That("JÕEORG,JAAK-KRISTJAN,38001085718", Is.EqualTo(this.certificate.GetSubjectCn()));
 
         [Test]
         public void GetSubjectGivenNameReturnsCorrectValue() =>
-            Assert.AreEqual("JAAK-KRISTJAN", this.certificate.GetSubjectGivenName());
+            Assert.That("JAAK-KRISTJAN", Is.EqualTo(this.certificate.GetSubjectGivenName()));
 
         [Test]
         public void GetSubjectSurnameReturnsCorrectValue() =>
-            Assert.AreEqual("JÕEORG", this.certificate.GetSubjectSurname());
+            Assert.That("JÕEORG", Is.EqualTo(this.certificate.GetSubjectSurname()));
 
         [Test]
         public void GetSubjectCountryCodeReturnsCorrectValue() =>
-            Assert.AreEqual("EE", this.certificate.GetSubjectCountryCode());
+            Assert.That("EE", Is.EqualTo(this.certificate.GetSubjectCountryCode()));
 
         [Test]
         public void ValidateBcNotYetValidCertificateExpiryThrowsException() =>
diff --git a/src/WebEid.Security.Tests/Validator/AuthTokenValidationConfigurationTests.cs b/src/WebEid.Security.Tests/Validator/AuthTokenValidationConfigurationTests.cs
@@ -1,4 +1,4 @@
-﻿/*
+/*
  * Copyright © 2020-2024 Estonian Information System Authority
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -106,7 +106,7 @@ public void AuthTokenValidationConfigurationCopyCopiesAllData()
                 });
 
             var copyOfConfiguration = configuration.Copy();
-            Assert.AreEqual(configuration, copyOfConfiguration);
+            Assert.That(configuration, Is.EqualTo(copyOfConfiguration));
         }
     }
 }
diff --git a/src/WebEid.Security.Tests/Validator/Ocsp/OcspRequestBuilderTests.cs b/src/WebEid.Security.Tests/Validator/Ocsp/OcspRequestBuilderTests.cs
@@ -1,4 +1,4 @@
-﻿/*
+/*
  * Copyright © 2020-2024 Estonian Information System Authority
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -30,7 +30,7 @@ namespace WebEid.Security.Tests.Validator.Ocsp
     using TestUtils;
 
     [TestFixture]
-    public class OcspRequestBuiderTests
+    public class OcspRequestBuilderTests
     {
         [Test]
         public void BuildWithoutCertificateIdThrowsException() =>
@@ -46,7 +46,7 @@ public void BuildWithOcspNonceAddsNonceToRequest()
                 .WithCertificateId(certificateId)
                 .EnableOcspNonce(true).Build();
 
-            Assert.IsNotNull(request.RequestExtensions.GetExtension(OcspObjectIdentifiers.PkixOcspNonce));
+            Assert.That(request.RequestExtensions.GetExtension(OcspObjectIdentifiers.PkixOcspNonce), Is.Not.Null);
         }
     }
 }
diff --git a/src/WebEid.Security.Tests/Validator/Validators/SubjectCertificateNotRevokedValidatorTests.cs b/src/WebEid.Security.Tests/Validator/Validators/SubjectCertificateNotRevokedValidatorTests.cs
@@ -223,10 +223,11 @@ public void WhenOcspResponseCaNotTrustedThenThrows()
                 new OcspClientMock(Certificates.ResourceReader.ReadFromResource("ocsp_response_unknown.der")));
             var ex = Assert.ThrowsAsync<UserCertificateOcspCheckFailedException>(() =>
                     validator.Validate(this.esteid2018Cert));
-            Assert.IsInstanceOf<CertificateNotTrustedException>(ex.InnerException);
-            StringAssert.StartsWith(
-                    "Certificate E=pki@sk.ee, CN=TEST of SK OCSP RESPONDER 2020, OU=OCSP, O=AS Sertifitseerimiskeskus, C=EE is not trusted",
-                    ex.InnerException.Message);
+            Assert.That(ex.InnerException, Is.TypeOf<CertificateNotTrustedException>());
+            Assert.That(ex.InnerException.Message,
+                Does.StartWith(
+                    "Certificate E=pki@sk.ee, CN=TEST of SK OCSP RESPONDER 2020, OU=OCSP, O=AS Sertifitseerimiskeskus, C=EE is not trusted"
+                    ));
         }
 
 
diff --git a/src/WebEid.Security.Tests/WebEid.Security.Tests.csproj b/src/WebEid.Security.Tests/WebEid.Security.Tests.csproj
@@ -37,15 +37,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Moq" Version="4.17.2" />
-    <PackageReference Include="nunit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="System.Runtime.Caching" Version="6.0.0" />
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="nunit" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="System.Runtime.Caching" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebEid.Security/WebEid.Security.csproj b/src/WebEid.Security/WebEid.Security.csproj
@@ -15,10 +15,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
     <PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.34.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.6.0" />
   </ItemGroup>
 
   <PropertyGroup>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/*`
	`1`	`+/*`
`2`	`2`	`* Copyright © 2020-2024 Estonian Information System Authority`
`3`	`3`	`*`
`4`	`4`	`* Permission is hereby granted, free of charge, to any person obtaining a copy`
`@@ -27,17 +27,17 @@ namespace WebEid.Security.Tests.TestUtils`
`27`	`27`	`internal static class TestingExtensions`
`28`	`28`	`{`
`29`	`29`	`public static void WithMessage(this Exception exception, string expectedMessage) =>`
`30`		`- Assert.AreEqual(expectedMessage, exception.Message);`
	`30`	`+ Assert.That(expectedMessage, Is.EqualTo(exception.Message));`
`31`	`31`
`32`	`32`	`public static void HasMessageStartingWith(this Exception exception, string expectedMessage) =>`
`33`		`- Assert.True(exception.Message.StartsWith(expectedMessage, StringComparison.InvariantCulture), $"Exception message: '{exception.Message}' does not start with: '{expectedMessage}'");`
	`33`	`+ Assert.That(exception.Message.StartsWith(expectedMessage, StringComparison.InvariantCulture), $"Exception message: '{exception.Message}' does not start with: '{expectedMessage}'");`
`34`	`34`
`35`	`35`	`public static void HasMessage(this Exception exception, string expectedMessage) =>`
`36`		`- Assert.True(exception.Message.Contains(expectedMessage, StringComparison.InvariantCulture), $"Exception message: '{exception.Message}' does not start with: '{expectedMessage}'");`
	`36`	`+ Assert.That(exception.Message.Contains(expectedMessage, StringComparison.InvariantCulture), $"Exception message: '{exception.Message}' does not start with: '{expectedMessage}'");`
`37`	`37`
`38`	`38`	`public static Exception IsInstanceOf<T>(this Exception exception) where T : Exception`
`39`	`39`	`{`
`40`		`- Assert.True(exception.GetType() == typeof(T),`
	`40`	`+ Assert.That(exception.GetType() == typeof(T),`
`41`	`41`	`$"Exception of type {exception.GetType()} is not equal to expected type: {typeof(T)}");`
`42`	`42`	`return exception;`
`43`	`43`	`}`