Merge branch 'master' of https://github.com/ServiceStack/ServiceStack.Text

Author: mythz

src/ServiceStack.Text/Common/DateTimeSerializer.cs

@@ -45,7 +45,7 @@ public static class DateTimeSerializer
         private const char XsdTimeSeparator = 'T';
         private static readonly int XsdTimeSeparatorIndex = XsdDateTimeFormat.IndexOf(XsdTimeSeparator);
         private const string XsdUtcSuffix = "Z";
-        private static readonly char[] DateTimeSeperators = new[] { '-', '/' };
+        private static readonly char[] DateTimeSeparators = { '-', '/' };
         private static readonly Regex UtcOffsetInfoRegex = new Regex("([+-](?:2[0-3]|[0-1][0-9]):[0-5][0-9])", PclExport.Instance.RegexOptions);
         public static Func<string, Exception, DateTime> OnParseErrorFn { get; set; }
 
@@ -100,7 +100,8 @@ public static DateTime ParseShortestXsdDateTime(string dateTimeStr)
                     return unspecifiedDate.Prepare();
                 }
 
-                if (dateTimeStr.Length == DefaultDateTimeFormatWithFraction.Length)
+                var hasUtcSuffix = dateTimeStr.EndsWith(XsdUtcSuffix);
+                if (!hasUtcSuffix && dateTimeStr.Length == DefaultDateTimeFormatWithFraction.Length)
                 {
                     var unspecifiedDate = config.AssumeUtc
                         ? DateTime.Parse(dateTimeStr, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal)
@@ -109,7 +110,9 @@ public static DateTime ParseShortestXsdDateTime(string dateTimeStr)
                     return unspecifiedDate.Prepare();
                 }
 
-                var kind = DateTimeKind.Unspecified;
+                var kind = hasUtcSuffix
+                    ? DateTimeKind.Utc
+                    : DateTimeKind.Unspecified;
                 switch (config.DateHandler)
                 {
                     case DateHandler.UnixTime:
@@ -135,7 +138,7 @@ public static DateTime ParseShortestXsdDateTime(string dateTimeStr)
 
                 if (dateTimeStr.Length >= XsdDateTimeFormat3F.Length
                     && dateTimeStr.Length <= XsdDateTimeFormat.Length
-                    && dateTimeStr.EndsWith(XsdUtcSuffix))
+                    && hasUtcSuffix)
                 {
                     var dateTime = Env.IsMono ? ParseManual(dateTimeStr) : null;
                     if (dateTime != null)
@@ -144,7 +147,7 @@ public static DateTime ParseShortestXsdDateTime(string dateTimeStr)
                     return PclExport.Instance.ParseXsdDateTimeAsUtc(dateTimeStr);
                 }
 
-                if (dateTimeStr.Length == CondensedDateTimeFormat.Length && dateTimeStr.IndexOfAny(DateTimeSeperators) == -1)
+                if (dateTimeStr.Length == CondensedDateTimeFormat.Length && dateTimeStr.IndexOfAny(DateTimeSeparators) == -1)
                 {
                     return DateTime.ParseExact(dateTimeStr, "yyyyMMdd", CultureInfo.InvariantCulture, DateTimeStyles.None);
                 }
