-Code reformat
This commit is contained in:
@@ -39,188 +39,188 @@ using Newtonsoft.Json.Utilities;
|
||||
|
||||
namespace Newtonsoft.Json.Tests.Utilities
|
||||
{
|
||||
[TestFixture]
|
||||
public class DateTimeUtilsTests : TestFixtureBase
|
||||
{
|
||||
[Test]
|
||||
public void RoundTripDateTimeMinAndMax()
|
||||
[TestFixture]
|
||||
public class DateTimeUtilsTests : TestFixtureBase
|
||||
{
|
||||
RoundtripDateIso(DateTime.MinValue);
|
||||
RoundtripDateIso(DateTime.MaxValue);
|
||||
}
|
||||
[Test]
|
||||
public void RoundTripDateTimeMinAndMax()
|
||||
{
|
||||
RoundtripDateIso(DateTime.MinValue);
|
||||
RoundtripDateIso(DateTime.MaxValue);
|
||||
}
|
||||
|
||||
private static void RoundtripDateIso(DateTime value)
|
||||
{
|
||||
StringWriter sw = new StringWriter();
|
||||
DateTimeUtils.WriteDateTimeString(sw, value, DateFormatHandling.IsoDateFormat, null, CultureInfo.InvariantCulture);
|
||||
string minDateText = sw.ToString();
|
||||
private static void RoundtripDateIso(DateTime value)
|
||||
{
|
||||
StringWriter sw = new StringWriter();
|
||||
DateTimeUtils.WriteDateTimeString(sw, value, DateFormatHandling.IsoDateFormat, null, CultureInfo.InvariantCulture);
|
||||
string minDateText = sw.ToString();
|
||||
|
||||
object dt;
|
||||
DateTimeUtils.TryParseDateIso(minDateText, DateParseHandling.DateTime, DateTimeZoneHandling.RoundtripKind, out dt);
|
||||
object dt;
|
||||
DateTimeUtils.TryParseDateIso(minDateText, DateParseHandling.DateTime, DateTimeZoneHandling.RoundtripKind, out dt);
|
||||
|
||||
DateTime parsedDt = (DateTime) dt;
|
||||
Assert.AreEqual(value, parsedDt);
|
||||
}
|
||||
DateTime parsedDt = (DateTime)dt;
|
||||
Assert.AreEqual(value, parsedDt);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void NewDateTimeParse()
|
||||
{
|
||||
AssertNewDateTimeParseEqual("999x-12-31T23:59:59");
|
||||
AssertNewDateTimeParseEqual("9999x12-31T23:59:59");
|
||||
AssertNewDateTimeParseEqual("9999-1x-31T23:59:59");
|
||||
AssertNewDateTimeParseEqual("9999-12x31T23:59:59");
|
||||
AssertNewDateTimeParseEqual("9999-12-3xT23:59:59");
|
||||
AssertNewDateTimeParseEqual("9999-12-31x23:59:59");
|
||||
AssertNewDateTimeParseEqual("9999-12-31T2x:59:59");
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23x59:59");
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:5x:59");
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:59x59");
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:59:5x");
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:59:5");
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:59:59.x");
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:59:59.99999999");
|
||||
//AssertNewDateTimeParseEqual("9999-12-31T23:59:59.", null); // DateTime.TryParse is bugged and should return null
|
||||
[Test]
|
||||
public void NewDateTimeParse()
|
||||
{
|
||||
AssertNewDateTimeParseEqual("999x-12-31T23:59:59");
|
||||
AssertNewDateTimeParseEqual("9999x12-31T23:59:59");
|
||||
AssertNewDateTimeParseEqual("9999-1x-31T23:59:59");
|
||||
AssertNewDateTimeParseEqual("9999-12x31T23:59:59");
|
||||
AssertNewDateTimeParseEqual("9999-12-3xT23:59:59");
|
||||
AssertNewDateTimeParseEqual("9999-12-31x23:59:59");
|
||||
AssertNewDateTimeParseEqual("9999-12-31T2x:59:59");
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23x59:59");
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:5x:59");
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:59x59");
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:59:5x");
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:59:5");
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:59:59.x");
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:59:59.99999999");
|
||||
//AssertNewDateTimeParseEqual("9999-12-31T23:59:59.", null); // DateTime.TryParse is bugged and should return null
|
||||
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03.055Z");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03.055");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03.055+00:00");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03.055+23:30");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03.055-23:30");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03.055+11:30");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03.055-11:30");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03.055Z");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03.055");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03.055+00:00");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03.055+23:30");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03.055-23:30");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03.055+11:30");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03.055-11:30");
|
||||
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03Z");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03+00:00");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03+23:30");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03-23:30");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03+11:30");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03-11:30");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03Z");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03+00:00");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03+23:30");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03-23:30");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03+11:30");
|
||||
AssertNewDateTimeParseEqual("2000-12-15T22:11:03-11:30");
|
||||
|
||||
AssertNewDateTimeParseEqual("0001-01-01T00:00:00Z");
|
||||
AssertNewDateTimeParseEqual("0001-01-01T00:00:00"); // this is DateTime.MinDate
|
||||
//AssertNewDateTimeParseEqual("0001-01-01T00:00:00+00:00"); // when the timezone is negative then this breaks
|
||||
//AssertNewDateTimeParseEqual("0001-01-01T00:00:00+23:30"); // I don't know why a different value is returned from DateTime.TryParse, I think it is a bug in .NET
|
||||
AssertNewDateTimeParseEqual("0001-01-01T00:00:00-23:30");
|
||||
//AssertNewDateTimeParseEqual("0001-01-01T00:00:00+11:30"); // when the timezone is negative then this breaks
|
||||
AssertNewDateTimeParseEqual("0001-01-01T00:00:00-12:00");
|
||||
AssertNewDateTimeParseEqual("0001-01-01T00:00:00Z");
|
||||
AssertNewDateTimeParseEqual("0001-01-01T00:00:00"); // this is DateTime.MinDate
|
||||
//AssertNewDateTimeParseEqual("0001-01-01T00:00:00+00:00"); // when the timezone is negative then this breaks
|
||||
//AssertNewDateTimeParseEqual("0001-01-01T00:00:00+23:30"); // I don't know why a different value is returned from DateTime.TryParse, I think it is a bug in .NET
|
||||
AssertNewDateTimeParseEqual("0001-01-01T00:00:00-23:30");
|
||||
//AssertNewDateTimeParseEqual("0001-01-01T00:00:00+11:30"); // when the timezone is negative then this breaks
|
||||
AssertNewDateTimeParseEqual("0001-01-01T00:00:00-12:00");
|
||||
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:59:59.9999999Z");
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:59:59.9999999"); // this is DateTime.MaxDate
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:59:59.9999999+00:00", DateTime.MaxValue); // DateTime.TryParse fails instead of returning MaxDate in some timezones
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:59:59.9999999+23:30");
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:59:59.9999999-23:30", DateTime.MaxValue); // DateTime.TryParse fails instead of returning MaxDate in some timezones
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:59:59.9999999+11:30", DateTime.MaxValue); // DateTime.TryParse fails instead of returning MaxDate in some timezones
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:59:59.9999999-11:30", DateTime.MaxValue); // DateTime.TryParse fails instead of returning MaxDate in some timezones
|
||||
}
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:59:59.9999999Z");
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:59:59.9999999"); // this is DateTime.MaxDate
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:59:59.9999999+00:00", DateTime.MaxValue); // DateTime.TryParse fails instead of returning MaxDate in some timezones
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:59:59.9999999+23:30");
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:59:59.9999999-23:30", DateTime.MaxValue); // DateTime.TryParse fails instead of returning MaxDate in some timezones
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:59:59.9999999+11:30", DateTime.MaxValue); // DateTime.TryParse fails instead of returning MaxDate in some timezones
|
||||
AssertNewDateTimeParseEqual("9999-12-31T23:59:59.9999999-11:30", DateTime.MaxValue); // DateTime.TryParse fails instead of returning MaxDate in some timezones
|
||||
}
|
||||
|
||||
private void AssertNewDateTimeParseEqual(string text, object oldDate)
|
||||
{
|
||||
object oldDt;
|
||||
if (TryParseDateIso(text, DateParseHandling.DateTime, DateTimeZoneHandling.RoundtripKind, out oldDt))
|
||||
{
|
||||
oldDate = oldDt;
|
||||
}
|
||||
private void AssertNewDateTimeParseEqual(string text, object oldDate)
|
||||
{
|
||||
object oldDt;
|
||||
if (TryParseDateIso(text, DateParseHandling.DateTime, DateTimeZoneHandling.RoundtripKind, out oldDt))
|
||||
{
|
||||
oldDate = oldDt;
|
||||
}
|
||||
|
||||
object newDt;
|
||||
DateTimeUtils.TryParseDateIso(text, DateParseHandling.DateTime, DateTimeZoneHandling.RoundtripKind, out newDt);
|
||||
object newDt;
|
||||
DateTimeUtils.TryParseDateIso(text, DateParseHandling.DateTime, DateTimeZoneHandling.RoundtripKind, out newDt);
|
||||
|
||||
if (!Equals(oldDate, newDt))
|
||||
{
|
||||
Assert.AreEqual(oldDate, newDt, "DateTime parse not equal. Text: '{0}' Old ticks: {1} New ticks: {2}".FormatWith(
|
||||
CultureInfo.InvariantCulture,
|
||||
text,
|
||||
oldDate != null ? ((DateTime)oldDate).Ticks : (long?)null,
|
||||
newDt != null ? ((DateTime)newDt).Ticks : (long?)null
|
||||
));
|
||||
}
|
||||
}
|
||||
if (!Equals(oldDate, newDt))
|
||||
{
|
||||
Assert.AreEqual(oldDate, newDt, "DateTime parse not equal. Text: '{0}' Old ticks: {1} New ticks: {2}".FormatWith(
|
||||
CultureInfo.InvariantCulture,
|
||||
text,
|
||||
oldDate != null ? ((DateTime)oldDate).Ticks : (long?)null,
|
||||
newDt != null ? ((DateTime)newDt).Ticks : (long?)null
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
private void AssertNewDateTimeParseEqual(string text)
|
||||
{
|
||||
object oldDt;
|
||||
TryParseDateIso(text, DateParseHandling.DateTime, DateTimeZoneHandling.RoundtripKind, out oldDt);
|
||||
private void AssertNewDateTimeParseEqual(string text)
|
||||
{
|
||||
object oldDt;
|
||||
TryParseDateIso(text, DateParseHandling.DateTime, DateTimeZoneHandling.RoundtripKind, out oldDt);
|
||||
|
||||
AssertNewDateTimeParseEqual(text, oldDt);
|
||||
}
|
||||
AssertNewDateTimeParseEqual(text, oldDt);
|
||||
}
|
||||
|
||||
#if !NET20
|
||||
[Test]
|
||||
public void NewDateTimeOffsetParse()
|
||||
{
|
||||
AssertNewDateTimeOffsetParseEqual("0001-01-01T00:00:00");
|
||||
[Test]
|
||||
public void NewDateTimeOffsetParse()
|
||||
{
|
||||
AssertNewDateTimeOffsetParseEqual("0001-01-01T00:00:00");
|
||||
|
||||
AssertNewDateTimeOffsetParseEqual("2000-12-15T22:11:03.055Z");
|
||||
AssertNewDateTimeOffsetParseEqual("2000-12-15T22:11:03.055");
|
||||
AssertNewDateTimeOffsetParseEqual("2000-12-15T22:11:03.055+00:00");
|
||||
AssertNewDateTimeOffsetParseEqual("2000-12-15T22:11:03.055+13:30");
|
||||
AssertNewDateTimeOffsetParseEqual("2000-12-15T22:11:03.055-13:30");
|
||||
AssertNewDateTimeOffsetParseEqual("2000-12-15T22:11:03.055Z");
|
||||
AssertNewDateTimeOffsetParseEqual("2000-12-15T22:11:03.055");
|
||||
AssertNewDateTimeOffsetParseEqual("2000-12-15T22:11:03.055+00:00");
|
||||
AssertNewDateTimeOffsetParseEqual("2000-12-15T22:11:03.055+13:30");
|
||||
AssertNewDateTimeOffsetParseEqual("2000-12-15T22:11:03.055-13:30");
|
||||
|
||||
AssertNewDateTimeOffsetParseEqual("2000-12-15T22:11:03Z");
|
||||
AssertNewDateTimeOffsetParseEqual("2000-12-15T22:11:03");
|
||||
AssertNewDateTimeOffsetParseEqual("2000-12-15T22:11:03+00:00");
|
||||
AssertNewDateTimeOffsetParseEqual("2000-12-15T22:11:03+13:30");
|
||||
AssertNewDateTimeOffsetParseEqual("2000-12-15T22:11:03-13:30");
|
||||
AssertNewDateTimeOffsetParseEqual("2000-12-15T22:11:03Z");
|
||||
AssertNewDateTimeOffsetParseEqual("2000-12-15T22:11:03");
|
||||
AssertNewDateTimeOffsetParseEqual("2000-12-15T22:11:03+00:00");
|
||||
AssertNewDateTimeOffsetParseEqual("2000-12-15T22:11:03+13:30");
|
||||
AssertNewDateTimeOffsetParseEqual("2000-12-15T22:11:03-13:30");
|
||||
|
||||
AssertNewDateTimeOffsetParseEqual("0001-01-01T00:00:00Z");
|
||||
AssertNewDateTimeOffsetParseEqual("0001-01-01T00:00:00+00:00");
|
||||
AssertNewDateTimeOffsetParseEqual("0001-01-01T00:00:00+13:30");
|
||||
AssertNewDateTimeOffsetParseEqual("0001-01-01T00:00:00-13:30");
|
||||
AssertNewDateTimeOffsetParseEqual("0001-01-01T00:00:00Z");
|
||||
AssertNewDateTimeOffsetParseEqual("0001-01-01T00:00:00+00:00");
|
||||
AssertNewDateTimeOffsetParseEqual("0001-01-01T00:00:00+13:30");
|
||||
AssertNewDateTimeOffsetParseEqual("0001-01-01T00:00:00-13:30");
|
||||
|
||||
AssertNewDateTimeOffsetParseEqual("9999-12-31T23:59:59.9999999Z");
|
||||
AssertNewDateTimeOffsetParseEqual("9999-12-31T23:59:59.9999999");
|
||||
AssertNewDateTimeOffsetParseEqual("9999-12-31T23:59:59.9999999+00:00");
|
||||
AssertNewDateTimeOffsetParseEqual("9999-12-31T23:59:59.9999999+13:30");
|
||||
AssertNewDateTimeOffsetParseEqual("9999-12-31T23:59:59.9999999-13:30");
|
||||
}
|
||||
AssertNewDateTimeOffsetParseEqual("9999-12-31T23:59:59.9999999Z");
|
||||
AssertNewDateTimeOffsetParseEqual("9999-12-31T23:59:59.9999999");
|
||||
AssertNewDateTimeOffsetParseEqual("9999-12-31T23:59:59.9999999+00:00");
|
||||
AssertNewDateTimeOffsetParseEqual("9999-12-31T23:59:59.9999999+13:30");
|
||||
AssertNewDateTimeOffsetParseEqual("9999-12-31T23:59:59.9999999-13:30");
|
||||
}
|
||||
|
||||
private void AssertNewDateTimeOffsetParseEqual(string text)
|
||||
{
|
||||
object oldDt;
|
||||
object newDt;
|
||||
TryParseDateIso(text, DateParseHandling.DateTimeOffset, DateTimeZoneHandling.Unspecified, out oldDt);
|
||||
DateTimeUtils.TryParseDateIso(text, DateParseHandling.DateTimeOffset, DateTimeZoneHandling.Unspecified, out newDt);
|
||||
private void AssertNewDateTimeOffsetParseEqual(string text)
|
||||
{
|
||||
object oldDt;
|
||||
object newDt;
|
||||
TryParseDateIso(text, DateParseHandling.DateTimeOffset, DateTimeZoneHandling.Unspecified, out oldDt);
|
||||
DateTimeUtils.TryParseDateIso(text, DateParseHandling.DateTimeOffset, DateTimeZoneHandling.Unspecified, out newDt);
|
||||
|
||||
if (!Equals(oldDt, newDt))
|
||||
{
|
||||
Assert.AreEqual(oldDt, newDt, "DateTimeOffset parse not equal. Text: '{0}' Old ticks: {1} New ticks: {2}".FormatWith(
|
||||
CultureInfo.InvariantCulture,
|
||||
text,
|
||||
((DateTime)oldDt).Ticks,
|
||||
((DateTime)newDt).Ticks));
|
||||
}
|
||||
}
|
||||
if (!Equals(oldDt, newDt))
|
||||
{
|
||||
Assert.AreEqual(oldDt, newDt, "DateTimeOffset parse not equal. Text: '{0}' Old ticks: {1} New ticks: {2}".FormatWith(
|
||||
CultureInfo.InvariantCulture,
|
||||
text,
|
||||
((DateTime)oldDt).Ticks,
|
||||
((DateTime)newDt).Ticks));
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
internal static bool TryParseDateIso(string text, DateParseHandling dateParseHandling, DateTimeZoneHandling dateTimeZoneHandling, out object dt)
|
||||
{
|
||||
const string isoDateFormat = "yyyy-MM-ddTHH:mm:ss.FFFFFFFK";
|
||||
internal static bool TryParseDateIso(string text, DateParseHandling dateParseHandling, DateTimeZoneHandling dateTimeZoneHandling, out object dt)
|
||||
{
|
||||
const string isoDateFormat = "yyyy-MM-ddTHH:mm:ss.FFFFFFFK";
|
||||
|
||||
#if !NET20
|
||||
if (dateParseHandling == DateParseHandling.DateTimeOffset)
|
||||
{
|
||||
DateTimeOffset dateTimeOffset;
|
||||
if (DateTimeOffset.TryParseExact(text, isoDateFormat, CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out dateTimeOffset))
|
||||
{
|
||||
dt = dateTimeOffset;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
else
|
||||
if (dateParseHandling == DateParseHandling.DateTimeOffset)
|
||||
{
|
||||
DateTimeOffset dateTimeOffset;
|
||||
if (DateTimeOffset.TryParseExact(text, isoDateFormat, CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out dateTimeOffset))
|
||||
{
|
||||
dt = dateTimeOffset;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
DateTime dateTime;
|
||||
if (DateTime.TryParseExact(text, isoDateFormat, CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out dateTime))
|
||||
{
|
||||
dateTime = DateTimeUtils.EnsureDateTime(dateTime, dateTimeZoneHandling);
|
||||
{
|
||||
DateTime dateTime;
|
||||
if (DateTime.TryParseExact(text, isoDateFormat, CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out dateTime))
|
||||
{
|
||||
dateTime = DateTimeUtils.EnsureDateTime(dateTime, dateTimeZoneHandling);
|
||||
|
||||
dt = dateTime;
|
||||
return true;
|
||||
dt = dateTime;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
dt = null;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
dt = null;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user