Merge branch 'master' of github.com:JamesNK/Newtonsoft.Json

This commit is contained in:
James Newton-King
2013-03-11 19:23:59 +13:00
8 changed files with 187 additions and 103 deletions
@@ -63,10 +63,13 @@ namespace Newtonsoft.Json.Tests.Serialization
Dictionary<string, object> values = new Dictionary<string, object>();
IContractResolver c = DefaultContractResolver.Instance;
JsonDynamicContract dynamicContract = (JsonDynamicContract)c.ResolveContract(dynamicObject.GetType());
foreach (string memberName in dynamicObject.GetDynamicMemberNames())
{
object value;
dynamicObject.TryGetMember(memberName, out value);
dynamicContract.TryGetMember(dynamicObject, memberName, out value);
values.Add(memberName, value);
}
@@ -6638,6 +6638,43 @@ Parameter name: value",
}", json);
}
public class EnumerableClass<T> : IEnumerable<T>
{
private readonly IList<T> _values;
public EnumerableClass(IEnumerable<T> values)
{
_values = new List<T>(values);
}
public IEnumerator<T> GetEnumerator()
{
return _values.GetEnumerator();
}
IEnumerator IEnumerable.GetEnumerator()
{
return GetEnumerator();
}
}
[Test]
public void DeserializeIEnumerableFromConstructor()
{
string json = @"[
""One"",
""II"",
""3""
]";
var result = JsonConvert.DeserializeObject<EnumerableClass<string>>(json);
Assert.AreEqual(3, result.Count());
Assert.AreEqual("One", result.ElementAt(0));
Assert.AreEqual("II", result.ElementAt(1));
Assert.AreEqual("3", result.ElementAt(2));
}
[JsonObject(MemberSerialization.Fields)]
public class MyTuple<T1>
{