Fix SignOutResultAssertions tests.

Author: faddiv

src/FluentAssertions.AspNetCore.Mvc/SignOutResultAssertions.cs

@@ -65,7 +65,8 @@ public SignOutResultAssertions WithAuthenticationProperties(AuthenticationProper
             Execute.Assertion
                 .ForCondition(actualAuthenticationProperties == expectedAuthenticationProperties)
                 .BecauseOf(reason, reasonArgs)
-                .FailWith(string.Format(FailureMessages.CommonFailMessage, "SignOutResult.AuthenticationProperties", expectedAuthenticationProperties, actualAuthenticationProperties));
+                .WithDefaultIdentifier("SignOutResult.AuthenticationProperties")
+                .FailWith(FailureMessages.CommonFailMessage, expectedAuthenticationProperties, actualAuthenticationProperties);
 
             return this;
         }
@@ -88,7 +89,8 @@ public SignOutResultAssertions WithIsPersistent(bool expectedIsPersistent, strin
             Execute.Assertion
                 .ForCondition(actualIsPersistent == expectedIsPersistent)
                 .BecauseOf(reason, reasonArgs)
-                .FailWith(string.Format(FailureMessages.CommonFailMessage, "SignOutResult.AuthenticationProperties.IsPersistent", expectedIsPersistent, actualIsPersistent));
+                .WithDefaultIdentifier("SignOutResult.AuthenticationProperties.IsPersistent")
+                .FailWith(FailureMessages.CommonFailMessage, expectedIsPersistent, actualIsPersistent);
 
             return this;
         }
@@ -111,7 +113,8 @@ public SignOutResultAssertions WithRedirectUri(string expectedRedirectUri, strin
             Execute.Assertion
                 .ForCondition(string.Equals(actualRedirectUri, expectedRedirectUri))
                 .BecauseOf(reason, reasonArgs)
-                .FailWith(string.Format(FailureMessages.CommonFailMessage, "SignOutResult.AuthenticationProperties.RedirectUri", expectedRedirectUri, actualRedirectUri));
+                .WithDefaultIdentifier("SignOutResult.AuthenticationProperties.RedirectUri")
+                .FailWith(FailureMessages.CommonFailMessage, expectedRedirectUri, actualRedirectUri);
 
             return this;
         }
