more date stuff

VerifyTests · Oct 23, 2022 · 84e250c · 84e250c
1 parent f000979
commit 84e250c
Show file tree

Hide file tree

Showing 20 changed files with 91 additions and 25 deletions.
diff --git a/src/Verify.Tests/DateFormatterTests.DateTimeLocalToJsonString.verified.txt b/src/Verify.Tests/DateFormatterTests.DateTimeLocalToJsonString.verified.txt
@@ -1 +1 @@
-2000-10-01
+2000-10-01 Local
diff --git a/src/Verify.Tests/DateFormatterTests.DateTimeLocalToParameterString.verified.txt b/src/Verify.Tests/DateFormatterTests.DateTimeLocalToParameterString.verified.txt
@@ -1 +1 @@
-2000-10-01
+2000-10-01Local
diff --git a/src/Verify.Tests/DateFormatterTests.DateTimeOffsetUtcToJsonString.verified.txt b/src/Verify.Tests/DateFormatterTests.DateTimeOffsetUtcToJsonString.verified.txt
@@ -1 +1 @@
-2000-10-01
+2000-10-01 +0
diff --git a/src/Verify.Tests/DateFormatterTests.DateTimeOffsetUtcToParameterString.verified.txt b/src/Verify.Tests/DateFormatterTests.DateTimeOffsetUtcToParameterString.verified.txt
@@ -1 +1 @@
-2000-10-01
+2000-10-01+0
diff --git a/src/Verify.Tests/DateFormatterTests.DateTimeOtherTimeZoneToJsonString.verified.txt b/src/Verify.Tests/DateFormatterTests.DateTimeOtherTimeZoneToJsonString.verified.txt
@@ -1 +1 @@
-2000-10-01
+2000-10-01 +1:30
diff --git a/src/Verify.Tests/DateFormatterTests.DateTimeOtherTimeZoneToParameterString.verified.txt b/src/Verify.Tests/DateFormatterTests.DateTimeOtherTimeZoneToParameterString.verified.txt
@@ -1 +1 @@
-2000-10-01
+2000-10-01+1:30
diff --git a/src/Verify.Tests/DateFormatterTests.DateTimeUtcToJsonString.verified.txt b/src/Verify.Tests/DateFormatterTests.DateTimeUtcToJsonString.verified.txt
@@ -1 +1 @@
-2000-10-01
+2000-10-01 Utc
diff --git a/src/Verify.Tests/DateFormatterTests.DateTimeUtcToParameterString.verified.txt b/src/Verify.Tests/DateFormatterTests.DateTimeUtcToParameterString.verified.txt
@@ -1 +1 @@
-2000-10-01
+2000-10-01Utc
diff --git a/src/Verify.Tests/Naming/NameForParameterTests.DateTimeLocal.verified.txt b/src/Verify.Tests/Naming/NameForParameterTests.DateTimeLocal.verified.txt
@@ -1 +1 @@
-2000-10-01
+2000-10-01Local
diff --git a/src/Verify.Tests/Naming/NameForParameterTests.DateTimeOffsetLocal.verified.txt b/src/Verify.Tests/Naming/NameForParameterTests.DateTimeOffsetLocal.verified.txt
@@ -1 +1 @@
-2000-10-01
+2000-10-01+11
diff --git a/src/Verify.Tests/Naming/NameForParameterTests.DateTimeOffsetUtc.verified.txt b/src/Verify.Tests/Naming/NameForParameterTests.DateTimeOffsetUtc.verified.txt
@@ -1 +1 @@
-2000-10-01
+2000-10-01+0
diff --git a/src/Verify.Tests/Naming/NameForParameterTests.DateTimeUtc.verified.txt b/src/Verify.Tests/Naming/NameForParameterTests.DateTimeUtc.verified.txt
@@ -1 +1 @@
-2000-10-01
+2000-10-01Utc
diff --git a/...erify.Tests/Serialization/SerializationTests.DatetimeOffsetScrubbingDisabled.verified.txt b/...erify.Tests/Serialization/SerializationTests.DatetimeOffsetScrubbingDisabled.verified.txt
@@ -1,6 +1,6 @@
 {
-  noTime: 2000-01-01,
-  withTime: 2000-01-01 01:01:01,
-  withTimeZeroSeconds: 2000-01-01 01:01,
-  withTimeMilliSeconds: 2000-01-01 01:01:01.999
+  noTime: 2000-01-01 +1:30,
+  withTime: 2000-01-01 01:01:01 +1,
+  withTimeZeroSeconds: 2000-01-01 01:01 +1,
+  withTimeMilliSeconds: 2000-01-01 01:01:01.999 +1
 }
