-Fixed error when extension data bag doesn't inherit from Dictionary<TKey, TValue>

This commit is contained in:
James Newton-King
2014-11-03 13:29:57 -08:00
parent fbf24eed69
commit 3fa2949a38
4 changed files with 158 additions and 3 deletions
@@ -25,6 +25,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Tests.TestObjects;
@@ -45,6 +46,124 @@ namespace Newtonsoft.Json.Tests.Serialization
[TestFixture]
public class ExtensionDataTests : TestFixtureBase
{
public class CustomDictionary : IDictionary<string, object>
{
private readonly IDictionary<string, object> _inner = new Dictionary<string, object>();
public void Add(string key, object value)
{
_inner.Add(key, value);
}
public bool ContainsKey(string key)
{
return _inner.ContainsKey(key);
}
public ICollection<string> Keys
{
get { return _inner.Keys; }
}
public bool Remove(string key)
{
return _inner.Remove(key);
}
public bool TryGetValue(string key, out object value)
{
return _inner.TryGetValue(key, out value);
}
public ICollection<object> Values
{
get { return _inner.Values; }
}
public object this[string key]
{
get { return _inner[key]; }
set { _inner[key] = value; }
}
public void Add(KeyValuePair<string, object> item)
{
_inner.Add(item);
}
public void Clear()
{
_inner.Clear();
}
public bool Contains(KeyValuePair<string, object> item)
{
return _inner.Contains(item);
}
public void CopyTo(KeyValuePair<string, object>[] array, int arrayIndex)
{
_inner.CopyTo(array, arrayIndex);
}
public int Count
{
get { return _inner.Count; }
}
public bool IsReadOnly
{
get { return _inner.IsReadOnly; }
}
public bool Remove(KeyValuePair<string, object> item)
{
return _inner.Remove(item);
}
public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
{
return _inner.GetEnumerator();
}
System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
{
return _inner.GetEnumerator();
}
}
public class Example
{
public Example()
{
Data = new CustomDictionary();
}
[JsonExtensionData]
public IDictionary<string, object> Data { get; private set; }
}
[Test]
public void Sdfsdf()
{
Example e = new Example();
e.Data.Add("extensionData1", new int[] { 1, 2, 3 });
string json = JsonConvert.SerializeObject(e, Formatting.Indented);
Console.WriteLine(json);
Example e2 = JsonConvert.DeserializeObject<Example>(json);
JToken o1 = (JToken)e2.Data["extensionData1"];
Assert.AreEqual(JTokenType.Array, o1.Type);
Assert.AreEqual(3, o1.Count());
Assert.AreEqual(1, (int)o1[0]);
Assert.AreEqual(2, (int)o1[1]);
Assert.AreEqual(3, (int)o1[2]);
}
public class ExtensionDataDeserializeWithNonDefaultConstructor
{
public ExtensionDataDeserializeWithNonDefaultConstructor(string name)