-Fixed JsonConvert.PopulateObject not setting JsonReader settings
This commit is contained in:
@@ -998,6 +998,28 @@ now brown cow?", '"', true);
|
||||
Assert.AreEqual("Bad Boys", m.Name);
|
||||
}
|
||||
|
||||
#if !NET20
|
||||
[Test]
|
||||
public void TestJsonDateTimeOffsetRoundtrip()
|
||||
{
|
||||
var now = DateTimeOffset.Now;
|
||||
var dict = new Dictionary<string, object> { { "foo", now } };
|
||||
|
||||
var settings = new JsonSerializerSettings();
|
||||
settings.DateFormatHandling = DateFormatHandling.IsoDateFormat;
|
||||
settings.DateParseHandling = DateParseHandling.DateTimeOffset;
|
||||
settings.DateTimeZoneHandling = DateTimeZoneHandling.RoundtripKind;
|
||||
var json = JsonConvert.SerializeObject(dict, settings);
|
||||
|
||||
var newDict = new Dictionary<string, object>();
|
||||
JsonConvert.PopulateObject(json, newDict, settings);
|
||||
|
||||
var date = newDict["foo"];
|
||||
|
||||
Assert.AreEqual(date, now);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if !(NET20 || NET35 || PORTABLE40 || PORTABLE)
|
||||
[Test]
|
||||
public void IntegerLengthOverflows()
|
||||
|
||||
@@ -91,6 +91,26 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
[TestFixture]
|
||||
public class JsonSerializerTest : TestFixtureBase
|
||||
{
|
||||
#if !NET20
|
||||
[Test]
|
||||
public void PopulateResetSettings()
|
||||
{
|
||||
JsonTextReader reader = new JsonTextReader(new StringReader(@"[""2000-01-01T01:01:01+00:00""]"));
|
||||
Assert.AreEqual(DateParseHandling.DateTime, reader.DateParseHandling);
|
||||
|
||||
JsonSerializer serializer = new JsonSerializer();
|
||||
serializer.DateParseHandling = DateParseHandling.DateTimeOffset;
|
||||
|
||||
IList<object> l = new List<object>();
|
||||
serializer.Populate(reader, l);
|
||||
|
||||
Assert.AreEqual(typeof(DateTimeOffset), l[0].GetType());
|
||||
Assert.AreEqual(new DateTimeOffset(2000, 1, 1, 1, 1, 1, TimeSpan.Zero), l[0]);
|
||||
|
||||
Assert.AreEqual(DateParseHandling.DateTime, reader.DateParseHandling);
|
||||
}
|
||||
#endif
|
||||
|
||||
public class BaseClass
|
||||
{
|
||||
internal bool IsTransient { get; set; }
|
||||
|
||||
@@ -289,6 +289,66 @@ Newtonsoft.Json Error: 0 : Error!
|
||||
Assert.IsFalse(traceWriter.TraceRecords.Any(r => r.Level == TraceLevel.Verbose));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Populate()
|
||||
{
|
||||
InMemoryTraceWriter traceWriter = new InMemoryTraceWriter
|
||||
{
|
||||
LevelFilter = TraceLevel.Info
|
||||
};
|
||||
|
||||
TraceTestObject o2 = new TraceTestObject();
|
||||
|
||||
JsonConvert.PopulateObject(@"{
|
||||
""IntList"": [
|
||||
1,
|
||||
2
|
||||
],
|
||||
""StringArray"": [
|
||||
""1"",
|
||||
""2""
|
||||
],
|
||||
""Version"": {
|
||||
""Major"": 1,
|
||||
""Minor"": 2,
|
||||
""Build"": 3,
|
||||
""Revision"": 4,
|
||||
""MajorRevision"": 0,
|
||||
""MinorRevision"": 4
|
||||
},
|
||||
""StringDictionary"": {
|
||||
""1"": ""!"",
|
||||
""Two"": ""!!"",
|
||||
""III"": ""!!!""
|
||||
}
|
||||
}",
|
||||
o2,
|
||||
new JsonSerializerSettings
|
||||
{
|
||||
TraceWriter = traceWriter
|
||||
});
|
||||
|
||||
Assert.AreEqual(2, o2.IntList.Count);
|
||||
Assert.AreEqual(2, o2.StringArray.Length);
|
||||
Assert.AreEqual(1, o2.Version.Major);
|
||||
Assert.AreEqual(2, o2.Version.Minor);
|
||||
Assert.AreEqual(3, o2.StringDictionary.Count);
|
||||
|
||||
Assert.AreEqual("Started deserializing Newtonsoft.Json.Tests.Serialization.TraceTestObject. Path 'IntList', line 2, position 13.", traceWriter.TraceRecords[0].Message);
|
||||
Assert.AreEqual("Started deserializing System.Collections.Generic.IList`1[System.Int32]. Path 'IntList', line 2, position 15.", traceWriter.TraceRecords[1].Message);
|
||||
Assert.IsTrue(traceWriter.TraceRecords[2].Message.StartsWith("Finished deserializing System.Collections.Generic.IList`1[System.Int32]. Path 'IntList'"));
|
||||
Assert.AreEqual("Started deserializing System.String[]. Path 'StringArray', line 6, position 19.", traceWriter.TraceRecords[3].Message);
|
||||
Assert.IsTrue(traceWriter.TraceRecords[4].Message.StartsWith("Finished deserializing System.String[]. Path 'StringArray'"));
|
||||
Assert.AreEqual("Deserializing System.Version using creator with parameters: Major, Minor, Build, Revision. Path 'Version.Major', line 11, position 13.", traceWriter.TraceRecords[5].Message);
|
||||
Assert.IsTrue(traceWriter.TraceRecords[6].Message.StartsWith("Started deserializing System.Version. Path 'Version'"));
|
||||
Assert.IsTrue(traceWriter.TraceRecords[7].Message.StartsWith("Finished deserializing System.Version. Path 'Version'"));
|
||||
Assert.AreEqual("Started deserializing System.Collections.Generic.IDictionary`2[System.String,System.String]. Path 'StringDictionary.1', line 19, position 9.", traceWriter.TraceRecords[8].Message);
|
||||
Assert.IsTrue(traceWriter.TraceRecords[9].Message.StartsWith("Finished deserializing System.Collections.Generic.IDictionary`2[System.String,System.String]. Path 'StringDictionary'"));
|
||||
Assert.IsTrue(traceWriter.TraceRecords[10].Message.StartsWith("Finished deserializing Newtonsoft.Json.Tests.Serialization.TraceTestObject. Path ''"));
|
||||
|
||||
Assert.IsFalse(traceWriter.TraceRecords.Any(r => r.Level == TraceLevel.Verbose));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ErrorDeserializing()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user