More offset stuff (#679)

docs/mdsource/upgrade17-18.source.md

@@ -140,25 +140,6 @@ Will now become:
 This rename should be automatically handled when a pending change is accepted.
 
 
-## Change in date format
-
-Date formats have changed to include the kind and simplify the offset
-
-Before
-
-```
-2000-01-01T01:01
-```
-
-After
-
-```
-2000-01-01 01:01 +11 Local
-```
-
-So snapshots containing dates will need to be re-verified.
-
-
 ## Dictionary order
 
 Previously no order was applied to `IDictionary` members. This proved problematic since the order is not guaranteed.

docs/upgrade17-18.md

@@ -147,25 +147,6 @@ Will now become:
 This rename should be automatically handled when a pending change is accepted.
 
 
-## Change in date format
-
-Date formats have changed to include the kind and simplify the offset
-
-Before
-
-```
-2000-01-01T01:01
-```
-
-After
-
-```
-2000-01-01 01:01 +11 Local
-```
-
-So snapshots containing dates will need to be re-verified.
-
-
 ## Dictionary order
 
 Previously no order was applied to `IDictionary` members. This proved problematic since the order is not guaranteed.

src/StrictJsonTests/SerializationTests.DatetimeOffsetScrubbingDisabled.verified.json

@@ -1,6 +1,6 @@
 {
-  "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"
+  "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"
 }

src/StrictJsonTests/SerializationTests.DatetimeScrubbingDisabled.verified.json

@@ -1,6 +1,6 @@
 {
-  "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"
+  "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"
 }

src/StrictJsonTests/SerializationTests.DontScrubDateTimes.verified.json

@@ -1,3 +1,3 @@
 {
-  "Date": "2020-10-10 Utc"
+  "Date": "2020-10-10"
 }

src/StrictJsonTests/SerializationTests.DontScrubDateTimesFluent.verified.json

@@ -1,3 +1,3 @@
 {
-  "Date": "2020-10-10 Utc"
+  "Date": "2020-10-10"
 }

src/Verify.Tests/DateFormatterTests.DateTimeLocalToParameterString.verified.txt

@@ -0,0 +1 @@
+2000-10-01

src/Verify.Tests/DateFormatterTests.DateTimeOffsetLocalToJsonString.verified.txt

@@ -0,0 +1 @@
+2000-10-01

src/Verify.Tests/DateFormatterTests.DateTimeOffsetLocalToParameterString.verified.txt

@@ -0,0 +1 @@
+2000-10-01

src/Verify.Tests/DateFormatterTests.DateTimeOffsetUtcToJsonString.verified.txt

@@ -0,0 +1 @@
+2000-10-01

src/Verify.Tests/DateFormatterTests.DateTimeOffsetUtcToParameterString.verified.txt

@@ -0,0 +1 @@
+2000-10-01

src/Verify.Tests/DateFormatterTests.DateTimeOtherTimeZoneToJsonString.verified.txt

@@ -0,0 +1 @@
+2000-10-01

src/Verify.Tests/DateFormatterTests.DateTimeOtherTimeZoneToParameterString.verified.txt

@@ -0,0 +1 @@
+2000-10-01

src/Verify.Tests/DateFormatterTests.DateTimeUnspecifiedToJsonString.verified.txt

@@ -0,0 +1 @@
+2000-10-01

src/Verify.Tests/DateFormatterTests.DateTimeUnspecifiedToParameterString.verified.txt

@@ -0,0 +1 @@
+2000-10-01

src/Verify.Tests/DateFormatterTests.DateTimeUtcToJsonString.verified.txt

@@ -0,0 +1 @@
+2000-10-01

src/Verify.Tests/DateFormatterTests.DateTimeUtcToParameterString.verified.txt

@@ -0,0 +1 @@
+2000-10-01

src/Verify.Tests/DateFormatterTests.cs

@@ -0,0 +1,87 @@
+[UsesVerify]
+public class DateFormatterTests
+{
+    [Fact]
+    public Task DateTimeOtherTimeZoneToJsonString()
+    {
+        var date = new DateTimeOffset(2000, 10, 1, 0, 0, 0, TimeSpan.FromHours(1.5));
+        return Verify(DateFormatter.ToJsonString(date));
+    }
+
+    [Fact]
+    public Task DateTimeOtherTimeZoneToParameterString()
+    {
+        var date = new DateTimeOffset(2000, 10, 1, 0, 0, 0, TimeSpan.FromHours(1.5));
+        return Verify(DateFormatter.ToParameterString(date));
+    }
+
+    [Fact]
+    public Task DateTimeLocalToJsonString()
+    {
+        var date = new DateTime(2000, 10, 1, 0, 0, 0, DateTimeKind.Local);
+        return Verify(DateFormatter.ToJsonString(date));
+    }
+
+    [Fact]
+    public Task DateTimeLocalToParameterString()
+    {
+        var date = new DateTime(2000, 10, 1, 0, 0, 0, DateTimeKind.Local);
+        return Verify(DateFormatter.ToParameterString(date));
+    }
+
+    [Fact]
+    public Task DateTimeOffsetLocalToJsonString()
+    {
+        var date = new DateTimeOffset(2000, 10, 1, 0, 0, 0, DateTimeOffset.Now.Offset);
+        return Verify(DateFormatter.ToJsonString(date));
+    }
+
+    [Fact]
+    public Task DateTimeOffsetLocalToParameterString()
+    {
+        var date = new DateTimeOffset(2000, 10, 1, 0, 0, 0, DateTimeOffset.Now.Offset);
+        return Verify(DateFormatter.ToParameterString(date));
+    }
+
+    [Fact]
+    public Task DateTimeUnspecifiedToJsonString()
+    {
+        var dateTime = new DateTime(2000, 10, 1, 0, 0, 0);
+        return Verify(DateFormatter.ToJsonString(dateTime));
+    }
+
+    [Fact]
+    public Task DateTimeUnspecifiedToParameterString()
+    {
+        var dateTime = new DateTime(2000, 10, 1, 0, 0, 0);
+        return Verify(DateFormatter.ToParameterString(dateTime));
+    }
+
+    [Fact]
+    public Task DateTimeUtcToJsonString()
+    {
+        var dateTime = new DateTime(2000, 10, 1, 0, 0, 0, DateTimeKind.Utc);
+        return Verify(DateFormatter.ToJsonString(dateTime));
+    }
+
+    [Fact]
+    public Task DateTimeUtcToParameterString()
+    {
+        var dateTime = new DateTime(2000, 10, 1, 0, 0, 0, DateTimeKind.Utc);
+        return Verify(DateFormatter.ToParameterString(dateTime));
+    }
+
+    [Fact]
+    public Task DateTimeOffsetUtcToJsonString()
+    {
+        var date = new DateTimeOffset(2000, 10, 1, 0, 0, 0, TimeSpan.Zero);
+        return Verify(DateFormatter.ToJsonString(date));
+    }
+
+    [Fact]
+    public Task DateTimeOffsetUtcToParameterString()
+    {
+        var date = new DateTimeOffset(2000, 10, 1, 0, 0, 0, TimeSpan.Zero);
+        return Verify(DateFormatter.ToParameterString(date));
+    }
+}

src/Verify.Tests/Naming/NameForParameterTests.DateTimeLocal.verified.txt

@@ -0,0 +1 @@
+2000-10-01

src/Verify.Tests/Naming/NameForParameterTests.DateTimeOffsetLocal.verified.txt

@@ -0,0 +1 @@
+2000-10-01

src/Verify.Tests/Naming/NameForParameterTests.DateTimeOffsetUtc.verified.txt

@@ -0,0 +1 @@
+2000-10-01

src/Verify.Tests/Naming/NameForParameterTests.DateTimeUnspecified.verified.txt

@@ -0,0 +1 @@
+2000-10-01

src/Verify.Tests/Naming/NameForParameterTests.DateTimeUtc.verified.txt

@@ -0,0 +1 @@
+2000-10-01

src/Verify.Tests/Naming/NameForParameterTests.cs

@@ -30,17 +30,38 @@ public Task Time() =>
 #endif
 
     [Fact]
-    public Task DateTime()
+    public Task DateTimeLocal()
     {
-        var dateTime = new DateTime(2000, 10, 1, 0, 0, 0, DateTimeKind.Utc);
-        return Verify(VerifierSettings.GetNameForParameter(dateTime));
+        var date = new DateTime(2000, 10, 1, 0, 0, 0, DateTimeKind.Local);
+        return Verify(VerifierSettings.GetNameForParameter(date));
     }
 
     [Fact]
-    public Task DateTimeOffset()
+    public Task DateTimeOffsetLocal()
     {
-        var dateTime = new DateTime(2000, 10, 1, 0, 0, 0, DateTimeKind.Utc);
-        return Verify(VerifierSettings.GetNameForParameter(new DateTimeOffset(dateTime)));
+        var date = new DateTimeOffset(2000, 10, 1, 0, 0, 0, DateTimeOffset.Now.Offset);
+        return Verify(VerifierSettings.GetNameForParameter(date));
+    }
+
+    [Fact]
+    public Task DateTimeUnspecified()
+    {
+        var date = new DateTime(2000, 10, 1, 0, 0, 0);
+        return Verify(VerifierSettings.GetNameForParameter(date));
+    }
+
+    [Fact]
+    public Task DateTimeUtc()
+    {
+        var date = new DateTime(2000, 10, 1, 0, 0, 0, DateTimeKind.Utc);
+        return Verify(VerifierSettings.GetNameForParameter(date));
+    }
+
+    [Fact]
+    public Task DateTimeOffsetUtc()
+    {
+        var date = new DateTimeOffset(2000, 10, 1, 0, 0, 0,TimeSpan.Zero);
+        return Verify(VerifierSettings.GetNameForParameter(date));
     }
 
     [Fact]

src/Verify.Tests/Serialization/SerializationTests.DatetimeOffsetScrubbingDisabled.verified.txt

@@ -1,6 +1,6 @@
 {
-  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
+  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
 }

src/Verify.Tests/Serialization/SerializationTests.DatetimeScrubbingDisabled.verified.txt

@@ -1,6 +1,6 @@
 {
-  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
+  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
 }

src/Verify.Tests/Serialization/SerializationTests.DontScrubDateTimes.verified.txt

@@ -1,3 +1,3 @@
 {
-  Date: 2020-10-10 Utc
+  Date: 2020-10-10
 }

src/Verify.Tests/Serialization/SerializationTests.DontScrubDateTimesFluent.verified.txt

@@ -1,3 +1,3 @@
 {
-  Date: 2020-10-10 Utc
+  Date: 2020-10-10
 }

src/Verify.Tests/SimpleTypeTests.DateTimeWrappedInTask.verified.txt

@@ -1 +1 @@
-2000-01-01 01:01:01 Utc
+2000-01-01 01:01:01

src/Verify.Tests/SimpleTypeTests.Run_arg=System.DateTime.verified.txt

@@ -1 +1 @@
-2000-01-01 01:01:01 Utc
+2000-01-01 01:01:01