Update test framework

Author: jdomnitz

Test/ECTests.cs

@@ -10,6 +10,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+using MatterDotNet.PKI;
 using MatterDotNet.Protocol.Cryptography;
 using System.Security.Cryptography;
 
@@ -46,6 +47,17 @@ public void TestSigning()
             Assert.That(Crypto.Verify(keypair.Public, msg, signature), Is.True);
         }
 
+        [Test]
+        public void TestSignVerify()
+        {
+            byte[] msg = RandomNumberGenerator.GetBytes(32);
+            var keypair = Crypto.GenerateKeypair();
+            Fabric fabric = new Fabric(0x678, 0x789, []);
+            OperationalCertificate cert = fabric.CreateCommissioner(keypair.Public, keypair.Private);
+            byte[] signature = Crypto.Sign(cert.GetPrivateKey()!, msg);
+            Assert.That(Crypto.Verify(cert.PublicKey, msg, signature), Is.True);
+        }
+
         [Test]
         public void TestECDH()
         {

Test/MatterCertTests.cs

@@ -55,7 +55,7 @@ public void RCACEncoding()
             MatterCertificate tlv = cert.ToMatterCertificate();
             PayloadWriter output = new PayloadWriter(400);
             tlv.Serialize(new TLVWriter(output));
-            CollectionAssert.AreEqual(output.GetPayload().Span.ToArray(), nocTLV);
+            Assert.That(nocTLV, Is.EqualTo(output.GetPayload().Span.ToArray()).AsCollection);
         }
 
         [Test]
@@ -70,13 +70,13 @@ public void NOCEncoding()
             MatterCertificate tlv = cert.ToMatterCertificate();
             PayloadWriter output = new PayloadWriter(400);
             tlv.Serialize(new TLVWriter(output));
-            CollectionAssert.AreEqual(output.GetPayload().Span.ToArray(), nocTLV);
+            Assert.That(nocTLV, Is.EqualTo(output.GetPayload().Span.ToArray()).AsCollection);
         }
 
         [Test]
         public void NOCSigning()
         {
-            Fabric fabric = new Fabric((ulong)Random.Shared.NextInt64(), 0x1);
+            Fabric fabric = new Fabric((ulong)Random.Shared.NextInt64(), 0x1, []);
             ECDsa key = ECDsa.Create();
             CertificateRequest req = new CertificateRequest("CN=Test", key, HashAlgorithmName.SHA256);
             OperationalCertificate noc = fabric.Sign(req);

Test/SpakeTests.cs

@@ -56,8 +56,8 @@ public void TestExchange()
             (BigIntegerPoint Z, BigIntegerPoint V) responderValidation = initiator.InitiatorValidate(pB);
             Assert.That(ininiatorValidation.V, Is.EqualTo(responderValidation.V));
             Assert.That(ininiatorValidation.Z, Is.EqualTo(responderValidation.Z));
-            CollectionAssert.AreEqual(ininiatorValidation.V.ToBytes(true).ToArray(), responderValidation.V.ToBytes(true).ToArray());
-            CollectionAssert.AreEqual(ininiatorValidation.Z.ToBytes(true).ToArray(), responderValidation.Z.ToBytes(true).ToArray());
+            Assert.That(responderValidation.V.ToBytes(true).ToArray(), Is.EqualTo(ininiatorValidation.V.ToBytes(true).ToArray()).AsCollection);
+            Assert.That(responderValidation.Z.ToBytes(true).ToArray(), Is.EqualTo(ininiatorValidation.Z.ToBytes(true).ToArray()).AsCollection);
 
             PBKDFParamReq req = new PBKDFParamReq() { HasPBKDFParameters = false, InitiatorRandom = [], InitiatorSessionId = 23, PasscodeId = 0 };
             PBKDFParamResp resp = new PBKDFParamResp() { InitiatorRandom = [], ResponderRandom = [], ResponderSessionId = 23 };

Test/Test.csproj

@@ -13,11 +13,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.9.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="NUnit" Version="4.3.1" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.5.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
   </ItemGroup>
 
   <ItemGroup>