From 6795ca55f474913b80e31c5088df4642f56e6068 Mon Sep 17 00:00:00 2001 From: VereshchaginKonstantin Date: Fri, 20 Nov 2020 07:21:00 +0300 Subject: [PATCH] Fixed tests to work in Moscow, Russia UTC+3 timezone. (#2416) --- Src/Newtonsoft.Json.Tests/JsonConvertTest.cs | 8 ++++---- .../Serialization/JsonSerializerTest.cs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs b/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs index 220ec5c3..3c137064 100644 --- a/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs +++ b/Src/Newtonsoft.Json.Tests/JsonConvertTest.cs @@ -792,13 +792,13 @@ namespace Newtonsoft.Json.Tests Assert.AreEqual(@"\/Date(" + DateTimeUtils.ConvertDateTimeToJavaScriptTicks(millisecondsLocal) + GetOffset(millisecondsLocal, DateFormatHandling.MicrosoftDateFormat) + @")\/", result.MsDateUnspecified); Assert.AreEqual(@"\/Date(" + DateTimeUtils.ConvertDateTimeToJavaScriptTicks(millisecondsLocal) + @")\/", result.MsDateUtc); - DateTime ticksLocal = new DateTime(634663873826822481, DateTimeKind.Local); + DateTime ticksLocal = new DateTime(636556897826822481, DateTimeKind.Local); localToUtcDate = ticksLocal.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.FFFFFFFK"); result = TestDateTime("DateTime Local with ticks", ticksLocal); - Assert.AreEqual("2012-03-03T16:03:02.6822481" + GetOffset(ticksLocal, DateFormatHandling.IsoDateFormat), result.IsoDateRoundtrip); - Assert.AreEqual("2012-03-03T16:03:02.6822481" + GetOffset(ticksLocal, DateFormatHandling.IsoDateFormat), result.IsoDateLocal); - Assert.AreEqual("2012-03-03T16:03:02.6822481", result.IsoDateUnspecified); + Assert.AreEqual("2018-03-03T16:03:02.6822481" + GetOffset(ticksLocal, DateFormatHandling.IsoDateFormat), result.IsoDateRoundtrip); + Assert.AreEqual("2018-03-03T16:03:02.6822481" + GetOffset(ticksLocal, DateFormatHandling.IsoDateFormat), result.IsoDateLocal); + Assert.AreEqual("2018-03-03T16:03:02.6822481", result.IsoDateUnspecified); Assert.AreEqual(localToUtcDate, result.IsoDateUtc); Assert.AreEqual(@"\/Date(" + DateTimeUtils.ConvertDateTimeToJavaScriptTicks(ticksLocal) + GetOffset(ticksLocal, DateFormatHandling.MicrosoftDateFormat) + @")\/", result.MsDateRoundtrip); Assert.AreEqual(@"\/Date(" + DateTimeUtils.ConvertDateTimeToJavaScriptTicks(ticksLocal) + GetOffset(ticksLocal, DateFormatHandling.MicrosoftDateFormat) + @")\/", result.MsDateLocal); diff --git a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs index 12a7137a..2ffbd2a0 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs @@ -6342,8 +6342,8 @@ Path '', line 1, position 1."); { IDictionary dic1 = new Dictionary { - { new DateTime(2000, 12, 12, 12, 12, 12, DateTimeKind.Utc), 1 }, - { new DateTime(2013, 12, 12, 12, 12, 12, DateTimeKind.Utc), 2 } + { new DateTime(2020, 12, 12, 12, 12, 12, DateTimeKind.Utc), 1 }, + { new DateTime(2023, 12, 12, 12, 12, 12, DateTimeKind.Utc), 2 } }; string json = JsonConvert.SerializeObject(dic1, Formatting.Indented, new JsonSerializerSettings @@ -6361,8 +6361,8 @@ Path '', line 1, position 1."); }); Assert.AreEqual(2, dic2.Count); - Assert.AreEqual(1, dic2[new DateTime(2000, 12, 12, 12, 12, 12, DateTimeKind.Utc)]); - Assert.AreEqual(2, dic2[new DateTime(2013, 12, 12, 12, 12, 12, DateTimeKind.Utc)]); + Assert.AreEqual(1, dic2[new DateTime(2020, 12, 12, 12, 12, 12, DateTimeKind.Utc)]); + Assert.AreEqual(2, dic2[new DateTime(2023, 12, 12, 12, 12, 12, DateTimeKind.Utc)]); } [Test]