From aa4062d586d4552a375bf3d80d60b00dcc71e258 Mon Sep 17 00:00:00 2001 From: bocus Date: Mon, 21 May 2018 01:06:37 +0300 Subject: [PATCH] correct naming (#1696) --- .../Converters/UnixDateTimeConverterTests.cs | 4 ++-- .../Converters/UnixDateTimeConverter.cs | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Src/Newtonsoft.Json.Tests/Converters/UnixDateTimeConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/UnixDateTimeConverterTests.cs index a9b3cb87..638c7484 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/UnixDateTimeConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/UnixDateTimeConverterTests.cs @@ -55,11 +55,11 @@ namespace Newtonsoft.Json.Tests.Converters public void SerializeDateTimeNow() { DateTime now = DateTime.Now; - long nowTicks = (long)(now.ToUniversalTime() - new DateTime(1970, 1, 1)).TotalSeconds; + long nowSeconds = (long)(now.ToUniversalTime() - new DateTime(1970, 1, 1)).TotalSeconds; string result = JsonConvert.SerializeObject(now, new UnixDateTimeConverter()); - Assert.AreEqual(nowTicks + "", result); + Assert.AreEqual(nowSeconds + "", result); } [Test] diff --git a/Src/Newtonsoft.Json/Converters/UnixDateTimeConverter.cs b/Src/Newtonsoft.Json/Converters/UnixDateTimeConverter.cs index 3e3feb6e..c5b03bb5 100644 --- a/Src/Newtonsoft.Json/Converters/UnixDateTimeConverter.cs +++ b/Src/Newtonsoft.Json/Converters/UnixDateTimeConverter.cs @@ -44,16 +44,16 @@ namespace Newtonsoft.Json.Converters /// The calling serializer. public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) { - long ticks; + long seconds; if (value is DateTime dateTime) { - ticks = (long)(dateTime.ToUniversalTime() - UnixEpoch).TotalSeconds; + seconds = (long)(dateTime.ToUniversalTime() - UnixEpoch).TotalSeconds; } #if HAVE_DATE_TIME_OFFSET else if (value is DateTimeOffset dateTimeOffset) { - ticks = (long)(dateTimeOffset.ToUniversalTime() - UnixEpoch).TotalSeconds; + seconds = (long)(dateTimeOffset.ToUniversalTime() - UnixEpoch).TotalSeconds; } #endif else @@ -61,12 +61,12 @@ namespace Newtonsoft.Json.Converters throw new JsonSerializationException("Expected date object value."); } - if (ticks < 0) + if (seconds < 0) { throw new JsonSerializationException("Cannot convert date value that is before Unix epoch of 00:00:00 UTC on 1 January 1970."); } - writer.WriteValue(ticks); + writer.WriteValue(seconds); } /// @@ -90,15 +90,15 @@ namespace Newtonsoft.Json.Converters return null; } - long ticks; + long seconds; if (reader.TokenType == JsonToken.Integer) { - ticks = (long)reader.Value; + seconds = (long)reader.Value; } else if (reader.TokenType == JsonToken.String) { - if (!long.TryParse((string)reader.Value, out ticks)) + if (!long.TryParse((string)reader.Value, out seconds)) { throw JsonSerializationException.Create(reader, "Cannot convert invalid value to {0}.".FormatWith(CultureInfo.InvariantCulture, objectType)); } @@ -108,9 +108,9 @@ namespace Newtonsoft.Json.Converters throw JsonSerializationException.Create(reader, "Unexpected token parsing date. Expected Integer or String, got {0}.".FormatWith(CultureInfo.InvariantCulture, reader.TokenType)); } - if (ticks >= 0) + if (seconds >= 0) { - DateTime d = UnixEpoch.AddSeconds(ticks); + DateTime d = UnixEpoch.AddSeconds(seconds); #if HAVE_DATE_TIME_OFFSET Type t = (nullable)