Merge pull request #26 from in-async/release/v0.7.0

Release/v0.7.0

Author: in-async

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup>
-   <LangVersion>8.0</LangVersion>
+   <LangVersion>9.0</LangVersion>
    <Nullable>enable</Nullable>
  </PropertyGroup>
 </Project>

Inasync.PrimitiveAssert.Tests/Inasync.PrimitiveAssert.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;netcoreapp2.1;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netcoreapp2.1;net48;net461</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
 

Inasync.PrimitiveAssert.Tests/PrimitiveAssertTests_AssertIs.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Inasync.Tests {
@@ -49,6 +50,19 @@ public void AssertIs_Reference() {
             }.Invoke();
         }
 
+        [TestMethod]
+        public void AssertIs_Predicate() {
+            var targetType = new Type?[] { null, typeof(DummyStruct), typeof(DummyClass) }.OrderBy(x => Guid.NewGuid()).First();
+            var obj = "foo";
+            new[] {
+                TestCase( 0, target: targetType, x: obj, y: new AssertPredicate(x => true)            ),
+                TestCase( 1, target: targetType, x: obj, y: new AssertPredicate(x => false)           , expectedException: typeof(PrimitiveAssertFailedException)),  // アサート条件が false。
+                TestCase(10, target: targetType, x: obj, y: new AssertPredicate<string>(x => true)    ),
+                TestCase(11, target: targetType, x: obj, y: new AssertPredicate<object>(x => true)    ),
+                TestCase(12, target: targetType, x: obj, y: new AssertPredicate<DummyClass>(x => true), expectedException: typeof(PrimitiveAssertFailedException)),  // actual は DummyClass にキャストできない。
+            }.Invoke();
+        }
+
         [TestMethod]
         public void AssertIs_Numeric() {
             new[] {

Inasync.PrimitiveAssert.Tests/UsageTests.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Security.Cryptography;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Inasync.Tests {
@@ -97,6 +98,37 @@ public void Usage6() {
             });
         }
 
+#if !NET461
+
+        [TestMethod]
+        public void Usage7() {
+            using ECDsa ecdsa = ECDsa.Create();
+            ecdsa.GenerateKey(ECCurve.NamedCurves.nistP256);
+
+            var message = new byte[] { 1, 2, 3 };
+            byte[] signature = ecdsa.SignData(message, HashAlgorithmName.SHA256);
+
+            var actual = new {
+                Id = 123,
+                CreatedAt = DateTime.Now,
+                Details = new {
+                    Age = 25,
+                    Signature = signature,
+                },
+            };
+
+            actual.AssertIs(new {
+                Id = 123,
+                CreatedAt = new AssertPredicate(x => true),  // Ignore assert
+                Details = new {
+                    Age = new AssertPredicate<int>(x => x > 20),
+                    Signature = new AssertPredicate<byte[]>(x => ecdsa.VerifyData(message, signature: x, HashAlgorithmName.SHA256)),
+                },
+            });
+        }
+
+#endif
+
         #region Helpers
 
         public interface IAccount {

Inasync.PrimitiveAssert/AssertPredicate.cs

@@ -0,0 +1,17 @@
+namespace Inasync {
+
+    /// <summary>
+    /// <see cref="PrimitiveAssert"/> の <c>expected</c> に指定する事で任意のアサート条件が記述できるデリゲート。
+    /// </summary>
+    /// <param name="actual">検証対象の実値。</param>
+    /// <returns><paramref name="actual"/> がアサートに成功した場合は <c>true</c>、失敗した場合は <c>false</c>。</returns>
+    public delegate bool AssertPredicate(object? actual);
+
+    /// <summary>
+    /// <see cref="PrimitiveAssert"/> の <c>expected</c> に指定する事で任意のアサート条件が記述できるデリゲート。
+    /// </summary>
+    /// <typeparam name="T"><paramref name="actual"/> で受けたい型。キャストできない場合はアサートに失敗した扱いになる。</typeparam>
+    /// <param name="actual">検証対象の実値。</param>
+    /// <returns><paramref name="actual"/> がアサートに成功した場合は <c>true</c>、失敗した場合は <c>false</c>。</returns>
+    public delegate bool AssertPredicate<T>(T actual);
+}

Inasync.PrimitiveAssert/Inasync.PrimitiveAssert.csproj

@@ -9,7 +9,7 @@
     <PackageProjectUrl>https://github.com/in-async/PrimitiveAssert</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/in-async/PrimitiveAssert/blob/master/LICENSE</PackageLicenseUrl>
     <PackageTags>library test unittest assert deep</PackageTags>
-    <Version>0.6.0</Version>
+    <Version>0.7.0</Version>
   </PropertyGroup>
 
 </Project>

Inasync.PrimitiveAssert/Internals/AssertIsImpl.cs

@@ -23,6 +23,8 @@ public void AssertIs(AssertNode node) {
 
             _logger?.Write($"{node.MemberName}: {node.TargetType?.GetFriendlyName() ?? "(null)"} = ");
             try {
+                if (TryPredicateAssertIs(targetType, actual, expected, node)) { return; }
+
                 // null 比較
                 if (targetType is null) {
                     if (!(actual is null)) { throw new PrimitiveAssertFailedException(node, "ターゲット型は null ですが、actual は非 null です。", _message); }
@@ -79,6 +81,30 @@ private void WriteLog(AssertNode node, string additionalMessage) {
             _logger.WriteLine();
         }
 
+        private bool TryPredicateAssertIs(Type? targetType, object? actual, object? expected, AssertNode node) {
+            if (expected is null) { return false; }
+
+            if (expected is AssertPredicate predicate) {
+                if (!predicate(actual)) { throw new PrimitiveAssertFailedException(node, "actual はカスタム条件に一致しませんでした。", _message); }
+
+                WriteLog(node, "actual はカスタム条件に一致しました。");
+                return true;
+            }
+
+            Type expectedType = expected.GetType();
+            if (expectedType.IsGenericType && expectedType.GetGenericTypeDefinition() == typeof(AssertPredicate<>)) {
+                Type genericType = expectedType.GetGenericArguments()[0];
+
+                if (!genericType.IsAssignableFrom(actual?.GetType())) { throw new PrimitiveAssertFailedException(node, "actual はカスタム条件の型引数にキャストできませんでした。", _message); }
+                if (!(bool)expectedType.GetMethod("Invoke").Invoke(expected, new[] { actual })) { throw new PrimitiveAssertFailedException(node, "actual はカスタム条件に一致しませんでした。", _message); }
+
+                WriteLog(node, "actual はカスタム条件に一致しました。");
+                return true;
+            }
+
+            return false;
+        }
+
         private bool TryNumericAssertIs(Type targetType, object actual, object expected, AssertNode node) {
             if (!Numeric.IsNumeric(targetType)) { return false; }
 

appveyor.yml

@@ -16,6 +16,6 @@ deploy:
     appveyor_repo_tag: true
 - provider: NuGet
   api_key:
-    secure: 6Uequ3x7ky4YviiGDGcQGjlaScD1g5Ypv6MtcdJX8Otz9pLFcL9PuU1xvG7zdDGS
+    secure: ccm+uv1mL5n9OdO3gu9MZdUIFnVws0G8cjiVQdO1o2ZzhTsXpbuJW+Iz+D1SlqcF
   on:
     appveyor_repo_tag: true