diff --git a/src/Verify.Tests/Serialization/SerializationTests.DatetimeScrubbingDisabled.verified.txt b/src/Verify.Tests/Serialization/SerializationTests.DatetimeScrubbingDisabled.verified.txt
@@ -1,6 +1,6 @@
 {
-  noTime: 2000-01-01,
-  withTime: 2000-01-01 01:01:01,
-  withTimeZeroSeconds: 2000-01-01 01:01,
-  withTimeMilliSeconds: 2000-01-01 01:01:01.999
+  noTime: 2000-01-01 Utc,
+  withTime: 2000-01-01 01:01:01 Utc,
+  withTimeZeroSeconds: 2000-01-01 01:01 Utc,
+  withTimeMilliSeconds: 2000-01-01 01:01:01.999 Utc
 }
diff --git a/src/Verify.Tests/Serialization/SerializationTests.DontScrubDateTimes.verified.txt b/src/Verify.Tests/Serialization/SerializationTests.DontScrubDateTimes.verified.txt
@@ -1,3 +1,3 @@
 {
-  Date: 2020-10-10
+  Date: 2020-10-10 Utc
 }
diff --git a/src/Verify.Tests/Serialization/SerializationTests.DontScrubDateTimesFluent.verified.txt b/src/Verify.Tests/Serialization/SerializationTests.DontScrubDateTimesFluent.verified.txt
@@ -1,3 +1,3 @@
 {
-  Date: 2020-10-10
+  Date: 2020-10-10 Utc
 }
diff --git a/src/Verify.Tests/SimpleTypeTests.DateTimeWrappedInTask.verified.txt b/src/Verify.Tests/SimpleTypeTests.DateTimeWrappedInTask.verified.txt
@@ -1 +1 @@
-2000-01-01 01:01:01
+2000-01-01 01:01:01 Utc
diff --git a/src/Verify.Tests/SimpleTypeTests.Run_arg=System.DateTime.verified.txt b/src/Verify.Tests/SimpleTypeTests.Run_arg=System.DateTime.verified.txt
@@ -1 +1 @@
-2000-01-01 01:01:01
+2000-01-01 01:01:01 Utc
diff --git a/src/Verify.Tests/SimpleTypeTests.Run_arg=System.DateTimeOffset.verified.txt b/src/Verify.Tests/SimpleTypeTests.Run_arg=System.DateTimeOffset.verified.txt
@@ -1 +1 @@
-2000-01-01 00:01:01.001
+2000-01-01 00:01:01.001 +0
diff --git a/src/Verify/Serialization/DateFormatter.cs b/src/Verify/Serialization/DateFormatter.cs
@@ -1,6 +1,13 @@
 static class DateFormatter
 {
     public static string ToJsonString(DateTimeOffset value)
+    {
+        var result = GetJsonDatePart(value);
+        result += $" {GetDateOffset(value)}";
+        return result;
+    }
+
+    static string GetJsonDatePart(DateTimeOffset value)
     {
         if (value.TimeOfDay == TimeSpan.Zero)
         {
@@ -21,6 +28,14 @@ public static string ToJsonString(DateTimeOffset value)
     }
 
     public static string ToParameterString(DateTimeOffset value)
+    {
+        var result = GetParameterDatePart(value);
+        result += GetDateOffset(value);
+
+        return result;
+    }
+
+    static string GetParameterDatePart(DateTimeOffset value)
     {
         if (value.TimeOfDay == TimeSpan.Zero)
         {
@@ -41,6 +56,18 @@ public static string ToParameterString(DateTimeOffset value)
     }
 
     public static string ToJsonString(DateTime value)
+    {
+        var result = GetJsonDatePart(value);
+
+        if (value.Kind != DateTimeKind.Unspecified)
+        {
+            result += $" {value.Kind}";
+        }
+
+        return result;
+    }
+
+    static string GetJsonDatePart(DateTime value)
     {
         if (value.TimeOfDay == TimeSpan.Zero)
         {
@@ -61,6 +88,18 @@ public static string ToJsonString(DateTime value)
     }
 
     public static string ToParameterString(DateTime value)
+    {
+        var result = GetParameterDatePart(value);
+
+        if (value.Kind != DateTimeKind.Unspecified)
+        {
+            result += value.Kind;
+        }
+
+        return result;
+    }
+
+    static string GetParameterDatePart(DateTime value)
     {
         if (value.TimeOfDay == TimeSpan.Zero)
         {
@@ -79,4 +118,31 @@ public static string ToParameterString(DateTime value)
 
         return value.ToString("yyyy-MM-ddTHH:mm:ss.FFFFFFF", CultureInfo.InvariantCulture);
     }
+
+    static string GetDateOffset(DateTimeOffset value)
+    {
+        var offset = value.Offset;
+
+        if (offset > TimeSpan.Zero)
+        {
+            if (offset.Minutes == 0)
+            {
+                return $"+{offset.TotalHours:0}";
+            }
+
+            return $"+{offset.Hours:0}:{offset.Minutes:00}";
+        }
+
+        if (offset < TimeSpan.Zero)
+        {
+            if (offset.Minutes == 0)
+            {
+                return $"-{offset.Hours:0}";
+            }
+
+            return $"-{offset.Hours:0}:{offset.Minutes:00}";
+        }
+
+        return "+0";
+    }
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2000-01-01 00:01:01.001
		2000-01-01 00:01:01.001 +0