Consolidate custom Assert classes into ancillary assembly (#12)

jpassing · Mar 10, 2024 · e022e03 · e022e03
1 parent 4b2326f
commit e022e03
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 156 deletions.
diff --git a/sources/Jpki.Powershell.Test/AssertThat.cs → sources/Jpki.NUnit/AssertThat.cs b/sources/Jpki.Powershell.Test/AssertThat.cs → sources/Jpki.NUnit/AssertThat.cs
@@ -26,19 +26,19 @@ namespace NUnit.Framework
     /// <summary>
     /// Alias for NUnit 3-style assertion.
     /// </summary>
-    internal class AssertThat : ClassicAssert
+    public class AssertThat : ClassicAssert
     {
     }
 
     /// <summary>
     /// Alias for NUnit 3-style assertion.
     /// </summary>
-    internal class CollectionAssertThat : CollectionAssert
+    public class CollectionAssertThat : CollectionAssert
     { }
 
     /// <summary>
     /// Alias for NUnit 3-style assertion.
     /// </summary>
-    internal class StringAssertThat : StringAssert
+    public class StringAssertThat : StringAssert
     { }
 }
diff --git a/...ki.Security.WebAuthn.Test/AssertThrows.cs → sources/Jpki.NUnit/AssertThrows.cs b/...ki.Security.WebAuthn.Test/AssertThrows.cs → sources/Jpki.NUnit/AssertThrows.cs
@@ -23,25 +23,10 @@
 using System;
 using System.Reflection;
 
-namespace Jpki.Test
+namespace NUnit.Framework
 {
-    internal static class AssertThrows
+    public static class AssertThrows
     {
-        public static TActual? AggregateException<TActual>(TestDelegate code) where TActual : Exception
-        {
-            return AssertThat.Throws<TActual>(() =>
-            {
-                try
-                {
-                    code();
-                }
-                catch (AggregateException e)
-                {
-                    throw e.Unwrap();
-                }
-            });
-        }
-
         private static Exception Unwrap(this Exception e)
         {
             if (e is AggregateException aggregate &&
@@ -59,5 +44,20 @@ private static Exception Unwrap(this Exception e)
                 return e;
             }
         }
+
+        public static TActual? AggregateException<TActual>(TestDelegate code) where TActual : Exception
+        {
+            return AssertThat.Throws<TActual>(() =>
+            {
+                try
+                {
+                    code();
+                }
+                catch (AggregateException e)
+                {
+                    throw e.Unwrap();
+                }
+            });
+        }
     }
 }
diff --git a/sources/Jpki.NUnit/Jpki.NUnit.csproj b/sources/Jpki.NUnit/Jpki.NUnit.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\Jpki.props" />
+
+  <ItemGroup>
+    <PackageReference Include="NUnit" Version="4.0.1" />
+  </ItemGroup>
+</Project>
diff --git a/sources/Jpki.Powershell.Test/AssertThrows.cs b/sources/Jpki.Powershell.Test/AssertThrows.cs
diff --git a/sources/Jpki.Powershell.Test/Jpki.Powershell.Test.csproj b/sources/Jpki.Powershell.Test/Jpki.Powershell.Test.csproj
@@ -11,5 +11,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Jpki.Powershell\Jpki.Powershell.csproj" />
+    <ProjectReference Include="..\Jpki.Nunit\Jpki.NUnit.csproj" />
   </ItemGroup>
 </Project>
diff --git a/sources/Jpki.Security.Cryptography.Test/AssertThat.cs b/sources/Jpki.Security.Cryptography.Test/AssertThat.cs
diff --git a/sources/Jpki.Security.Cryptography.Test/Jpki.Security.Cryptography.Test.csproj b/sources/Jpki.Security.Cryptography.Test/Jpki.Security.Cryptography.Test.csproj
@@ -12,5 +12,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Jpki.Security.Cryptography\Jpki.Security.Cryptography.csproj" />
+    <ProjectReference Include="..\Jpki.Nunit\Jpki.NUnit.csproj" />
   </ItemGroup>
 </Project>
diff --git a/sources/Jpki.Security.WebAuthn.Test/AssertThat.cs b/sources/Jpki.Security.WebAuthn.Test/AssertThat.cs
diff --git a/sources/Jpki.Security.WebAuthn.Test/Jpki.Security.WebAuthn.Test.csproj b/sources/Jpki.Security.WebAuthn.Test/Jpki.Security.WebAuthn.Test.csproj
@@ -16,6 +16,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Jpki.Security.WebAuthn\Jpki.Security.WebAuthn.csproj" />
+    <ProjectReference Include="..\Jpki.Nunit\Jpki.NUnit.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/sources/Jpki.sln b/sources/Jpki.sln
@@ -21,9 +21,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jpki.Security.WebAuthn.Test
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jpki.Build", "Jpki\Jpki.Build.csproj", "{83F04876-1B36-4153-9C7E-16AD531744C2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jpki.Powershell", "Jpki.Powershell\Jpki.Powershell.csproj", "{04D7531B-574D-452A-9FA8-A10C20562C99}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jpki.Powershell", "Jpki.Powershell\Jpki.Powershell.csproj", "{04D7531B-574D-452A-9FA8-A10C20562C99}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jpki.Powershell.Test", "Jpki.Powershell.Test\Jpki.Powershell.Test.csproj", "{EF89FDD9-E35B-4B76-A726-9BBB4D3C1B1E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jpki.Powershell.Test", "Jpki.Powershell.Test\Jpki.Powershell.Test.csproj", "{EF89FDD9-E35B-4B76-A726-9BBB4D3C1B1E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jpki.NUnit", "Jpki.Nunit\Jpki.NUnit.csproj", "{80B66880-C413-43BF-8668-10BA6D342B4A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -59,6 +61,10 @@ Global
 		{EF89FDD9-E35B-4B76-A726-9BBB4D3C1B1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EF89FDD9-E35B-4B76-A726-9BBB4D3C1B1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EF89FDD9-E35B-4B76-A726-9BBB4D3C1B1E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{80B66880-C413-43BF-8668-10BA6D342B4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{80B66880-C413-43BF-8668-10BA6D342B4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{80B66880-C413-43BF-8668-10BA6D342B4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{80B66880-C413-43BF-8668-10BA6D342B4A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE