-Added JsonConstructorAttribute support for lists and dictionaries
This commit is contained in:
@@ -59,6 +59,248 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
[TestFixture]
|
||||
public class JsonSerializerCollectionsTests : TestFixtureBase
|
||||
{
|
||||
public class TestCollectionPrivateParameterized : IEnumerable<int>
|
||||
{
|
||||
private readonly List<int> _bars;
|
||||
|
||||
public TestCollectionPrivateParameterized()
|
||||
{
|
||||
_bars = new List<int>();
|
||||
}
|
||||
|
||||
[JsonConstructor]
|
||||
private TestCollectionPrivateParameterized(IEnumerable<int> bars)
|
||||
{
|
||||
_bars = new List<int>(bars);
|
||||
}
|
||||
|
||||
public void Add(int bar)
|
||||
{
|
||||
_bars.Add(bar);
|
||||
}
|
||||
|
||||
public IEnumerator<int> GetEnumerator() => _bars.GetEnumerator();
|
||||
|
||||
IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void CollectionJsonConstructorPrivateParameterized()
|
||||
{
|
||||
TestCollectionPrivateParameterized c1 = new TestCollectionPrivateParameterized();
|
||||
c1.Add(0);
|
||||
c1.Add(1);
|
||||
c1.Add(2);
|
||||
string json = JsonConvert.SerializeObject(c1);
|
||||
TestCollectionPrivateParameterized c2 = JsonConvert.DeserializeObject<TestCollectionPrivateParameterized>(json);
|
||||
|
||||
List<int> values = c2.ToList();
|
||||
|
||||
Assert.AreEqual(3, values.Count);
|
||||
Assert.AreEqual(0, values[0]);
|
||||
Assert.AreEqual(1, values[1]);
|
||||
Assert.AreEqual(2, values[2]);
|
||||
}
|
||||
|
||||
public class TestCollectionPrivate : List<int>
|
||||
{
|
||||
[JsonConstructor]
|
||||
private TestCollectionPrivate()
|
||||
{
|
||||
}
|
||||
|
||||
public static TestCollectionPrivate Create()
|
||||
{
|
||||
return new TestCollectionPrivate();
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void CollectionJsonConstructorPrivate()
|
||||
{
|
||||
TestCollectionPrivate c1 = TestCollectionPrivate.Create();
|
||||
c1.Add(0);
|
||||
c1.Add(1);
|
||||
c1.Add(2);
|
||||
string json = JsonConvert.SerializeObject(c1);
|
||||
TestCollectionPrivate c2 = JsonConvert.DeserializeObject<TestCollectionPrivate>(json);
|
||||
|
||||
List<int> values = c2.ToList();
|
||||
|
||||
Assert.AreEqual(3, values.Count);
|
||||
Assert.AreEqual(0, values[0]);
|
||||
Assert.AreEqual(1, values[1]);
|
||||
Assert.AreEqual(2, values[2]);
|
||||
}
|
||||
|
||||
public class TestCollectionMultipleParameters : List<int>
|
||||
{
|
||||
[JsonConstructor]
|
||||
public TestCollectionMultipleParameters(string s1, string s2)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void CollectionJsonConstructorMultipleParameters()
|
||||
{
|
||||
ExceptionAssert.Throws<JsonException>(
|
||||
() => JsonConvert.SerializeObject(new TestCollectionMultipleParameters(null, null)),
|
||||
"Constructor for 'Newtonsoft.Json.Tests.Serialization.JsonSerializerCollectionsTests+TestCollectionMultipleParameters' must have no parameters or a single parameter that implements 'System.Collections.Generic.IEnumerable`1[System.Int32]'.");
|
||||
}
|
||||
|
||||
public class TestCollectionBadIEnumerableParameter : List<int>
|
||||
{
|
||||
[JsonConstructor]
|
||||
public TestCollectionBadIEnumerableParameter(List<string> l)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void CollectionJsonConstructorBadIEnumerableParameter()
|
||||
{
|
||||
ExceptionAssert.Throws<JsonException>(
|
||||
() => JsonConvert.SerializeObject(new TestCollectionBadIEnumerableParameter(null)),
|
||||
"Constructor for 'Newtonsoft.Json.Tests.Serialization.JsonSerializerCollectionsTests+TestCollectionBadIEnumerableParameter' must have no parameters or a single parameter that implements 'System.Collections.Generic.IEnumerable`1[System.Int32]'.");
|
||||
}
|
||||
|
||||
#if !(DNXCORE50 || PORTABLE)
|
||||
public class TestCollectionNonGeneric : ArrayList
|
||||
{
|
||||
[JsonConstructor]
|
||||
public TestCollectionNonGeneric(IEnumerable l)
|
||||
: base(l.Cast<object>().ToList())
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void CollectionJsonConstructorNonGeneric()
|
||||
{
|
||||
string json = @"[1,2,3]";
|
||||
TestCollectionNonGeneric l = JsonConvert.DeserializeObject<TestCollectionNonGeneric>(json);
|
||||
|
||||
Assert.AreEqual(3, l.Count);
|
||||
Assert.AreEqual(1, l[0]);
|
||||
Assert.AreEqual(2, l[1]);
|
||||
Assert.AreEqual(3, l[2]);
|
||||
}
|
||||
#endif
|
||||
|
||||
public class TestDictionaryPrivateParameterized : Dictionary<string, int>
|
||||
{
|
||||
public TestDictionaryPrivateParameterized()
|
||||
{
|
||||
}
|
||||
|
||||
[JsonConstructor]
|
||||
private TestDictionaryPrivateParameterized(IEnumerable<KeyValuePair<string, int>> bars)
|
||||
: base(bars.ToDictionary(k => k.Key, k => k.Value))
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DictionaryJsonConstructorPrivateParameterized()
|
||||
{
|
||||
TestDictionaryPrivateParameterized c1 = new TestDictionaryPrivateParameterized();
|
||||
c1.Add("zero", 0);
|
||||
c1.Add("one", 1);
|
||||
c1.Add("two", 2);
|
||||
string json = JsonConvert.SerializeObject(c1);
|
||||
TestDictionaryPrivateParameterized c2 = JsonConvert.DeserializeObject<TestDictionaryPrivateParameterized>(json);
|
||||
|
||||
Assert.AreEqual(3, c2.Count);
|
||||
Assert.AreEqual(0, c2["zero"]);
|
||||
Assert.AreEqual(1, c2["one"]);
|
||||
Assert.AreEqual(2, c2["two"]);
|
||||
}
|
||||
|
||||
public class TestDictionaryPrivate : Dictionary<string, int>
|
||||
{
|
||||
[JsonConstructor]
|
||||
private TestDictionaryPrivate()
|
||||
{
|
||||
}
|
||||
|
||||
public static TestDictionaryPrivate Create()
|
||||
{
|
||||
return new TestDictionaryPrivate();
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DictionaryJsonConstructorPrivate()
|
||||
{
|
||||
TestDictionaryPrivate c1 = TestDictionaryPrivate.Create();
|
||||
c1.Add("zero", 0);
|
||||
c1.Add("one", 1);
|
||||
c1.Add("two", 2);
|
||||
string json = JsonConvert.SerializeObject(c1);
|
||||
TestDictionaryPrivate c2 = JsonConvert.DeserializeObject<TestDictionaryPrivate>(json);
|
||||
|
||||
Assert.AreEqual(3, c2.Count);
|
||||
Assert.AreEqual(0, c2["zero"]);
|
||||
Assert.AreEqual(1, c2["one"]);
|
||||
Assert.AreEqual(2, c2["two"]);
|
||||
}
|
||||
|
||||
public class TestDictionaryMultipleParameters : Dictionary<string, int>
|
||||
{
|
||||
[JsonConstructor]
|
||||
public TestDictionaryMultipleParameters(string s1, string s2)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DictionaryJsonConstructorMultipleParameters()
|
||||
{
|
||||
ExceptionAssert.Throws<JsonException>(
|
||||
() => JsonConvert.SerializeObject(new TestDictionaryMultipleParameters(null, null)),
|
||||
"Constructor for 'Newtonsoft.Json.Tests.Serialization.JsonSerializerCollectionsTests+TestDictionaryMultipleParameters' must have no parameters or a single parameter that implements 'System.Collections.Generic.IEnumerable`1[System.Collections.Generic.KeyValuePair`2[System.String,System.Int32]]'.");
|
||||
}
|
||||
|
||||
public class TestDictionaryBadIEnumerableParameter : Dictionary<string, int>
|
||||
{
|
||||
[JsonConstructor]
|
||||
public TestDictionaryBadIEnumerableParameter(Dictionary<string, string> l)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DictionaryJsonConstructorBadIEnumerableParameter()
|
||||
{
|
||||
ExceptionAssert.Throws<JsonException>(
|
||||
() => JsonConvert.SerializeObject(new TestDictionaryBadIEnumerableParameter(null)),
|
||||
"Constructor for 'Newtonsoft.Json.Tests.Serialization.JsonSerializerCollectionsTests+TestDictionaryBadIEnumerableParameter' must have no parameters or a single parameter that implements 'System.Collections.Generic.IEnumerable`1[System.Collections.Generic.KeyValuePair`2[System.String,System.Int32]]'.");
|
||||
}
|
||||
|
||||
#if !(DNXCORE50 || PORTABLE)
|
||||
public class TestDictionaryNonGeneric : Hashtable
|
||||
{
|
||||
[JsonConstructor]
|
||||
public TestDictionaryNonGeneric(IDictionary d)
|
||||
: base(d)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DictionaryJsonConstructorNonGeneric()
|
||||
{
|
||||
string json = @"{'zero':0,'one':1,'two':2}";
|
||||
TestDictionaryNonGeneric d = JsonConvert.DeserializeObject<TestDictionaryNonGeneric>(json);
|
||||
|
||||
Assert.AreEqual(3, d.Count);
|
||||
Assert.AreEqual(0, d["zero"]);
|
||||
Assert.AreEqual(1, d["one"]);
|
||||
Assert.AreEqual(2, d["two"]);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if !(NETFX_CORE || DNXCORE50)
|
||||
public class NameValueCollectionTestClass
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user