@@ -130,42 +133,13 @@ public SignOutResultAssertions WithRedirectUri(string expectedRedirectUri, strin
         public SignOutResultAssertions WithIssuedUtc(DateTimeOffset? expectedIssuedUtc, string reason = "", params object[] reasonArgs)
         {
             var actualResult = IssuedUtc;
-
-            var expectedIssuedUtcAsString = expectedIssuedUtc?.ToString("r", (IFormatProvider) CultureInfo.InvariantCulture);
-            
-            var expectedResult = DateTimeOffset.TryParseExact(expectedIssuedUtcAsString, "r", (IFormatProvider)CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out var result) 
-                ? new DateTimeOffset?(result)
-                : new DateTimeOffset?();
-
-            if (actualResult == null && expectedResult == null)
-            {
-                return this;
-            }
-
-            if (actualResult == null)
-            {
-                Execute.Assertion
-                    .ForCondition(false)
-                    .BecauseOf(reason, reasonArgs)
-                    .FailWith(string.Format(FailureMessages.CommonFailMessage, "SignOutResult.AuthenticationProperties.IssuedUtc", expectedResult, null));
-
-                return this;
-            }
-
-            if (expectedResult == null)
-            {
-                Execute.Assertion
-                    .ForCondition(false)
-                    .BecauseOf(reason, reasonArgs)
-                    .FailWith(string.Format(FailureMessages.CommonFailMessage, "SignOutResult.AuthenticationProperties.IssuedUtc", null, actualResult));
-
-                return this;
-            }
+            DateTimeOffset? expectedResult = RoundToSeconds(expectedIssuedUtc);
 
             Execute.Assertion
-                .ForCondition(DateTimeOffset.Compare(expectedResult.Value, actualResult.Value) == 0)
+                .ForCondition(EqualityComparer<DateTimeOffset?>.Default.Equals(expectedResult, actualResult))
                 .BecauseOf(reason, reasonArgs)
-                .FailWith(string.Format(FailureMessages.CommonFailMessage, "SignOutResult.AuthenticationProperties.IssuedUtc", expectedResult.Value, actualResult.Value));
+                .WithDefaultIdentifier("SignOutResult.AuthenticationProperties.IssuedUtc")
+                .FailWith(FailureMessages.CommonFailMessage, expectedResult, actualResult);
 
             return this;
         }
@@ -185,41 +159,13 @@ public SignOutResultAssertions WithExpiresUtc(DateTimeOffset? expectedExpiresUtc
         {
             var actualResult = ExpiresUtc;
 
-            var expectedExpiresUtcAsString = expectedExpiresUtc?.ToString("r", (IFormatProvider)CultureInfo.InvariantCulture);
-
-            var expectedResult = DateTimeOffset.TryParseExact(expectedExpiresUtcAsString, "r", (IFormatProvider)CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out var result)
-                ? new DateTimeOffset?(result)
-                : new DateTimeOffset?();
-
-            if (actualResult == null && expectedResult == null)
-            {
-                return this;
-            }
-
-            if (actualResult == null)
-            {
-                Execute.Assertion
-                    .ForCondition(false)
-                    .BecauseOf(reason, reasonArgs)
-                    .FailWith(string.Format(FailureMessages.CommonFailMessage, "SignOutResult.AuthenticationProperties.ExpiresUtc", expectedResult, null));
-
-                return this;
-            }
-
-            if (expectedResult == null)
-            {
-                Execute.Assertion
-                    .ForCondition(false)
-                    .BecauseOf(reason, reasonArgs)
-                    .FailWith(string.Format(FailureMessages.CommonFailMessage, "SignOutResult.AuthenticationProperties.ExpiresUtc", null, actualResult));
-
-                return this;
-            }
+            DateTimeOffset? expectedResult = RoundToSeconds(expectedExpiresUtc);
 
             Execute.Assertion
-                .ForCondition(DateTimeOffset.Compare(expectedResult.Value, actualResult.Value) == 0)
+                .ForCondition(EqualityComparer<DateTimeOffset?>.Default.Equals(expectedResult, actualResult))
                 .BecauseOf(reason, reasonArgs)
-                .FailWith(string.Format(FailureMessages.CommonFailMessage, "SignOutResult.AuthenticationProperties.ExpiresUtc", expectedResult.Value, actualResult.Value));
+                .WithDefaultIdentifier("SignOutResult.AuthenticationProperties.ExpiresUtc")
+                .FailWith(FailureMessages.CommonFailMessage, expectedResult, actualResult);
 
             return this;
         }
@@ -243,7 +189,8 @@ public SignOutResultAssertions WithAllowRefresh(bool? expectedAllowRefresh, stri
             Execute.Assertion
                 .ForCondition(actualAllowRefresh == expectedAllowRefresh)
                 .BecauseOf(reason, reasonArgs)
-                .FailWith(string.Format(FailureMessages.CommonFailMessage, "SignOutResult.AuthenticationProperties.AllowRefresh", expectedAllowRefresh, actualAllowRefresh));
+                .WithDefaultIdentifier("SignOutResult.AuthenticationProperties.AllowRefresh")
+                .FailWith(FailureMessages.CommonFailMessage, expectedAllowRefresh, actualAllowRefresh);
 
             return this;
         }
@@ -323,5 +270,19 @@ public SignOutResultAssertions ContainsScheme(string expectedScheme, string reas
         }
 
         #endregion
+
+        #region Private Methods
+
+        private static DateTimeOffset? RoundToSeconds(DateTimeOffset? expectedIssuedUtc)
+        {
+            var expectedIssuedUtcAsString = expectedIssuedUtc?.ToString("r", CultureInfo.InvariantCulture);
+
+            var expectedResult = DateTimeOffset.TryParseExact(expectedIssuedUtcAsString, "r", CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out var result)
+                ? new DateTimeOffset?(result)
+                : new DateTimeOffset?();
+            return expectedResult;
+        }
+
+        #endregion
     }
 }

tests/FluentAssertions.AspNetCore.Mvc.Tests/Helpers/FailureMessageHelper.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Text;
 
 namespace FluentAssertions.Mvc.Tests.Helpers
 {
@@ -43,9 +44,23 @@ public static string ExpectedKeyButNotFound(string context, string key, string e
         private static object ToString(DateTimeOffset? expected)
         {
             if (expected.HasValue)
-                return $"<{expected:yyyy-MM-dd HH:mm:ss.fffffff z}h>";
-            else
-                return "<null>";
+            {
+                var builder = new StringBuilder($"<{expected:yyyy-MM-dd HH:mm:ss}");
+                if(expected.Value.Millisecond > 0)
+                {
+                    builder.AppendFormat(".{0:fffffff}", expected.Value);
+                }
+                if (expected.Value.Offset.Hours > 0)
+                {
+                    builder.AppendFormat(" +{0}h", expected.Value.Offset.Hours);
+                } else if (expected.Value.Offset.Hours < 0)
+                {
+                    builder.AppendFormat(" -{0}h", expected.Value.Offset.Hours);
+                }
+                builder.Append('>');
+                return builder.ToString();
+            }
+            return "<null>";
         }
 
     }