@@ -164,12 +167,14 @@ public static DateTime ParseShortestXsdDateTime(string dateTimeStr)
                 {
                     if (config.SkipDateTimeConversion)
                     {
-                        return DateTime.Parse(dateTimeStr, null,
-                            kind == DateTimeKind.Unspecified
-                                ? DateTimeStyles.None
-                                : kind == DateTimeKind.Local
-                                    ? DateTimeStyles.AssumeLocal
-                                    : DateTimeStyles.AssumeUniversal);
+                        var dateTimeStyle = kind == DateTimeKind.Unspecified
+                            ? DateTimeStyles.None
+                            : kind == DateTimeKind.Local
+                                ? DateTimeStyles.AssumeLocal
+                                : DateTimeStyles.AssumeUniversal;
+                        if (config.AlwaysUseUtc)
+                            dateTimeStyle |= DateTimeStyles.AdjustToUniversal;
+                        return DateTime.Parse(dateTimeStr, null, dateTimeStyle);
                     }
 
                     var assumeKind = config.AssumeUtc ? DateTimeStyles.AssumeUniversal : DateTimeStyles.AssumeLocal;

tests/ServiceStack.Text.Tests/JsonTests/JsonDateTimeTests.cs

@@ -452,7 +452,7 @@ public void Can_deserialize_json_date_iso8601_with_skipDateTimeConversion_true()
 
             using (JsConfig.With(new Config { AlwaysUseUtc = true }))
             {
-                Assert.AreEqual(DateTimeKind.Local, JsonSerializer.DeserializeFromString<Utils.DateTimeISO8601Tests.TestObject>(JsonSerializer.SerializeToString<Utils.DateTimeISO8601Tests.TestObject>(testObject)).Date.Kind);
+                Assert.AreEqual(DateTimeKind.Utc, JsonSerializer.DeserializeFromString<Utils.DateTimeISO8601Tests.TestObject>(JsonSerializer.SerializeToString<Utils.DateTimeISO8601Tests.TestObject>(testObject)).Date.Kind);
             }
             using (JsConfig.With(new Config { AlwaysUseUtc = true, SkipDateTimeConversion = false }))
             {

tests/ServiceStack.Text.Tests/Utils/DateTimeSerializerTests.cs

@@ -443,7 +443,7 @@ public void DateTimeKind_Does_Not_Change_With_SkipDateTimeConversion_true()
 
             using (JsConfig.With(new Config { AlwaysUseUtc = true }))
             {
-                Assert.AreEqual(DateTimeKind.Local, TypeSerializer.DeserializeFromString<TestObject>(TypeSerializer.SerializeToString<TestObject>(testObject)).Date.Kind);
+                Assert.AreEqual(DateTimeKind.Utc, TypeSerializer.DeserializeFromString<TestObject>(TypeSerializer.SerializeToString<TestObject>(testObject)).Date.Kind);
             }
             using (JsConfig.With(new Config { AlwaysUseUtc = true, SkipDateTimeConversion = false }))
             {
@@ -776,23 +776,33 @@ public void Does_not_lose_precision()
     }
 
     [TestFixture]
-    public class UnixTimeScopeTests
+    public class ScopedDateTimeTests
     {
         [Test]
         public void Does_serialize_to_UnixTime_when_scoped()
         {
             var dto = new TestObject { Date = new DateTime(2001, 01, 01, 0, 0, 0, DateTimeKind.Utc) };
 
-            using (var config = JsConfig.BeginScope())
-            {
-                config.DateHandler = DateHandler.UnixTime;
+            using var config = JsConfig.With(new Config { DateHandler = DateHandler.UnixTime });
+            var json = dto.ToJson();
+            Assert.That(json, Is.EquivalentTo("{\"Date\":978307200}"));
 
-                var json = dto.ToJson();
-                Assert.That(json, Is.EquivalentTo("{\"Date\":978307200}"));
+            var fromJson = JsonSerializer.DeserializeFromString<TestObject>(json);
+            Assert.That(fromJson.Date, Is.EqualTo(dto.Date));
+        }
 
-                var fromJson = JsonSerializer.DeserializeFromString<TestObject>(json);
-                Assert.That(fromJson.Date, Is.EqualTo(dto.Date));
-            }
+        [Test]
+        [TestCase("2020-08-07T09:36:20.960Z")]
+        [TestCase("2020-08-07T09:36:20.96Z")]
+        [TestCase("2020-08-07T09:36:20.9Z")]
+        [TestCase("2020-08-07T09:36:20Z")]
+        public void Does_preserve_UTC_timezone_with_all_fractions(string dateFmt)
+        {
+            using var scope = JsConfig.CreateScope("AssumeUtc:false,AlwaysUseUtc:true,SkipDateTimeConversion:true");
+            var date = JsonSerializer.DeserializeFromString<DateTime>(dateFmt);
+            Assert.That(date.Kind, Is.EqualTo(DateTimeKind.Utc));
+            Assert.That(date, Is.EqualTo(new DateTime(2020, 08, 07, 9, 36, 20))
+                .Within(TimeSpan.FromSeconds(1)));
         }
     }
 }