🐛 should support approximate datetime comparison for nullable datetim…

…es as actual and/or expected
fluffynuts · Dec 13, 2023 · d7c85f8 · d7c85f8
1 parent d3322b8
commit d7c85f8
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 44 deletions.
diff --git a/src/NExpect.Tests/ObjectEquality/TestingApproximateEquality.cs b/src/NExpect.Tests/ObjectEquality/TestingApproximateEquality.cs
@@ -175,6 +175,13 @@ public void WhenWithinASecond_ShouldNotThrow()
                             .To.Approximately.Equal(d1.Value);
                     },
                     Throws.Nothing);
+                Assert.That(() =>
+                {
+                    Expect(d2)
+                        .To.Approximately.Equal(d1);
+                    Expect(d2)
+                        .To.Approximately.Equal(d1.Value);
+                }, Throws.Nothing);
                 // Assert
             }
 

diff --git a/src/NExpect/ApproximateEqualityDateTimeMatchers.cs b/src/NExpect/ApproximateEqualityDateTimeMatchers.cs
@@ -23,7 +23,7 @@ public static class ApproximateEqualityDateTimeMatchers
     /// <returns></returns>
     public static IMore<DateTime> Equal(
         this IApproximately<DateTime> continuation,
-        DateTime expected)
+        DateTime? expected)
     {
         return continuation.Equal(expected, NULL_STRING);
     }
