-Added DateFormatHandling to control whether dates are written in the MS format or ISO format, with ISO as the default
-Added DateTimeZoneHandling to control reading and writing DateTime time zone details -Added reader/writer specific Formatting, DateFormatHandling and DateTimeZoneHandling to JsonSerializerSettings -Added feature of reader/writer specific settings to be set on JsonReader/JsonWriter when serializing -Added ReadAsDate to JsonReader -Added ReadAsString to JsonReader -Changed JsonTextReader to automatically read ISO strings as dates -Refactored ReadAsXXX methods and reduce code redundancy -Removed unused JsonDateTimeSerializationMode
This commit is contained in:
@@ -170,7 +170,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
]
|
||||
}";
|
||||
|
||||
DataSet ds = JsonConvert.DeserializeObject<DataSet>(json, new IsoDateTimeConverter());
|
||||
DataSet ds = JsonConvert.DeserializeObject<DataSet>(json);
|
||||
Assert.IsNotNull(ds);
|
||||
|
||||
Assert.AreEqual(2, ds.Tables.Count);
|
||||
@@ -187,7 +187,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
Assert.AreEqual("TimeSpanCol", dt.Columns[3].ColumnName);
|
||||
Assert.AreEqual(typeof(string), dt.Columns[3].DataType);
|
||||
Assert.AreEqual("DateTimeCol", dt.Columns[4].ColumnName);
|
||||
Assert.AreEqual(typeof(string), dt.Columns[4].DataType);
|
||||
Assert.AreEqual(typeof(DateTime), dt.Columns[4].DataType);
|
||||
Assert.AreEqual("DecimalCol", dt.Columns[5].ColumnName);
|
||||
Assert.AreEqual(typeof(double), dt.Columns[5].DataType);
|
||||
|
||||
@@ -270,7 +270,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
""int32Col"": 1,
|
||||
""booleanCol"": true,
|
||||
""timeSpanCol"": ""10.22:10:15.1000000"",
|
||||
""dateTimeCol"": ""\/Date(978048000000)\/"",
|
||||
""dateTimeCol"": ""2000-12-29T00:00:00Z"",
|
||||
""decimalCol"": 64.0021
|
||||
},
|
||||
{
|
||||
@@ -278,7 +278,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
""int32Col"": 2,
|
||||
""booleanCol"": true,
|
||||
""timeSpanCol"": ""10.22:10:15.1000000"",
|
||||
""dateTimeCol"": ""\/Date(978048000000)\/"",
|
||||
""dateTimeCol"": ""2000-12-29T00:00:00Z"",
|
||||
""decimalCol"": 64.0021
|
||||
}
|
||||
],
|
||||
@@ -288,7 +288,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
""int32Col"": 1,
|
||||
""booleanCol"": true,
|
||||
""timeSpanCol"": ""10.22:10:15.1000000"",
|
||||
""dateTimeCol"": ""\/Date(978048000000)\/"",
|
||||
""dateTimeCol"": ""2000-12-29T00:00:00Z"",
|
||||
""decimalCol"": 64.0021
|
||||
}
|
||||
]
|
||||
|
||||
@@ -97,7 +97,7 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
""Int32Col"": 2147483647,
|
||||
""BooleanCol"": true,
|
||||
""TimeSpanCol"": ""10.22:10:15.1000000"",
|
||||
""DateTimeCol"": ""\/Date(978048000000)\/"",
|
||||
""DateTimeCol"": ""2000-12-29T00:00:00Z"",
|
||||
""DecimalCol"": 64.0021
|
||||
}
|
||||
]", json);
|
||||
|
||||
@@ -201,46 +201,6 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
Assert.AreEqual(@"{""PreField"":""Pre"",""DateTimeField"":null,""DateTimeOffsetField"":null,""PostField"":""Post""}", json);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DeserializeUTC()
|
||||
{
|
||||
DateTimeTestClass c =
|
||||
JsonConvert.DeserializeObject<DateTimeTestClass>(@"{""PreField"":""Pre"",""DateTimeField"":""2008-12-12T12:12:12Z"",""DateTimeOffsetField"":""2008-12-12T12:12:12Z"",""PostField"":""Post""}", new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal });
|
||||
|
||||
Assert.AreEqual(new DateTime(2008, 12, 12, 12, 12, 12, 0, DateTimeKind.Utc).ToLocalTime(), c.DateTimeField);
|
||||
Assert.AreEqual(new DateTimeOffset(2008, 12, 12, 12, 12, 12, 0, TimeSpan.Zero), c.DateTimeOffsetField);
|
||||
Assert.AreEqual("Pre", c.PreField);
|
||||
Assert.AreEqual("Post", c.PostField);
|
||||
|
||||
DateTimeTestClass c2 =
|
||||
JsonConvert.DeserializeObject<DateTimeTestClass>(@"{""PreField"":""Pre"",""DateTimeField"":""2008-01-01T01:01:01Z"",""DateTimeOffsetField"":""2008-01-01T01:01:01Z"",""PostField"":""Post""}", new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal });
|
||||
|
||||
Assert.AreEqual(new DateTime(2008, 1, 1, 1, 1, 1, 0, DateTimeKind.Utc).ToLocalTime(), c2.DateTimeField);
|
||||
Assert.AreEqual(new DateTimeOffset(2008, 1, 1, 1, 1, 1, 0, TimeSpan.Zero), c2.DateTimeOffsetField);
|
||||
Assert.AreEqual("Pre", c2.PreField);
|
||||
Assert.AreEqual("Post", c2.PostField);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void NullableDeserializeUTC()
|
||||
{
|
||||
NullableDateTimeTestClass c =
|
||||
JsonConvert.DeserializeObject<NullableDateTimeTestClass>(@"{""PreField"":""Pre"",""DateTimeField"":""2008-12-12T12:12:12Z"",""DateTimeOffsetField"":""2008-12-12T12:12:12Z"",""PostField"":""Post""}", new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal });
|
||||
|
||||
Assert.AreEqual(new DateTime(2008, 12, 12, 12, 12, 12, 0, DateTimeKind.Utc).ToLocalTime(), c.DateTimeField);
|
||||
Assert.AreEqual(new DateTimeOffset(2008, 12, 12, 12, 12, 12, 0, TimeSpan.Zero), c.DateTimeOffsetField);
|
||||
Assert.AreEqual("Pre", c.PreField);
|
||||
Assert.AreEqual("Post", c.PostField);
|
||||
|
||||
NullableDateTimeTestClass c2 =
|
||||
JsonConvert.DeserializeObject<NullableDateTimeTestClass>(@"{""PreField"":""Pre"",""DateTimeField"":null,""DateTimeOffsetField"":null,""PostField"":""Post""}", new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal });
|
||||
|
||||
Assert.AreEqual(null, c2.DateTimeField);
|
||||
Assert.AreEqual(null, c2.DateTimeOffsetField);
|
||||
Assert.AreEqual("Pre", c2.PreField);
|
||||
Assert.AreEqual("Post", c2.PostField);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void NullableDeserializeEmptyString()
|
||||
{
|
||||
|
||||
@@ -24,6 +24,11 @@
|
||||
#endregion
|
||||
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Runtime.Serialization;
|
||||
using System.Text;
|
||||
using System.Xml;
|
||||
using Newtonsoft.Json.Converters;
|
||||
using Newtonsoft.Json.Utilities;
|
||||
using NUnit.Framework;
|
||||
|
||||
@@ -233,11 +238,17 @@ now brown cow?", '"', true);
|
||||
Assert.AreEqual("1", JsonConvert.ToString(value));
|
||||
|
||||
value = new DateTime(JsonConvert.InitialJavaScriptDateTicks, DateTimeKind.Utc);
|
||||
Assert.AreEqual(@"""\/Date(0)\/""", JsonConvert.ToString(value));
|
||||
Assert.AreEqual(@"""1970-01-01T00:00:00Z""", JsonConvert.ToString(value));
|
||||
|
||||
value = new DateTime(JsonConvert.InitialJavaScriptDateTicks, DateTimeKind.Utc);
|
||||
Assert.AreEqual(@"""\/Date(0)\/""", JsonConvert.ToString((DateTime)value, DateFormatHandling.MicrosoftDateFormat, DateTimeZoneHandling.RoundtripKind));
|
||||
|
||||
#if !PocketPC && !NET20
|
||||
value = new DateTimeOffset(JsonConvert.InitialJavaScriptDateTicks, TimeSpan.Zero);
|
||||
Assert.AreEqual(@"""\/Date(0+0000)\/""", JsonConvert.ToString(value));
|
||||
Assert.AreEqual(@"""1970-01-01T00:00:00+00:00""", JsonConvert.ToString(value));
|
||||
|
||||
value = new DateTimeOffset(JsonConvert.InitialJavaScriptDateTicks, TimeSpan.Zero);
|
||||
Assert.AreEqual(@"""\/Date(0+0000)\/""", JsonConvert.ToString((DateTimeOffset)value, DateFormatHandling.MicrosoftDateFormat));
|
||||
#endif
|
||||
|
||||
value = null;
|
||||
@@ -305,9 +316,9 @@ now brown cow?", '"', true);
|
||||
Assert.AreEqual("-1.0", JsonConvert.ToString(-1d));
|
||||
Assert.AreEqual("1.01", JsonConvert.ToString(1.01));
|
||||
Assert.AreEqual("1.001", JsonConvert.ToString(1.001));
|
||||
Assert.AreEqual(JsonConvert.PositiveInfinity, JsonConvert.ToString(double.PositiveInfinity));
|
||||
Assert.AreEqual(JsonConvert.NegativeInfinity, JsonConvert.ToString(double.NegativeInfinity));
|
||||
Assert.AreEqual(JsonConvert.NaN, JsonConvert.ToString(double.NaN));
|
||||
Assert.AreEqual(JsonConvert.PositiveInfinity, JsonConvert.ToString(Double.PositiveInfinity));
|
||||
Assert.AreEqual(JsonConvert.NegativeInfinity, JsonConvert.ToString(Double.NegativeInfinity));
|
||||
Assert.AreEqual(JsonConvert.NaN, JsonConvert.ToString(Double.NaN));
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -325,8 +336,8 @@ now brown cow?", '"', true);
|
||||
Assert.AreEqual("1.0", JsonConvert.ToString(1m));
|
||||
Assert.AreEqual("1.01", JsonConvert.ToString(1.01m));
|
||||
Assert.AreEqual("1.001", JsonConvert.ToString(1.001m));
|
||||
Assert.AreEqual("79228162514264337593543950335.0", JsonConvert.ToString(decimal.MaxValue));
|
||||
Assert.AreEqual("-79228162514264337593543950335.0", JsonConvert.ToString(decimal.MinValue));
|
||||
Assert.AreEqual("79228162514264337593543950335.0", JsonConvert.ToString(Decimal.MaxValue));
|
||||
Assert.AreEqual("-79228162514264337593543950335.0", JsonConvert.ToString(Decimal.MinValue));
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -338,5 +349,296 @@ now brown cow?", '"', true);
|
||||
string json = JsonConvert.ToString(v);
|
||||
Assert.AreEqual(@"""It's a good day\r\n\""sunshine\""""", json);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void WriteDateTime()
|
||||
{
|
||||
DateTimeResult result = null;
|
||||
|
||||
result = TestDateTime("DateTime Max", DateTime.MaxValue);
|
||||
Assert.AreEqual("9999-12-31T23:59:59.9999999", result.IsoDateRoundtrip);
|
||||
Assert.AreEqual("9999-12-31T23:59:59.9999999" + GetOffset(DateTime.MaxValue, DateFormatHandling.IsoDateFormat), result.IsoDateLocal);
|
||||
Assert.AreEqual("9999-12-31T23:59:59.9999999", result.IsoDateUnspecified);
|
||||
Assert.AreEqual("9999-12-31T23:59:59.9999999Z", result.IsoDateUtc);
|
||||
Assert.AreEqual(@"\/Date(253402300799999)\/", result.MsDateRoundtrip);
|
||||
Assert.AreEqual(@"\/Date(253402300799999" + GetOffset(DateTime.MaxValue, DateFormatHandling.MicrosoftDateFormat) + @")\/", result.MsDateLocal);
|
||||
Assert.AreEqual(@"\/Date(253402300799999)\/", result.MsDateUnspecified);
|
||||
Assert.AreEqual(@"\/Date(253402300799999)\/", result.MsDateUtc);
|
||||
|
||||
DateTime year2000local = new DateTime(2000, 1, 1, 1, 1, 1, DateTimeKind.Local);
|
||||
string localToUtcDate = year2000local.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.FFFFFFFK");
|
||||
|
||||
result = TestDateTime("DateTime Local", year2000local);
|
||||
Assert.AreEqual("2000-01-01T01:01:01" + GetOffset(year2000local, DateFormatHandling.IsoDateFormat), result.IsoDateRoundtrip);
|
||||
Assert.AreEqual("2000-01-01T01:01:01" + GetOffset(year2000local, DateFormatHandling.IsoDateFormat), result.IsoDateLocal);
|
||||
Assert.AreEqual("2000-01-01T01:01:01", result.IsoDateUnspecified);
|
||||
Assert.AreEqual(localToUtcDate, result.IsoDateUtc);
|
||||
Assert.AreEqual(@"\/Date(" + JsonConvert.ConvertDateTimeToJavaScriptTicks(year2000local) + GetOffset(year2000local, DateFormatHandling.MicrosoftDateFormat) + @")\/", result.MsDateRoundtrip);
|
||||
Assert.AreEqual(@"\/Date(" + JsonConvert.ConvertDateTimeToJavaScriptTicks(year2000local) + GetOffset(year2000local, DateFormatHandling.MicrosoftDateFormat) + @")\/", result.MsDateLocal);
|
||||
Assert.AreEqual(@"\/Date(" + JsonConvert.ConvertDateTimeToJavaScriptTicks(year2000local) + GetOffset(year2000local, DateFormatHandling.MicrosoftDateFormat) + @")\/", result.MsDateUnspecified);
|
||||
Assert.AreEqual(@"\/Date(" + JsonConvert.ConvertDateTimeToJavaScriptTicks(year2000local) + @")\/", result.MsDateUtc);
|
||||
|
||||
DateTime millisecondsLocal = new DateTime(2000, 1, 1, 1, 1, 1, 999, DateTimeKind.Local);
|
||||
localToUtcDate = millisecondsLocal.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.FFFFFFFK");
|
||||
|
||||
result = TestDateTime("DateTime Local with milliseconds", millisecondsLocal);
|
||||
Assert.AreEqual("2000-01-01T01:01:01.999" + GetOffset(millisecondsLocal, DateFormatHandling.IsoDateFormat), result.IsoDateRoundtrip);
|
||||
Assert.AreEqual("2000-01-01T01:01:01.999" + GetOffset(millisecondsLocal, DateFormatHandling.IsoDateFormat), result.IsoDateLocal);
|
||||
Assert.AreEqual("2000-01-01T01:01:01.999", result.IsoDateUnspecified);
|
||||
Assert.AreEqual(localToUtcDate, result.IsoDateUtc);
|
||||
Assert.AreEqual(@"\/Date(" + JsonConvert.ConvertDateTimeToJavaScriptTicks(millisecondsLocal) + GetOffset(millisecondsLocal, DateFormatHandling.MicrosoftDateFormat) + @")\/", result.MsDateRoundtrip);
|
||||
Assert.AreEqual(@"\/Date(" + JsonConvert.ConvertDateTimeToJavaScriptTicks(millisecondsLocal) + GetOffset(millisecondsLocal, DateFormatHandling.MicrosoftDateFormat) + @")\/", result.MsDateLocal);
|
||||
Assert.AreEqual(@"\/Date(" + JsonConvert.ConvertDateTimeToJavaScriptTicks(millisecondsLocal) + GetOffset(millisecondsLocal, DateFormatHandling.MicrosoftDateFormat) + @")\/", result.MsDateUnspecified);
|
||||
Assert.AreEqual(@"\/Date(" + JsonConvert.ConvertDateTimeToJavaScriptTicks(millisecondsLocal) + @")\/", result.MsDateUtc);
|
||||
|
||||
DateTime ticksLocal = new DateTime(634663873826822481, 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(localToUtcDate, result.IsoDateUtc);
|
||||
Assert.AreEqual(@"\/Date(" + JsonConvert.ConvertDateTimeToJavaScriptTicks(ticksLocal) + GetOffset(ticksLocal, DateFormatHandling.MicrosoftDateFormat) + @")\/", result.MsDateRoundtrip);
|
||||
Assert.AreEqual(@"\/Date(" + JsonConvert.ConvertDateTimeToJavaScriptTicks(ticksLocal) + GetOffset(ticksLocal, DateFormatHandling.MicrosoftDateFormat) + @")\/", result.MsDateLocal);
|
||||
Assert.AreEqual(@"\/Date(" + JsonConvert.ConvertDateTimeToJavaScriptTicks(ticksLocal) + GetOffset(ticksLocal, DateFormatHandling.MicrosoftDateFormat) + @")\/", result.MsDateUnspecified);
|
||||
Assert.AreEqual(@"\/Date(" + JsonConvert.ConvertDateTimeToJavaScriptTicks(ticksLocal) + @")\/", result.MsDateUtc);
|
||||
|
||||
DateTime year2000Unspecified = new DateTime(2000, 1, 1, 1, 1, 1, DateTimeKind.Unspecified);
|
||||
|
||||
result = TestDateTime("DateTime Unspecified", year2000Unspecified);
|
||||
Assert.AreEqual("2000-01-01T01:01:01", result.IsoDateRoundtrip);
|
||||
Assert.AreEqual("2000-01-01T01:01:01" + GetOffset(year2000Unspecified, DateFormatHandling.IsoDateFormat), result.IsoDateLocal);
|
||||
Assert.AreEqual("2000-01-01T01:01:01", result.IsoDateUnspecified);
|
||||
Assert.AreEqual("2000-01-01T01:01:01Z", result.IsoDateUtc);
|
||||
Assert.AreEqual(@"\/Date(" + JsonConvert.ConvertDateTimeToJavaScriptTicks(year2000Unspecified) + GetOffset(year2000Unspecified, DateFormatHandling.MicrosoftDateFormat) + @")\/", result.MsDateRoundtrip);
|
||||
Assert.AreEqual(@"\/Date(" + JsonConvert.ConvertDateTimeToJavaScriptTicks(year2000Unspecified) + GetOffset(year2000Unspecified, DateFormatHandling.MicrosoftDateFormat) + @")\/", result.MsDateLocal);
|
||||
Assert.AreEqual(@"\/Date(" + JsonConvert.ConvertDateTimeToJavaScriptTicks(year2000Unspecified) + GetOffset(year2000Unspecified, DateFormatHandling.MicrosoftDateFormat) + @")\/", result.MsDateUnspecified);
|
||||
Assert.AreEqual(@"\/Date(" + JsonConvert.ConvertDateTimeToJavaScriptTicks(year2000Unspecified.ToLocalTime()) + @")\/", result.MsDateUtc);
|
||||
|
||||
DateTime year2000Utc = new DateTime(2000, 1, 1, 1, 1, 1, DateTimeKind.Utc);
|
||||
string utcTolocalDate = year2000Utc.ToLocalTime().ToString("yyyy-MM-ddTHH:mm:ss");
|
||||
|
||||
result = TestDateTime("DateTime Utc", year2000Utc);
|
||||
Assert.AreEqual("2000-01-01T01:01:01Z", result.IsoDateRoundtrip);
|
||||
Assert.AreEqual(utcTolocalDate + GetOffset(year2000Utc, DateFormatHandling.IsoDateFormat), result.IsoDateLocal);
|
||||
Assert.AreEqual("2000-01-01T01:01:01", result.IsoDateUnspecified);
|
||||
Assert.AreEqual("2000-01-01T01:01:01Z", result.IsoDateUtc);
|
||||
Assert.AreEqual(@"\/Date(946688461000)\/", result.MsDateRoundtrip);
|
||||
Assert.AreEqual(@"\/Date(946688461000" + GetOffset(year2000Utc, DateFormatHandling.MicrosoftDateFormat) + @")\/", result.MsDateLocal);
|
||||
Assert.AreEqual(@"\/Date(" + JsonConvert.ConvertDateTimeToJavaScriptTicks(DateTime.SpecifyKind(year2000Utc, DateTimeKind.Unspecified)) + GetOffset(year2000Utc, DateFormatHandling.MicrosoftDateFormat) + @")\/", result.MsDateUnspecified);
|
||||
Assert.AreEqual(@"\/Date(946688461000)\/", result.MsDateUtc);
|
||||
|
||||
DateTime unixEpoc = new DateTime(621355968000000000, DateTimeKind.Utc);
|
||||
utcTolocalDate = unixEpoc.ToLocalTime().ToString("yyyy-MM-ddTHH:mm:ss");
|
||||
|
||||
result = TestDateTime("DateTime Unix Epoc", unixEpoc);
|
||||
Assert.AreEqual("1970-01-01T00:00:00Z", result.IsoDateRoundtrip);
|
||||
Assert.AreEqual(utcTolocalDate + GetOffset(unixEpoc, DateFormatHandling.IsoDateFormat), result.IsoDateLocal);
|
||||
Assert.AreEqual("1970-01-01T00:00:00", result.IsoDateUnspecified);
|
||||
Assert.AreEqual("1970-01-01T00:00:00Z", result.IsoDateUtc);
|
||||
Assert.AreEqual(@"\/Date(0)\/", result.MsDateRoundtrip);
|
||||
Assert.AreEqual(@"\/Date(0" + GetOffset(unixEpoc, DateFormatHandling.MicrosoftDateFormat) + @")\/", result.MsDateLocal);
|
||||
Assert.AreEqual(@"\/Date(" + JsonConvert.ConvertDateTimeToJavaScriptTicks(DateTime.SpecifyKind(unixEpoc, DateTimeKind.Unspecified)) + GetOffset(unixEpoc, DateFormatHandling.MicrosoftDateFormat) + @")\/", result.MsDateUnspecified);
|
||||
Assert.AreEqual(@"\/Date(0)\/", result.MsDateUtc);
|
||||
|
||||
result = TestDateTime("DateTime Min", DateTime.MinValue);
|
||||
Assert.AreEqual("0001-01-01T00:00:00", result.IsoDateRoundtrip);
|
||||
Assert.AreEqual("0001-01-01T00:00:00" + GetOffset(DateTime.MinValue, DateFormatHandling.IsoDateFormat), result.IsoDateLocal);
|
||||
Assert.AreEqual("0001-01-01T00:00:00", result.IsoDateUnspecified);
|
||||
Assert.AreEqual("0001-01-01T00:00:00Z", result.IsoDateUtc);
|
||||
Assert.AreEqual(@"\/Date(-62135596800000)\/", result.MsDateRoundtrip);
|
||||
Assert.AreEqual(@"\/Date(-62135596800000" + GetOffset(DateTime.MinValue, DateFormatHandling.MicrosoftDateFormat) + @")\/", result.MsDateLocal);
|
||||
Assert.AreEqual(@"\/Date(-62135596800000)\/", result.MsDateUnspecified);
|
||||
Assert.AreEqual(@"\/Date(-62135596800000)\/", result.MsDateUtc);
|
||||
|
||||
result = TestDateTime("DateTime Default", default(DateTime));
|
||||
Assert.AreEqual("0001-01-01T00:00:00", result.IsoDateRoundtrip);
|
||||
Assert.AreEqual("0001-01-01T00:00:00" + GetOffset(default(DateTime), DateFormatHandling.IsoDateFormat), result.IsoDateLocal);
|
||||
Assert.AreEqual("0001-01-01T00:00:00", result.IsoDateUnspecified);
|
||||
Assert.AreEqual("0001-01-01T00:00:00Z", result.IsoDateUtc);
|
||||
Assert.AreEqual(@"\/Date(-62135596800000)\/", result.MsDateRoundtrip);
|
||||
Assert.AreEqual(@"\/Date(-62135596800000" + GetOffset(default(DateTime), DateFormatHandling.MicrosoftDateFormat) + @")\/", result.MsDateLocal);
|
||||
Assert.AreEqual(@"\/Date(-62135596800000)\/", result.MsDateUnspecified);
|
||||
Assert.AreEqual(@"\/Date(-62135596800000)\/", result.MsDateUtc);
|
||||
|
||||
#if !NET20
|
||||
result = TestDateTime("DateTimeOffset TimeSpan Zero", new DateTimeOffset(2000, 1, 1, 1, 1, 1, TimeSpan.Zero));
|
||||
Assert.AreEqual("2000-01-01T01:01:01+00:00", result.IsoDateRoundtrip);
|
||||
Assert.AreEqual(@"\/Date(946688461000+0000)\/", result.MsDateRoundtrip);
|
||||
|
||||
result = TestDateTime("DateTimeOffset TimeSpan 1 hour", new DateTimeOffset(2000, 1, 1, 1, 1, 1, TimeSpan.FromHours(1)));
|
||||
Assert.AreEqual("2000-01-01T01:01:01+01:00", result.IsoDateRoundtrip);
|
||||
Assert.AreEqual(@"\/Date(946684861000+0100)\/", result.MsDateRoundtrip);
|
||||
|
||||
result = TestDateTime("DateTimeOffset TimeSpan 1.5 hour", new DateTimeOffset(2000, 1, 1, 1, 1, 1, TimeSpan.FromHours(1.5)));
|
||||
Assert.AreEqual("2000-01-01T01:01:01+01:30", result.IsoDateRoundtrip);
|
||||
Assert.AreEqual(@"\/Date(946683061000+0130)\/", result.MsDateRoundtrip);
|
||||
|
||||
result = TestDateTime("DateTimeOffset TimeSpan 13 hour", new DateTimeOffset(2000, 1, 1, 1, 1, 1, TimeSpan.FromHours(13)));
|
||||
Assert.AreEqual("2000-01-01T01:01:01+13:00", result.IsoDateRoundtrip);
|
||||
Assert.AreEqual(@"\/Date(946641661000+1300)\/", result.MsDateRoundtrip);
|
||||
|
||||
result = TestDateTime("DateTimeOffset TimeSpan with ticks", new DateTimeOffset(634663873826822481, TimeSpan.Zero));
|
||||
Assert.AreEqual("2012-03-03T16:03:02.6822481+00:00", result.IsoDateRoundtrip);
|
||||
Assert.AreEqual(@"\/Date(1330790582682+0000)\/", result.MsDateRoundtrip);
|
||||
|
||||
result = TestDateTime("DateTimeOffset Min", DateTimeOffset.MinValue);
|
||||
Assert.AreEqual("0001-01-01T00:00:00+00:00", result.IsoDateRoundtrip);
|
||||
Assert.AreEqual(@"\/Date(-62135596800000+0000)\/", result.MsDateRoundtrip);
|
||||
|
||||
result = TestDateTime("DateTimeOffset Max", DateTimeOffset.MaxValue);
|
||||
Assert.AreEqual("9999-12-31T23:59:59.9999999+00:00", result.IsoDateRoundtrip);
|
||||
Assert.AreEqual(@"\/Date(253402300799999+0000)\/", result.MsDateRoundtrip);
|
||||
|
||||
result = TestDateTime("DateTimeOffset Default", default(DateTimeOffset));
|
||||
Assert.AreEqual("0001-01-01T00:00:00+00:00", result.IsoDateRoundtrip);
|
||||
Assert.AreEqual(@"\/Date(-62135596800000+0000)\/", result.MsDateRoundtrip);
|
||||
#endif
|
||||
}
|
||||
|
||||
public class DateTimeResult
|
||||
{
|
||||
public string IsoDateRoundtrip { get; set; }
|
||||
public string IsoDateLocal { get; set; }
|
||||
public string IsoDateUnspecified { get; set; }
|
||||
public string IsoDateUtc { get; set; }
|
||||
|
||||
public string MsDateRoundtrip { get; set; }
|
||||
public string MsDateLocal { get; set; }
|
||||
public string MsDateUnspecified { get; set; }
|
||||
public string MsDateUtc { get; set; }
|
||||
}
|
||||
|
||||
private DateTimeResult TestDateTime<T>(string name, T value)
|
||||
{
|
||||
Console.WriteLine(name);
|
||||
|
||||
DateTimeResult result = new DateTimeResult();
|
||||
|
||||
result.IsoDateRoundtrip = TestDateTimeFormat(value, DateFormatHandling.IsoDateFormat, DateTimeZoneHandling.RoundtripKind);
|
||||
if (value is DateTime)
|
||||
{
|
||||
result.IsoDateLocal = TestDateTimeFormat(value, DateFormatHandling.IsoDateFormat, DateTimeZoneHandling.Local);
|
||||
result.IsoDateUnspecified = TestDateTimeFormat(value, DateFormatHandling.IsoDateFormat, DateTimeZoneHandling.Unspecified);
|
||||
result.IsoDateUtc = TestDateTimeFormat(value, DateFormatHandling.IsoDateFormat, DateTimeZoneHandling.Utc);
|
||||
}
|
||||
|
||||
result.MsDateRoundtrip = TestDateTimeFormat(value, DateFormatHandling.MicrosoftDateFormat, DateTimeZoneHandling.RoundtripKind);
|
||||
if (value is DateTime)
|
||||
{
|
||||
result.MsDateLocal = TestDateTimeFormat(value, DateFormatHandling.MicrosoftDateFormat, DateTimeZoneHandling.Local);
|
||||
result.MsDateUnspecified = TestDateTimeFormat(value, DateFormatHandling.MicrosoftDateFormat, DateTimeZoneHandling.Unspecified);
|
||||
result.MsDateUtc = TestDateTimeFormat(value, DateFormatHandling.MicrosoftDateFormat, DateTimeZoneHandling.Utc);
|
||||
}
|
||||
|
||||
TestDateTimeFormat(value, new IsoDateTimeConverter());
|
||||
|
||||
if (value is DateTime)
|
||||
{
|
||||
Console.WriteLine(XmlConvert.ToString((DateTime)(object)value, XmlDateTimeSerializationMode.RoundtripKind));
|
||||
}
|
||||
else
|
||||
{
|
||||
Console.WriteLine(XmlConvert.ToString((DateTimeOffset)(object)value));
|
||||
}
|
||||
|
||||
#if !NET20
|
||||
MemoryStream ms = new MemoryStream();
|
||||
DataContractSerializer s = new DataContractSerializer(typeof(T));
|
||||
s.WriteObject(ms, value);
|
||||
string json = Encoding.UTF8.GetString(ms.ToArray(), 0, Convert.ToInt32(ms.Length));
|
||||
Console.WriteLine(json);
|
||||
#endif
|
||||
|
||||
Console.WriteLine();
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private static string TestDateTimeFormat<T>(T value, DateFormatHandling format, DateTimeZoneHandling timeZoneHandling)
|
||||
{
|
||||
string date = null;
|
||||
|
||||
if (value is DateTime)
|
||||
{
|
||||
date = JsonConvert.ToString((DateTime)(object)value, format, timeZoneHandling);
|
||||
}
|
||||
else
|
||||
{
|
||||
#if !NET20
|
||||
date = JsonConvert.ToString((DateTimeOffset)(object)value, format);
|
||||
#endif
|
||||
}
|
||||
|
||||
Console.WriteLine(format.ToString("g") + "-" + timeZoneHandling.ToString("g") + ": " + date);
|
||||
|
||||
if (timeZoneHandling == DateTimeZoneHandling.RoundtripKind)
|
||||
{
|
||||
T parsed = JsonConvert.DeserializeObject<T>(date);
|
||||
try
|
||||
{
|
||||
Assert.AreEqual(value, parsed);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
long valueTicks = GetTicks(value);
|
||||
long parsedTicks = GetTicks(parsed);
|
||||
|
||||
valueTicks = (valueTicks/10000)*10000;
|
||||
|
||||
Assert.AreEqual(valueTicks, parsedTicks);
|
||||
}
|
||||
}
|
||||
|
||||
return date.Trim('"');
|
||||
}
|
||||
|
||||
private static void TestDateTimeFormat<T>(T value, JsonConverter converter)
|
||||
{
|
||||
string date = Write(value, converter);
|
||||
|
||||
Console.WriteLine(converter.GetType().Name + ": " + date);
|
||||
|
||||
T parsed = Read<T>(date, converter);
|
||||
|
||||
try
|
||||
{
|
||||
Assert.AreEqual(value, parsed);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// JavaScript ticks aren't as precise, recheck after rounding
|
||||
long valueTicks = GetTicks(value);
|
||||
long parsedTicks = GetTicks(parsed);
|
||||
|
||||
valueTicks = (valueTicks / 10000) * 10000;
|
||||
|
||||
Assert.AreEqual(valueTicks, parsedTicks);
|
||||
}
|
||||
}
|
||||
|
||||
public static long GetTicks(object value)
|
||||
{
|
||||
return (value is DateTime) ? ((DateTime)value).Ticks : ((DateTimeOffset)value).Ticks;
|
||||
}
|
||||
|
||||
public static string Write(object value, JsonConverter converter)
|
||||
{
|
||||
StringWriter sw = new StringWriter();
|
||||
JsonTextWriter writer = new JsonTextWriter(sw);
|
||||
converter.WriteJson(writer, value, null);
|
||||
|
||||
writer.Flush();
|
||||
return sw.ToString();
|
||||
}
|
||||
|
||||
public static T Read<T>(string text, JsonConverter converter)
|
||||
{
|
||||
JsonTextReader reader = new JsonTextReader(new StringReader(text));
|
||||
reader.ReadAsString();
|
||||
|
||||
return (T)converter.ReadJson(reader, typeof(T), null, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -586,7 +586,7 @@ Parameter name: reader")]
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Unexpected token when reading bytes: Boolean. Line 1, position 4.")]
|
||||
[ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Error reading bytes. Unexpected token: Boolean. Line 1, position 4.")]
|
||||
public void ReadBytesWithBadCharacter()
|
||||
{
|
||||
JsonReader reader = new JsonTextReader(new StringReader(@"true"));
|
||||
@@ -1219,7 +1219,7 @@ bye", reader.Value);
|
||||
#endif
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Unexpected token when reading decimal: StartConstructor. Line 1, position 9.")]
|
||||
[ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Error reading decimal. Unexpected token: StartConstructor. Line 1, position 9.")]
|
||||
public void ReadAsDecimalBadContent()
|
||||
{
|
||||
JsonTextReader reader = new JsonTextReader(new StringReader(@"new Date()"));
|
||||
@@ -1229,7 +1229,7 @@ bye", reader.Value);
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Unexpected token when reading bytes: StartConstructor. Line 1, position 9.")]
|
||||
[ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Error reading bytes. Unexpected token: StartConstructor. Line 1, position 9.")]
|
||||
public void ReadAsBytesBadContent()
|
||||
{
|
||||
JsonTextReader reader = new JsonTextReader(new StringReader(@"new Date()"));
|
||||
@@ -1239,7 +1239,7 @@ bye", reader.Value);
|
||||
|
||||
#if !NET20
|
||||
[Test]
|
||||
[ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Unexpected token when reading date: StartConstructor. Line 1, position 9.")]
|
||||
[ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Error reading date. Unexpected token: StartConstructor. Line 1, position 9.")]
|
||||
public void ReadAsDateTimeOffsetBadContent()
|
||||
{
|
||||
JsonTextReader reader = new JsonTextReader(new StringReader(@"new Date()"));
|
||||
|
||||
@@ -25,10 +25,14 @@
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Runtime.Serialization;
|
||||
using System.Text;
|
||||
using System.Xml;
|
||||
using NUnit.Framework;
|
||||
using Newtonsoft.Json;
|
||||
using System.IO;
|
||||
using Newtonsoft.Json.Converters;
|
||||
using Newtonsoft.Json.Utilities;
|
||||
|
||||
namespace Newtonsoft.Json.Tests
|
||||
@@ -133,9 +137,9 @@ namespace Newtonsoft.Json.Tests
|
||||
string expected;
|
||||
|
||||
#if !PocketPC && !NET20
|
||||
expected = @"[null,""c"",null,true,null,1,null,1,null,1,null,1,null,1,null,1,null,1,null,1,null,1.1,null,1.1,null,1.1,null,""\/Date(0)\/"",null,""\/Date(0+0000)\/""]";
|
||||
expected = @"[null,""c"",null,true,null,1,null,1,null,1,null,1,null,1,null,1,null,1,null,1,null,1.1,null,1.1,null,1.1,null,""1970-01-01T00:00:00Z"",null,""1970-01-01T00:00:00+00:00""]";
|
||||
#else
|
||||
expected = @"[null,""c"",null,true,null,1,null,1,null,1,null,1,null,1,null,1,null,1,null,1,null,1.1,null,1.1,null,1.1,null,""\/Date(0)\/""]";
|
||||
expected = @"[null,""c"",null,true,null,1,null,1,null,1,null,1,null,1,null,1,null,1,null,1,null,1.1,null,1.1,null,1.1,null,""1970-01-01T00:00:00Z""]";
|
||||
#endif
|
||||
|
||||
Assert.AreEqual(expected, json);
|
||||
|
||||
@@ -135,7 +135,7 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Error reading date. Expected date but got Boolean. Line 1, position 14.")]
|
||||
[ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Error reading date. Unexpected token: Boolean. Line 1, position 14.")]
|
||||
public void ReadAsDateTimeOffsetBoolean()
|
||||
{
|
||||
string json = @"{""Offset"":true}";
|
||||
@@ -294,7 +294,7 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Error reading bytes. Expected bytes but got Integer.")]
|
||||
[ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Error reading bytes. Unexpected token: Integer.")]
|
||||
public void ReadBytesFailure()
|
||||
{
|
||||
JObject o =
|
||||
@@ -484,7 +484,7 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Error reading integer. Expected a number but got Boolean. Line 1, position 12.")]
|
||||
[ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Error reading integer. Unexpected token: Boolean. Line 1, position 12.")]
|
||||
public void ReadAsInt32Boolean()
|
||||
{
|
||||
string json = @"{""Name"":true}";
|
||||
@@ -543,7 +543,7 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Error reading decimal. Expected a number but got Boolean. Line 1, position 12.")]
|
||||
[ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Error reading decimal. Unexpected token: Boolean. Line 1, position 12.")]
|
||||
public void ReadAsDecimalBoolean()
|
||||
{
|
||||
string json = @"{""Name"":true}";
|
||||
|
||||
@@ -349,13 +349,13 @@ keyword such as type of business.""
|
||||
""Test3"": ""Test3Value"",
|
||||
""Test4"": null
|
||||
},
|
||||
""\/Date(971136000000)\/"",
|
||||
""2000-10-10T00:00:00Z"",
|
||||
55,
|
||||
[
|
||||
""1"",
|
||||
2,
|
||||
3.0,
|
||||
""\/Date(-62030076711000)\/""
|
||||
""0004-05-06T07:08:09Z""
|
||||
],
|
||||
new ConstructorName(
|
||||
""param1"",
|
||||
|
||||
@@ -39,8 +39,8 @@ namespace Newtonsoft.Json.Tests
|
||||
|
||||
public class PerformanceTests : TestFixtureBase
|
||||
{
|
||||
private const int Iterations = 100;
|
||||
//private const int Iterations = 5000;
|
||||
//private const int Iterations = 100;
|
||||
private const int Iterations = 5000;
|
||||
|
||||
#region Data
|
||||
|
||||
@@ -56,12 +56,16 @@ namespace Newtonsoft.Json.Tests
|
||||
private const string JsonText =
|
||||
@"{""strings"":[null,""Markus egger ]><[, (2nd)"",null],""dictionary"":{""Val & asd1"":1,""Val2 & asd1"":3,""Val3 & asd1"":4},""Name"":""Rick"",""Now"":""\/Date(1262301136080+1300)\/"",""BigNumber"":34123123123.121,""Address1"":{""Street"":""fff Street"",""Phone"":""(503) 814-6335"",""Entered"":""\/Date(1264025536080+1300)\/""},""Addresses"":[{""Street"":""\u001farray<address"",""Phone"":""(503) 814-6335"",""Entered"":""\/Date(1262211136080+1300)\/""},{""Street"":""array 2 address"",""Phone"":""(503) 814-6335"",""Entered"":""\/Date(1262124736080+1300)\/""}]}";
|
||||
|
||||
private const string JsonIsoText =
|
||||
@"{""strings"":[null,""Markus egger ]><[, (2nd)"",null],""dictionary"":{""Val & asd1"":1,""Val2 & asd1"":3,""Val3 & asd1"":4},""Name"":""Rick"",""Now"":""2012-02-25T19:55:50.6095676+13:00"",""BigNumber"":34123123123.121,""Address1"":{""Street"":""fff Street"",""Phone"":""(503) 814-6335"",""Entered"":""2012-02-24T18:55:50.6095676+13:00""},""Addresses"":[{""Street"":""\u001farray<address"",""Phone"":""(503) 814-6335"",""Entered"":""2012-02-24T18:55:50.6095676+13:00""},{""Street"":""array 2 address"",""Phone"":""(503) 814-6335"",""Entered"":""2012-02-24T18:55:50.6095676+13:00""}]}";
|
||||
|
||||
private const string SimpleJsonText =
|
||||
@"{""Id"":2311,""Name"":""Simple-1"",""Address"":""Planet Earth"",""Scores"":[82,96,49,40,38,38,78,96,2,39]}";
|
||||
|
||||
public enum SerializeMethod
|
||||
{
|
||||
JsonNet,
|
||||
JsonNetWithIsoConverter,
|
||||
JsonNetBinary,
|
||||
BinaryFormatter,
|
||||
JavaScriptSerializer,
|
||||
@@ -100,6 +104,7 @@ namespace Newtonsoft.Json.Tests
|
||||
BenchmarkSerializeMethod(SerializeMethod.JavaScriptSerializer, value);
|
||||
BenchmarkSerializeMethod(SerializeMethod.DataContractJsonSerializer, value);
|
||||
BenchmarkSerializeMethod(SerializeMethod.JsonNet, value);
|
||||
BenchmarkSerializeMethod(SerializeMethod.JsonNetWithIsoConverter, value);
|
||||
BenchmarkSerializeMethod(SerializeMethod.JsonNetBinary, value);
|
||||
}
|
||||
|
||||
@@ -109,6 +114,7 @@ namespace Newtonsoft.Json.Tests
|
||||
BenchmarkDeserializeMethod<TestClass>(SerializeMethod.DataContractSerializer, XmlText);
|
||||
BenchmarkDeserializeMethod<TestClass>(SerializeMethod.BinaryFormatter, MiscellaneousUtils.HexToBytes(BinaryFormatterHex));
|
||||
DeserializeTests<TestClass>(JsonText);
|
||||
BenchmarkDeserializeMethod<TestClass>(SerializeMethod.JsonNetWithIsoConverter, JsonIsoText);
|
||||
BenchmarkDeserializeMethod<TestClass>(SerializeMethod.JsonNetBinary, MiscellaneousUtils.HexToBytes(BsonHex));
|
||||
}
|
||||
|
||||
@@ -471,6 +477,9 @@ namespace Newtonsoft.Json.Tests
|
||||
case SerializeMethod.JsonNet:
|
||||
json = JsonConvert.SerializeObject(value);
|
||||
break;
|
||||
case SerializeMethod.JsonNetWithIsoConverter:
|
||||
json = JsonConvert.SerializeObject(value, new IsoDateTimeConverter());
|
||||
break;
|
||||
case SerializeMethod.JsonNetBinary:
|
||||
{
|
||||
MemoryStream ms = new MemoryStream(Buffer);
|
||||
@@ -538,7 +547,7 @@ namespace Newtonsoft.Json.Tests
|
||||
Console.WriteLine();
|
||||
}
|
||||
|
||||
public T DeserializeJsonNet<T>(string json)
|
||||
public T DeserializeJsonNet<T>(string json, bool isoDateTimeConverter)
|
||||
{
|
||||
Type type = typeof (T);
|
||||
|
||||
@@ -546,9 +555,11 @@ namespace Newtonsoft.Json.Tests
|
||||
serializer.ObjectCreationHandling = Newtonsoft.Json.ObjectCreationHandling.Replace;
|
||||
serializer.MissingMemberHandling = Newtonsoft.Json.MissingMemberHandling.Ignore;
|
||||
serializer.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
|
||||
if (isoDateTimeConverter)
|
||||
serializer.Converters.Add(new IsoDateTimeConverter());
|
||||
|
||||
return (T) serializer.Deserialize(new StringReader(json), type);
|
||||
|
||||
var value = (T) serializer.Deserialize(new StringReader(json), type);
|
||||
return value;
|
||||
//JsonTextReader reader = new JsonTextReader(new StringReader(JsonText));
|
||||
//while (reader.Read())
|
||||
//{
|
||||
@@ -591,7 +602,9 @@ namespace Newtonsoft.Json.Tests
|
||||
switch (method)
|
||||
{
|
||||
case SerializeMethod.JsonNet:
|
||||
return DeserializeJsonNet<T>((string) json);
|
||||
return DeserializeJsonNet<T>((string)json, false);
|
||||
case SerializeMethod.JsonNetWithIsoConverter:
|
||||
return DeserializeJsonNet<T>((string)json, true);
|
||||
case SerializeMethod.JsonNetBinary:
|
||||
return DeserializeJsonNetBinary<T>((byte[]) json);
|
||||
case SerializeMethod.BinaryFormatter:
|
||||
@@ -689,6 +702,52 @@ namespace Newtonsoft.Json.Tests
|
||||
return null;
|
||||
}, "JObject.ToString");
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Ignore]
|
||||
public void NestedJToken()
|
||||
{
|
||||
Stopwatch sw;
|
||||
for (int i = 10000; i <= 100000; i += 10000)
|
||||
{
|
||||
sw = new Stopwatch();
|
||||
sw.Start();
|
||||
JArray ija = new JArray();
|
||||
JToken ijt = ija;
|
||||
for (int j = 0; j < i; j++)
|
||||
{
|
||||
JArray temp = new JArray();
|
||||
ija.Add(temp);
|
||||
ija = temp;
|
||||
}
|
||||
ija.Add(1);
|
||||
sw.Stop();
|
||||
Console.WriteLine("Created a JToken of depth {0} (using OM) in {1} millis", i, sw.ElapsedMilliseconds);
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Ignore]
|
||||
public void NestedXElement()
|
||||
{
|
||||
Stopwatch sw;
|
||||
for (int i = 10000; i <= 100000; i += 10000)
|
||||
{
|
||||
sw = new Stopwatch();
|
||||
sw.Start();
|
||||
XElement ija = new XElement("root");
|
||||
XElement ijt = ija;
|
||||
for (int j = 0; j < i; j++)
|
||||
{
|
||||
XElement temp = new XElement("child");
|
||||
ija.Add(temp);
|
||||
ija = temp;
|
||||
}
|
||||
ija.Add(1);
|
||||
sw.Stop();
|
||||
Console.WriteLine("Created a XElement of depth {0} (using OM) in {1} millis", i, sw.ElapsedMilliseconds);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public class LargeRecursiveTestClass
|
||||
|
||||
@@ -72,5 +72,5 @@ using System.Security;
|
||||
// by using the '*' as shown below:
|
||||
[assembly: AssemblyVersion("4.0.8.0")]
|
||||
#if !PocketPC
|
||||
[assembly: AssemblyFileVersion("4.0.8.14625")]
|
||||
[assembly: AssemblyFileVersion("4.0.8.14704")]
|
||||
#endif
|
||||
|
||||
+5
-5
@@ -53,8 +53,8 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
|
||||
Assert.AreEqual(@"{
|
||||
""name"": ""Name!"",
|
||||
""birthDate"": ""\/Date(974764544000)\/"",
|
||||
""lastModified"": ""\/Date(974764544000)\/""
|
||||
""birthDate"": ""2000-11-20T23:55:44Z"",
|
||||
""lastModified"": ""2000-11-20T23:55:44Z""
|
||||
}", json);
|
||||
|
||||
Person deserializedPerson = JsonConvert.DeserializeObject<Person>(json, new JsonSerializerSettings
|
||||
@@ -69,8 +69,8 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
json = JsonConvert.SerializeObject(person, Formatting.Indented);
|
||||
Assert.AreEqual(@"{
|
||||
""Name"": ""Name!"",
|
||||
""BirthDate"": ""\/Date(974764544000)\/"",
|
||||
""LastModified"": ""\/Date(974764544000)\/""
|
||||
""BirthDate"": ""2000-11-20T23:55:44Z"",
|
||||
""LastModified"": ""2000-11-20T23:55:44Z""
|
||||
}", json);
|
||||
|
||||
}
|
||||
@@ -160,7 +160,7 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
|
||||
Assert.AreEqual(@"{
|
||||
""name"": ""Widget"",
|
||||
""expiryDate"": ""\/Date(1292868060000)\/"",
|
||||
""expiryDate"": ""2010-12-20T18:01:00Z"",
|
||||
""price"": 9.99,
|
||||
""sizes"": [
|
||||
""Small"",
|
||||
|
||||
@@ -70,7 +70,7 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
Assert.AreEqual(@"{
|
||||
""FirstName"": ""Maurice"",
|
||||
""LastName"": ""Moss"",
|
||||
""BirthDate"": ""\/Date(252291661000)\/""
|
||||
""BirthDate"": ""1977-12-30T01:01:01Z""
|
||||
}", iPersonJson);
|
||||
}
|
||||
|
||||
|
||||
@@ -486,12 +486,12 @@ keyword such as type of business.""
|
||||
|
||||
string expected = sr.ReadToEnd();
|
||||
|
||||
result = JsonConvert.SerializeObject(testDates);
|
||||
result = JsonConvert.SerializeObject(testDates, new JsonSerializerSettings { DateFormatHandling = DateFormatHandling.MicrosoftDateFormat });
|
||||
Assert.AreEqual(expected, result);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DateTimeOffset()
|
||||
public void DateTimeOffsetIso()
|
||||
{
|
||||
List<DateTimeOffset> testDates = new List<DateTimeOffset>
|
||||
{
|
||||
@@ -502,6 +502,21 @@ keyword such as type of business.""
|
||||
};
|
||||
|
||||
string result = JsonConvert.SerializeObject(testDates);
|
||||
Assert.AreEqual(@"[""0100-01-01T01:01:01+00:00"",""2000-01-01T01:01:01+00:00"",""2000-01-01T01:01:01+13:00"",""2000-01-01T01:01:01-03:30""]", result);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DateTimeOffsetMsAjax()
|
||||
{
|
||||
List<DateTimeOffset> testDates = new List<DateTimeOffset>
|
||||
{
|
||||
new DateTimeOffset(new DateTime(100, 1, 1, 1, 1, 1, DateTimeKind.Utc)),
|
||||
new DateTimeOffset(2000, 1, 1, 1, 1, 1, TimeSpan.Zero),
|
||||
new DateTimeOffset(2000, 1, 1, 1, 1, 1, TimeSpan.FromHours(13)),
|
||||
new DateTimeOffset(2000, 1, 1, 1, 1, 1, TimeSpan.FromHours(-3.5)),
|
||||
};
|
||||
|
||||
string result = JsonConvert.SerializeObject(testDates, new JsonSerializerSettings { DateFormatHandling = DateFormatHandling.MicrosoftDateFormat });
|
||||
Assert.AreEqual(@"[""\/Date(-59011455539000+0000)\/"",""\/Date(946688461000+0000)\/"",""\/Date(946641661000+1300)\/"",""\/Date(946701061000-0330)\/""]", result);
|
||||
}
|
||||
#endif
|
||||
@@ -536,7 +551,7 @@ keyword such as type of business.""
|
||||
};
|
||||
|
||||
string json = JsonConvert.SerializeObject(anonymous);
|
||||
Assert.AreEqual(@"{""StringValue"":""I am a string"",""IntValue"":2147483647,""NestedAnonymous"":{""NestedValue"":255},""NestedArray"":[1,2],""Product"":{""Name"":""TestProduct"",""ExpiryDate"":""\/Date(946684800000)\/"",""Price"":0.0,""Sizes"":null}}", json);
|
||||
Assert.AreEqual(@"{""StringValue"":""I am a string"",""IntValue"":2147483647,""NestedAnonymous"":{""NestedValue"":255},""NestedArray"":[1,2],""Product"":{""Name"":""TestProduct"",""ExpiryDate"":""2000-01-01T00:00:00Z"",""Price"":0.0,""Sizes"":null}}", json);
|
||||
|
||||
anonymous = JsonConvert.DeserializeAnonymousType(json, anonymous);
|
||||
Assert.AreEqual("I am a string", anonymous.StringValue);
|
||||
@@ -565,7 +580,7 @@ keyword such as type of business.""
|
||||
|
||||
jsonSerializer.Serialize(sw, collection);
|
||||
|
||||
Assert.AreEqual(@"[{""Name"":""Test1"",""ExpiryDate"":""\/Date(946684800000)\/"",""Price"":0.0,""Sizes"":null},{""Name"":""Test2"",""ExpiryDate"":""\/Date(946684800000)\/"",""Price"":0.0,""Sizes"":null},{""Name"":""Test3"",""ExpiryDate"":""\/Date(946684800000)\/"",""Price"":0.0,""Sizes"":null}]",
|
||||
Assert.AreEqual(@"[{""Name"":""Test1"",""ExpiryDate"":""2000-01-01T00:00:00Z"",""Price"":0.0,""Sizes"":null},{""Name"":""Test2"",""ExpiryDate"":""2000-01-01T00:00:00Z"",""Price"":0.0,""Sizes"":null},{""Name"":""Test3"",""ExpiryDate"":""2000-01-01T00:00:00Z"",""Price"":0.0,""Sizes"":null}]",
|
||||
sw.GetStringBuilder().ToString());
|
||||
|
||||
ProductCollection collectionNew = (ProductCollection) jsonSerializer.Deserialize(new JsonTextReader(new StringReader(sw.GetStringBuilder().ToString())), typeof (ProductCollection));
|
||||
@@ -819,12 +834,30 @@ keyword such as type of business.""
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void SerializerShouldUseMemberConverter()
|
||||
public void SerializerShouldUseMemberConverter_IsoDate()
|
||||
{
|
||||
DateTime testDate = new DateTime(JsonConvert.InitialJavaScriptDateTicks, DateTimeKind.Utc);
|
||||
MemberConverterClass m1 = new MemberConverterClass {DefaultConverter = testDate, MemberConverter = testDate};
|
||||
|
||||
string json = JsonConvert.SerializeObject(m1);
|
||||
Assert.AreEqual(@"{""DefaultConverter"":""1970-01-01T00:00:00Z"",""MemberConverter"":""1970-01-01T00:00:00Z""}", json);
|
||||
|
||||
MemberConverterClass m2 = JsonConvert.DeserializeObject<MemberConverterClass>(json);
|
||||
|
||||
Assert.AreEqual(testDate, m2.DefaultConverter);
|
||||
Assert.AreEqual(testDate, m2.MemberConverter);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void SerializerShouldUseMemberConverter_MsDate()
|
||||
{
|
||||
DateTime testDate = new DateTime(JsonConvert.InitialJavaScriptDateTicks, DateTimeKind.Utc);
|
||||
MemberConverterClass m1 = new MemberConverterClass { DefaultConverter = testDate, MemberConverter = testDate };
|
||||
|
||||
string json = JsonConvert.SerializeObject(m1, new JsonSerializerSettings
|
||||
{
|
||||
DateFormatHandling = DateFormatHandling.MicrosoftDateFormat
|
||||
});
|
||||
Assert.AreEqual(@"{""DefaultConverter"":""\/Date(0)\/"",""MemberConverter"":""1970-01-01T00:00:00Z""}", json);
|
||||
|
||||
MemberConverterClass m2 = JsonConvert.DeserializeObject<MemberConverterClass>(json);
|
||||
@@ -1017,7 +1050,7 @@ keyword such as type of business.""
|
||||
""FirstName"": ""Bob"",
|
||||
""MiddleName"": ""Cosmo"",
|
||||
""LastName"": ""Smith"",
|
||||
""BirthDate"": ""\/Date(977309755000)\/""
|
||||
""BirthDate"": ""2000-12-20T10:55:55Z""
|
||||
}", json);
|
||||
|
||||
RequiredMembersClass c2 = JsonConvert.DeserializeObject<RequiredMembersClass>(json);
|
||||
@@ -1775,13 +1808,13 @@ keyword such as type of business.""
|
||||
Assert.AreEqual(@"[
|
||||
{
|
||||
""Name"": ""Product 1"",
|
||||
""ExpiryDate"": ""\/Date(978048000000)\/"",
|
||||
""ExpiryDate"": ""2000-12-29T00:00:00Z"",
|
||||
""Price"": 99.95,
|
||||
""Sizes"": null
|
||||
},
|
||||
{
|
||||
""Name"": ""Product 2"",
|
||||
""ExpiryDate"": ""\/Date(1248998400000)\/"",
|
||||
""ExpiryDate"": ""2009-07-31T00:00:00Z"",
|
||||
""Price"": 12.50,
|
||||
""Sizes"": null
|
||||
}
|
||||
@@ -2164,8 +2197,8 @@ keyword such as type of business.""
|
||||
""Person"": {
|
||||
""HourlyWage"": 12.50,
|
||||
""Name"": ""Jim Bob"",
|
||||
""BirthDate"": ""\/Date(975542399000)\/"",
|
||||
""LastModified"": ""\/Date(975542399000)\/""
|
||||
""BirthDate"": ""2000-11-29T23:59:59Z"",
|
||||
""LastModified"": ""2000-11-29T23:59:59Z""
|
||||
}
|
||||
}",
|
||||
json);
|
||||
@@ -2667,7 +2700,61 @@ keyword such as type of business.""
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void SerializeISerializableTestObject()
|
||||
public void SerializeISerializableTestObject_IsoDate()
|
||||
{
|
||||
Person person = new Person();
|
||||
person.BirthDate = new DateTime(2000, 1, 1, 1, 1, 1, DateTimeKind.Utc);
|
||||
person.LastModified = person.BirthDate;
|
||||
person.Department = "Department!";
|
||||
person.Name = "Name!";
|
||||
|
||||
DateTimeOffset dateTimeOffset = new DateTimeOffset(2000, 12, 20, 22, 59, 59, TimeSpan.FromHours(2));
|
||||
string dateTimeOffsetText;
|
||||
#if !NET20
|
||||
dateTimeOffsetText = @"2000-12-20T22:59:59+02:00";
|
||||
#else
|
||||
dateTimeOffsetText = @"12/20/2000 22:59:59 +02:00";
|
||||
#endif
|
||||
|
||||
ISerializableTestObject o = new ISerializableTestObject("String!", int.MinValue, dateTimeOffset, person);
|
||||
|
||||
string json = JsonConvert.SerializeObject(o, Formatting.Indented);
|
||||
Assert.AreEqual(@"{
|
||||
""stringValue"": ""String!"",
|
||||
""intValue"": -2147483648,
|
||||
""dateTimeOffsetValue"": """ + dateTimeOffsetText + @""",
|
||||
""personValue"": {
|
||||
""Name"": ""Name!"",
|
||||
""BirthDate"": ""2000-01-01T01:01:01Z"",
|
||||
""LastModified"": ""2000-01-01T01:01:01Z""
|
||||
},
|
||||
""nullPersonValue"": null,
|
||||
""nullableInt"": null,
|
||||
""booleanValue"": false,
|
||||
""byteValue"": 0,
|
||||
""charValue"": ""\u0000"",
|
||||
""dateTimeValue"": ""0001-01-01T00:00:00Z"",
|
||||
""decimalValue"": 0.0,
|
||||
""shortValue"": 0,
|
||||
""longValue"": 0,
|
||||
""sbyteValue"": 0,
|
||||
""floatValue"": 0.0,
|
||||
""ushortValue"": 0,
|
||||
""uintValue"": 0,
|
||||
""ulongValue"": 0
|
||||
}", json);
|
||||
|
||||
ISerializableTestObject o2 = JsonConvert.DeserializeObject<ISerializableTestObject>(json);
|
||||
Assert.AreEqual("String!", o2._stringValue);
|
||||
Assert.AreEqual(int.MinValue, o2._intValue);
|
||||
Assert.AreEqual(dateTimeOffset, o2._dateTimeOffsetValue);
|
||||
Assert.AreEqual("Name!", o2._personValue.Name);
|
||||
Assert.AreEqual(null, o2._nullPersonValue);
|
||||
Assert.AreEqual(null, o2._nullableInt);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void SerializeISerializableTestObject_MsAjax()
|
||||
{
|
||||
Person person = new Person();
|
||||
person.BirthDate = new DateTime(2000, 1, 1, 1, 1, 1, DateTimeKind.Utc);
|
||||
@@ -2685,7 +2772,10 @@ keyword such as type of business.""
|
||||
|
||||
ISerializableTestObject o = new ISerializableTestObject("String!", int.MinValue, dateTimeOffset, person);
|
||||
|
||||
string json = JsonConvert.SerializeObject(o, Formatting.Indented);
|
||||
string json = JsonConvert.SerializeObject(o, Formatting.Indented, new JsonSerializerSettings
|
||||
{
|
||||
DateFormatHandling = DateFormatHandling.MicrosoftDateFormat
|
||||
});
|
||||
Assert.AreEqual(@"{
|
||||
""stringValue"": ""String!"",
|
||||
""intValue"": -2147483648,
|
||||
@@ -3161,8 +3251,8 @@ keyword such as type of business.""
|
||||
""Value"": {
|
||||
""HourlyWage"": 1.0,
|
||||
""Name"": null,
|
||||
""BirthDate"": ""\/Date(975711661000)\/"",
|
||||
""LastModified"": ""\/Date(975711661000)\/""
|
||||
""BirthDate"": ""2000-12-01T23:01:01Z"",
|
||||
""LastModified"": ""2000-12-01T23:01:01Z""
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -3170,8 +3260,8 @@ keyword such as type of business.""
|
||||
""Value"": {
|
||||
""HourlyWage"": 2.0,
|
||||
""Name"": null,
|
||||
""BirthDate"": ""\/Date(975711661000)\/"",
|
||||
""LastModified"": ""\/Date(975711661000)\/""
|
||||
""BirthDate"": ""2000-12-01T23:01:01Z"",
|
||||
""LastModified"": ""2000-12-01T23:01:01Z""
|
||||
}
|
||||
}
|
||||
]", json);
|
||||
@@ -3777,13 +3867,34 @@ keyword such as type of business.""
|
||||
|
||||
#if !NET20
|
||||
[Test]
|
||||
public void ReadWriteTimeZoneOffset()
|
||||
public void ReadWriteTimeZoneOffsetIso()
|
||||
{
|
||||
var serializeObject = JsonConvert.SerializeObject(new TimeZoneOffsetObject
|
||||
{
|
||||
Offset = new DateTimeOffset(new DateTime(2000, 1, 1), TimeSpan.FromHours(6))
|
||||
});
|
||||
|
||||
Assert.AreEqual("{\"Offset\":\"2000-01-01T00:00:00+06:00\"}", serializeObject);
|
||||
var deserializeObject = JsonConvert.DeserializeObject<TimeZoneOffsetObject>(serializeObject);
|
||||
Assert.AreEqual(TimeSpan.FromHours(6), deserializeObject.Offset.Offset);
|
||||
Assert.AreEqual(new DateTime(2000, 1, 1), deserializeObject.Offset.Date);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DeserializePropertyNullableDateTimeOffsetExactIso()
|
||||
{
|
||||
NullableDateTimeTestClass d = JsonConvert.DeserializeObject<NullableDateTimeTestClass>("{\"DateTimeOffsetField\":\"2000-01-01T00:00:00+06:00\"}");
|
||||
Assert.AreEqual(new DateTimeOffset(new DateTime(2000, 1, 1), TimeSpan.FromHours(6)), d.DateTimeOffsetField);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ReadWriteTimeZoneOffsetMsAjax()
|
||||
{
|
||||
var serializeObject = JsonConvert.SerializeObject(new TimeZoneOffsetObject
|
||||
{
|
||||
Offset = new DateTimeOffset(new DateTime(2000, 1, 1), TimeSpan.FromHours(6))
|
||||
}, Formatting.None, new JsonSerializerSettings { DateFormatHandling = DateFormatHandling.MicrosoftDateFormat });
|
||||
|
||||
Assert.AreEqual("{\"Offset\":\"\\/Date(946663200000+0600)\\/\"}", serializeObject);
|
||||
var deserializeObject = JsonConvert.DeserializeObject<TimeZoneOffsetObject>(serializeObject);
|
||||
Assert.AreEqual(TimeSpan.FromHours(6), deserializeObject.Offset.Offset);
|
||||
@@ -3791,7 +3902,7 @@ keyword such as type of business.""
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DeserializePropertyNullableDateTimeOffsetExact()
|
||||
public void DeserializePropertyNullableDateTimeOffsetExactMsAjax()
|
||||
{
|
||||
NullableDateTimeTestClass d = JsonConvert.DeserializeObject<NullableDateTimeTestClass>("{\"DateTimeOffsetField\":\"\\/Date(946663200000+0600)\\/\"}");
|
||||
Assert.AreEqual(new DateTimeOffset(new DateTime(2000, 1, 1), TimeSpan.FromHours(6)), d.DateTimeOffsetField);
|
||||
@@ -3839,7 +3950,7 @@ keyword such as type of business.""
|
||||
""Decimal"": 99.9,
|
||||
""Complex"": {
|
||||
""String"": ""I am a string"",
|
||||
""DateTime"": ""\/Date(977338500000)\/""
|
||||
""DateTime"": ""2000-12-20T18:55:00Z""
|
||||
}
|
||||
}", json);
|
||||
|
||||
@@ -5168,7 +5279,7 @@ keyword such as type of business.""
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof (JsonReaderException), ExpectedMessage = "Unexpected token when reading integer: Boolean. Line 2, position 22.")]
|
||||
[ExpectedException(typeof(JsonReaderException), ExpectedMessage = "Error reading integer. Unexpected token: Boolean. Line 2, position 22.")]
|
||||
public void DeserializeBoolInt()
|
||||
{
|
||||
string json = @"{
|
||||
@@ -5223,7 +5334,7 @@ keyword such as type of business.""
|
||||
""BrokerID"": ""951663c4-924e-4c86-a57a-7ed737501dbd"",
|
||||
""Latitude"": 33.657145,
|
||||
""Longitude"": -117.766684,
|
||||
""TimeStamp"": ""\/Date(951955199000)\/"",
|
||||
""TimeStamp"": ""2000-03-01T23:59:59Z"",
|
||||
""Payload"": {
|
||||
""$type"": ""System.Byte[], mscorlib"",
|
||||
""$value"": ""AAECAwQFBgcICQ==""
|
||||
@@ -5372,6 +5483,79 @@ Parameter name: value")]
|
||||
{
|
||||
JsonConvert.DeserializeObject(null);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DeserializeIsoDatesWithIsoConverter()
|
||||
{
|
||||
string jsonIsoText =
|
||||
@"{""Value"":""2012-02-25T19:55:50.6095676+13:00""}";
|
||||
|
||||
DateTimeWrapper c = JsonConvert.DeserializeObject<DateTimeWrapper>(jsonIsoText, new IsoDateTimeConverter());
|
||||
Assert.AreEqual(DateTimeKind.Local, c.Value.Kind);
|
||||
}
|
||||
|
||||
#if !NET20
|
||||
[Test]
|
||||
public void DeserializeUTC()
|
||||
{
|
||||
DateTimeTestClass c =
|
||||
JsonConvert.DeserializeObject<DateTimeTestClass>(
|
||||
@"{""PreField"":""Pre"",""DateTimeField"":""2008-12-12T12:12:12Z"",""DateTimeOffsetField"":""2008-12-12T12:12:12Z"",""PostField"":""Post""}",
|
||||
new JsonSerializerSettings
|
||||
{
|
||||
DateTimeZoneHandling = DateTimeZoneHandling.Local
|
||||
});
|
||||
|
||||
Assert.AreEqual(new DateTime(2008, 12, 12, 12, 12, 12, 0, DateTimeKind.Utc).ToLocalTime(), c.DateTimeField);
|
||||
Assert.AreEqual(new DateTimeOffset(2008, 12, 12, 12, 12, 12, 0, TimeSpan.Zero), c.DateTimeOffsetField);
|
||||
Assert.AreEqual("Pre", c.PreField);
|
||||
Assert.AreEqual("Post", c.PostField);
|
||||
|
||||
DateTimeTestClass c2 =
|
||||
JsonConvert.DeserializeObject<DateTimeTestClass>(
|
||||
@"{""PreField"":""Pre"",""DateTimeField"":""2008-01-01T01:01:01Z"",""DateTimeOffsetField"":""2008-01-01T01:01:01Z"",""PostField"":""Post""}",
|
||||
new JsonSerializerSettings
|
||||
{
|
||||
DateTimeZoneHandling = DateTimeZoneHandling.Local
|
||||
});
|
||||
|
||||
Assert.AreEqual(new DateTime(2008, 1, 1, 1, 1, 1, 0, DateTimeKind.Utc).ToLocalTime(), c2.DateTimeField);
|
||||
Assert.AreEqual(new DateTimeOffset(2008, 1, 1, 1, 1, 1, 0, TimeSpan.Zero), c2.DateTimeOffsetField);
|
||||
Assert.AreEqual("Pre", c2.PreField);
|
||||
Assert.AreEqual("Post", c2.PostField);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void NullableDeserializeUTC()
|
||||
{
|
||||
NullableDateTimeTestClass c =
|
||||
JsonConvert.DeserializeObject<NullableDateTimeTestClass>(
|
||||
@"{""PreField"":""Pre"",""DateTimeField"":""2008-12-12T12:12:12Z"",""DateTimeOffsetField"":""2008-12-12T12:12:12Z"",""PostField"":""Post""}",
|
||||
new JsonSerializerSettings
|
||||
{
|
||||
DateTimeZoneHandling = DateTimeZoneHandling.Local
|
||||
});
|
||||
|
||||
Assert.AreEqual(new DateTime(2008, 12, 12, 12, 12, 12, 0, DateTimeKind.Utc).ToLocalTime(), c.DateTimeField);
|
||||
Assert.AreEqual(new DateTimeOffset(2008, 12, 12, 12, 12, 12, 0, TimeSpan.Zero), c.DateTimeOffsetField);
|
||||
Assert.AreEqual("Pre", c.PreField);
|
||||
Assert.AreEqual("Post", c.PostField);
|
||||
|
||||
NullableDateTimeTestClass c2 =
|
||||
JsonConvert.DeserializeObject<NullableDateTimeTestClass>(
|
||||
@"{""PreField"":""Pre"",""DateTimeField"":null,""DateTimeOffsetField"":null,""PostField"":""Post""}");
|
||||
|
||||
Assert.AreEqual(null, c2.DateTimeField);
|
||||
Assert.AreEqual(null, c2.DateTimeOffsetField);
|
||||
Assert.AreEqual("Pre", c2.PreField);
|
||||
Assert.AreEqual("Post", c2.PostField);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
public class DateTimeWrapper
|
||||
{
|
||||
public DateTime Value { get; set; }
|
||||
}
|
||||
|
||||
public class Widget1
|
||||
|
||||
@@ -62,7 +62,7 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
|
||||
//JsonConvert.ConvertDateTimeToJavaScriptTicks(s1.Establised.DateTime)
|
||||
|
||||
Assert.AreEqual(@"{""Color"":4,""Establised"":""\/Date(1264122061000)\/"",""Width"":1.1,""Employees"":999,""RoomsPerFloor"":[1,2,3,4,5,6,7,8,9],""Open"":false,""Symbol"":""@"",""Mottos"":[""Hello World"",""öäüÖÄÜ\\'{new Date(12345);}[222]_µ@²³~"",null,"" ""],""Cost"":100980.1,""Escape"":""\r\n\t\f\b?{\\r\\n\""'"",""product"":[{""Name"":""Rocket"",""ExpiryDate"":""\/Date(949532490000)\/"",""Price"":0.0},{""Name"":""Alien"",""ExpiryDate"":""\/Date(946684800000)\/"",""Price"":0.0}]}", sw.GetStringBuilder().ToString());
|
||||
Assert.AreEqual(@"{""Color"":4,""Establised"":""2010-01-22T01:01:01Z"",""Width"":1.1,""Employees"":999,""RoomsPerFloor"":[1,2,3,4,5,6,7,8,9],""Open"":false,""Symbol"":""@"",""Mottos"":[""Hello World"",""öäüÖÄÜ\\'{new Date(12345);}[222]_µ@²³~"",null,"" ""],""Cost"":100980.1,""Escape"":""\r\n\t\f\b?{\\r\\n\""'"",""product"":[{""Name"":""Rocket"",""ExpiryDate"":""2000-02-02T23:01:30Z"",""Price"":0.0},{""Name"":""Alien"",""ExpiryDate"":""2000-01-01T00:00:00Z"",""Price"":0.0}]}", sw.GetStringBuilder().ToString());
|
||||
|
||||
Store s2 = (Store)jsonSerializer.Deserialize(new JsonTextReader(new StringReader("{}")), typeof(Store));
|
||||
Assert.AreEqual("\r\n\t\f\b?{\\r\\n\"\'", s2.Escape);
|
||||
|
||||
@@ -290,10 +290,10 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
e = ex;
|
||||
}
|
||||
|
||||
Assert.AreEqual(@"Error converting value ""kjhkjhkjhkjh"" to type 'System.DateTime'. Line 1, position 16.", e.Message);
|
||||
Assert.AreEqual(@"Could not convert string to DateTime: kjhkjhkjhkjh. Line 1, position 16.", e.Message);
|
||||
|
||||
Assert.AreEqual(1, errors.Count);
|
||||
Assert.AreEqual(@"[0][0] - 0 - Error converting value ""kjhkjhkjhkjh"" to type 'System.DateTime'. Line 1, position 16.", errors[0]);
|
||||
Assert.AreEqual(@"[0][0] - 0 - Could not convert string to DateTime: kjhkjhkjhkjh. Line 1, position 16.", errors[0]);
|
||||
}
|
||||
|
||||
[Test]
|
||||
|
||||
@@ -192,8 +192,8 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
{
|
||||
""$type"": """ + personRef + @""",
|
||||
""Name"": null,
|
||||
""BirthDate"": ""\/Date(978134400000)\/"",
|
||||
""LastModified"": ""\/Date(978134400000)\/""
|
||||
""BirthDate"": ""2000-12-30T00:00:00Z"",
|
||||
""LastModified"": ""2000-12-30T00:00:00Z""
|
||||
},
|
||||
""String!"",
|
||||
-2147483648
|
||||
@@ -870,7 +870,7 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
|
||||
Assert.AreEqual(output, @"{
|
||||
""$type"": """ + carClassRef + @""",
|
||||
""Year"": ""\/Date(970707661000)\/"",
|
||||
""Year"": ""2000-10-05T01:01:01Z"",
|
||||
""Objects"": {
|
||||
""$type"": ""System.Object[], mscorlib"",
|
||||
""$values"": [
|
||||
|
||||
@@ -26,10 +26,12 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using NUnit.Framework;
|
||||
using Newtonsoft.Json.Utilities;
|
||||
|
||||
namespace Newtonsoft.Json.Tests
|
||||
{
|
||||
@@ -53,5 +55,14 @@ namespace Newtonsoft.Json.Tests
|
||||
{
|
||||
return @"@""" + json.Replace(@"""", @"""""") + @"""";
|
||||
}
|
||||
|
||||
protected string GetOffset(DateTime d, DateFormatHandling dateFormatHandling)
|
||||
{
|
||||
StringWriter sw = new StringWriter();
|
||||
JsonConvert.WriteDateTimeOffset(sw, DateTime.SpecifyKind(d, DateTimeKind.Local).GetUtcOffset(), dateFormatHandling);
|
||||
sw.Flush();
|
||||
|
||||
return sw.ToString();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user