-Added support for deserializing IList
-Fixed bugs
This commit is contained in:
@@ -4186,8 +4186,16 @@ To fix this error either change the environment to be fully trusted, change the
|
||||
4.3,
|
||||
null
|
||||
]", jsonText);
|
||||
}
|
||||
|
||||
double?[] d = (double?[])JsonConvert.DeserializeObject(jsonText, typeof(double?[]));
|
||||
[Test]
|
||||
public void DeserializeNullableArray()
|
||||
{
|
||||
double?[] d = (double?[])JsonConvert.DeserializeObject(@"[
|
||||
2.4,
|
||||
4.3,
|
||||
null
|
||||
]", typeof(double?[]));
|
||||
|
||||
Assert.AreEqual(3, d.Length);
|
||||
Assert.AreEqual(2.4, d[0]);
|
||||
@@ -6747,17 +6755,17 @@ Parameter name: value",
|
||||
public void DeserializeIEnumerableFromConstructor()
|
||||
{
|
||||
string json = @"[
|
||||
""One"",
|
||||
""II"",
|
||||
""3""
|
||||
1,
|
||||
2,
|
||||
null
|
||||
]";
|
||||
|
||||
var result = JsonConvert.DeserializeObject<EnumerableClass<string>>(json);
|
||||
var result = JsonConvert.DeserializeObject<EnumerableClass<int?>>(json);
|
||||
|
||||
Assert.AreEqual(3, result.Count());
|
||||
Assert.AreEqual("One", result.ElementAt(0));
|
||||
Assert.AreEqual("II", result.ElementAt(1));
|
||||
Assert.AreEqual("3", result.ElementAt(2));
|
||||
Assert.AreEqual(1, result.ElementAt(0));
|
||||
Assert.AreEqual(2, result.ElementAt(1));
|
||||
Assert.AreEqual(null, result.ElementAt(2));
|
||||
}
|
||||
|
||||
public class EnumerableClassFailure<T> : IEnumerable<T>
|
||||
@@ -6859,6 +6867,20 @@ Parameter name: value",
|
||||
|
||||
Assert.AreEqual(BigInteger.Parse("9000000000000000000000000000000000000000000000000"), nineQuindecillion);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DeserializeReadOnlyListWithNullableType()
|
||||
{
|
||||
string json = @"[
|
||||
1,
|
||||
null
|
||||
]";
|
||||
|
||||
var l = JsonConvert.DeserializeObject<IReadOnlyList<int?>>(json);
|
||||
|
||||
Assert.AreEqual(1, l[0]);
|
||||
Assert.AreEqual(null, l[1]);
|
||||
}
|
||||
#endif
|
||||
|
||||
[Test]
|
||||
@@ -7787,7 +7809,18 @@ Parameter name: value",
|
||||
}
|
||||
#endif
|
||||
|
||||
[Test]
|
||||
public void DeserializeNonGenericList()
|
||||
{
|
||||
IList l = JsonConvert.DeserializeObject<IList>("['string!']");
|
||||
|
||||
Assert.AreEqual(typeof(List<object>), l.GetType());
|
||||
Assert.AreEqual(1, l.Count);
|
||||
Assert.AreEqual("string!", l[0]);
|
||||
}
|
||||
|
||||
#if !(NET20 || NET35 || SILVERLIGHT || PORTABLE)
|
||||
[Test]
|
||||
public void SerializeBigInteger()
|
||||
{
|
||||
BigInteger i = BigInteger.Parse("123456789999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999990");
|
||||
|
||||
@@ -652,20 +652,20 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
{
|
||||
JsonSerializerSettings settings = new JsonSerializerSettings();
|
||||
settings.Error += (obj, args) =>
|
||||
{
|
||||
args.ErrorContext.Handled = true;
|
||||
};
|
||||
|
||||
var data = new List<ErrorPerson2>()
|
||||
{
|
||||
new ErrorPerson2{FirstName = "Scott", LastName = "Hanselman"},
|
||||
new ErrorPerson2{FirstName = "Scott", LastName = "Hunter"},
|
||||
new ErrorPerson2{FirstName = "Scott", LastName = "Guthrie"},
|
||||
args.ErrorContext.Handled = true;
|
||||
};
|
||||
|
||||
var dictionary = data.GroupBy(person => person.FirstName).ToDictionary(group => @group.Key, group => @group.Cast<IErrorPerson2>());
|
||||
var output = JsonConvert.SerializeObject(dictionary, Formatting.None, settings);
|
||||
Assert.AreEqual(@"{""Scott"":null}", output);
|
||||
var data = new List<ErrorPerson2>()
|
||||
{
|
||||
new ErrorPerson2 {FirstName = "Scott", LastName = "Hanselman"},
|
||||
new ErrorPerson2 {FirstName = "Scott", LastName = "Hunter"},
|
||||
new ErrorPerson2 {FirstName = "Scott", LastName = "Guthrie"},
|
||||
};
|
||||
|
||||
Dictionary<string, IEnumerable<IErrorPerson2>> dictionary = data.GroupBy(person => person.FirstName).ToDictionary(group => @group.Key, group => @group.Cast<IErrorPerson2>());
|
||||
string output = JsonConvert.SerializeObject(dictionary, Formatting.None, settings);
|
||||
Assert.AreEqual(@"{""Scott"":[]}", output);
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -685,10 +685,10 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
new ErrorPerson2 {FirstName = "James", LastName = "Newton-King"},
|
||||
};
|
||||
|
||||
var dictionary = data.GroupBy(person => person.FirstName).ToDictionary(group => @group.Key, group => @group.Cast<IErrorPerson2>());
|
||||
var output = JsonConvert.SerializeObject(dictionary, Formatting.None, settings);
|
||||
Dictionary<string, IEnumerable<IErrorPerson2>> dictionary = data.GroupBy(person => person.FirstName).ToDictionary(group => @group.Key, group => @group.Cast<IErrorPerson2>());
|
||||
string output = JsonConvert.SerializeObject(dictionary, Formatting.None, settings);
|
||||
|
||||
Assert.AreEqual(@"{""Scott"":null,""James"":null}", output);
|
||||
Assert.AreEqual(@"{""Scott"":[],""James"":[]}", output);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -867,7 +867,7 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
[Test]
|
||||
public void SerializingIEnumerableOfTShouldRetainGenericTypeInfo()
|
||||
{
|
||||
string productClassRef = ReflectionUtils.GetTypeName(typeof (Product[]), FormatterAssemblyStyle.Simple);
|
||||
string productClassRef = ReflectionUtils.GetTypeName(typeof(CustomEnumerable<Product>), FormatterAssemblyStyle.Simple);
|
||||
|
||||
CustomEnumerable<Product> products = new CustomEnumerable<Product>();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user