@@ -39,7 +39,7 @@ public static IMore<DateTime> Equal(
     /// <returns></returns>
     public static IMore<DateTime> Equal(
         this IApproximately<DateTime> continuation,
-        DateTime expected,
+        DateTime? expected,
         TimeSpan allowedDrift)
     {
         return continuation.Equal(expected, allowedDrift, NULL_STRING);
@@ -56,7 +56,7 @@ public static IMore<DateTime> Equal(
     /// <returns></returns>
     public static IMore<DateTime> Equal(
         this IApproximately<DateTime> continuation,
-        DateTime expected,
+        DateTime? expected,
         string customMessage)
     {
         return continuation.Equal(expected, () => customMessage);
@@ -73,7 +73,7 @@ public static IMore<DateTime> Equal(
     /// <returns></returns>
     public static IMore<DateTime> Equal(
         this IApproximately<DateTime> continuation,
-        DateTime expected,
+        DateTime? expected,
         Func<string> customMessageGenerator)
     {
         return continuation.Equal(expected,
@@ -94,7 +94,7 @@ public static IMore<DateTime> Equal(
     /// <returns></returns>
     public static IMore<DateTime> Equal(
         this IApproximately<DateTime> continuation,
-        DateTime expected,
+        DateTime? expected,
         TimeSpan allowedDrift,
         string customMessage)
     {
@@ -116,7 +116,7 @@ public static IMore<DateTime> Equal(
     /// <returns></returns>
     public static IMore<DateTime> Equal(
         this IApproximately<DateTime> continuation,
-        DateTime expected,
+        DateTime? expected,
         TimeSpan allowedDrift,
         Func<string> customMessageGenerator)
     {
@@ -137,13 +137,14 @@ public static IMore<DateTime> Equal(
     /// <returns></returns>
     public static IMore<DateTime> Equal(
         this IApproximately<DateTime> continuation,
-        DateTime expected,
+        DateTime? expected,
         IEqualityComparer<DateTime> comparer,
         Func<string> customMessageGenerator)
     {
         continuation.AddMatcher(actual =>
         {
-            var passed = comparer.Equals(actual, expected);
+            var passed = expected is not null && 
+                comparer.Equals(actual, expected.Value);
 
             return new MatcherResult(passed,
                 () =>

diff --git a/src/NExpect/ApproximateEqualityNullableDateTimeMatchers.cs b/src/NExpect/ApproximateEqualityNullableDateTimeMatchers.cs
@@ -19,7 +19,8 @@ public static class ApproximateEqualityNullableDateTimeMatchers
     /// <returns></returns>
     public static IMore<DateTime?> Equal(
         this IApproximately<DateTime?> continuation,
-        DateTime expected)
+        DateTime? expected
+    )
     {
         return continuation.Equal(expected, MessageHelpers.NULL_STRING);
     }
@@ -35,12 +36,15 @@ public static class ApproximateEqualityNullableDateTimeMatchers
     /// <returns></returns>
     public static IMore<DateTime?> Equal(
         this IApproximately<DateTime?> continuation,
-        DateTime expected,
-        TimeSpan allowedDrift)
+        DateTime? expected,
+        TimeSpan allowedDrift
+    )
     {
-        return continuation.Equal(expected,
+        return continuation.Equal(
+            expected,
             allowedDrift,
-            MessageHelpers.NULL_STRING);
+            MessageHelpers.NULL_STRING
+        );
     }
 
     /// <summary>
@@ -54,8 +58,9 @@ public static class ApproximateEqualityNullableDateTimeMatchers
     /// <returns></returns>
     public static IMore<DateTime?> Equal(
         this IApproximately<DateTime?> continuation,
-        DateTime expected,
-        string customMessage)
+        DateTime? expected,
+        string customMessage
+    )
     {
         return continuation.Equal(expected, () => customMessage);
     }
@@ -71,12 +76,15 @@ public static class ApproximateEqualityNullableDateTimeMatchers
     /// <returns></returns>
     public static IMore<DateTime?> Equal(
         this IApproximately<DateTime?> continuation,
-        DateTime expected,
-        Func<string> customMessageGenerator)
+        DateTime? expected,
+        Func<string> customMessageGenerator
+    )
     {
-        return continuation.Equal(expected,
+        return continuation.Equal(
+            expected,
             TimeSpan.FromSeconds(1),
-            customMessageGenerator);
+            customMessageGenerator
+        );
     }
 
     /// <summary>
@@ -92,13 +100,16 @@ public static class ApproximateEqualityNullableDateTimeMatchers
     /// <returns></returns>
     public static IMore<DateTime?> Equal(
         this IApproximately<DateTime?> continuation,
-        DateTime expected,
+        DateTime? expected,
         TimeSpan allowedDrift,
-        string customMessage)
+        string customMessage
+    )
     {
-        return continuation.Equal(expected,
+        return continuation.Equal(
+            expected,
             allowedDrift,
-            () => customMessage);
+            () => customMessage
+        );
     }
 
     /// <summary>
@@ -114,29 +125,51 @@ public static class ApproximateEqualityNullableDateTimeMatchers
     /// <returns></returns>
     public static IMore<DateTime?> Equal(
         this IApproximately<DateTime?> continuation,
-        DateTime expected,
+        DateTime? expected,
         TimeSpan allowedDrift,
-        Func<string> customMessageGenerator)
+        Func<string> customMessageGenerator
+    )
     {
-        continuation.AddMatcher(actual =>
-        {
-            var delta = actual == null
-                ? allowedDrift.TotalMilliseconds + 1
-                : Math.Abs((actual.Value - expected)
-                    .TotalMilliseconds);
-            var allowed = Math.Abs(allowedDrift.TotalMilliseconds);
-            var passed = delta <= allowed;
-            return new MatcherResult(passed,
-                () => MessageHelpers.FinalMessageFor(()
-                        => $@"Expected {
-                            actual.Stringify()
-                        } to approximately equal {
-                            expected.Stringify()
-                        } within a timespan of {
-                            allowedDrift.Stringify()
-                        }",
-                    customMessageGenerator));
-        });
+        continuation.AddMatcher(
+            actual =>
+            {
+                bool passed;
+                if (actual is null && expected is null)
+                {
+                    passed = true;
+                }
+                else if (actual is null || expected is null)
+                {
+                    passed = false;
+                }
+                else
+                {
+                    var delta = actual == null
+                        ? allowedDrift.TotalMilliseconds + 1
+                        : Math.Abs(
+                            (actual.Value - expected.Value)
+                            .TotalMilliseconds
+                        );
+                    var allowed = Math.Abs(allowedDrift.TotalMilliseconds);
+                    passed = delta <= allowed;
+                }
+
+                return new MatcherResult(
+                    passed,
+                    () => MessageHelpers.FinalMessageFor(
+                        ()
+                            => $@"Expected {
+                                actual.Stringify()
+                            } to approximately equal {
+                                expected.Stringify()
+                            } within a timespan of {
+                                allowedDrift.Stringify()
+                            }",
+                        customMessageGenerator
+                    )
+                );
+            }
+        );
         return continuation.More();
     }
 }