-Fixed error serializing some non-generic collections

This commit is contained in:
James Newton-King
2013-04-12 12:14:50 +12:00
parent cb7ac1dfb4
commit f527d0bd4c
3 changed files with 65 additions and 29 deletions
+2
View File
@@ -1,6 +1,8 @@
[Bb]in/ [Bb]in/
[Oo]bj/ [Oo]bj/
[Ww]orking/ [Ww]orking/
Build/runbuild.txt
Doc/doc.shfbproj_*
TestResults/ TestResults/
AppPackages/ AppPackages/
*.suo *.suo
@@ -90,39 +90,73 @@ namespace Newtonsoft.Json.Tests.Serialization
[TestFixture] [TestFixture]
public class JsonSerializerTest : TestFixtureBase public class JsonSerializerTest : TestFixtureBase
{ {
//[DataContract] public class GenericItem<T>
//public class BaseDataContract1 {
//{ public T Value { get; set; }
// [DataMember(Name = "virtualMember")] }
// public virtual string VirtualMember { get; set; }
// [DataMember(Name = "nonVirtualMember")] public class NonGenericItem : GenericItem<string>
// public string NonVirtualMember { get; set; } {
// public virtual object NewMember { get; set; } }
//}
//public class ChildDataContract1 : BaseDataContract1 public class GenericClass<T, TValue> : IEnumerable<T>
//{ where T : GenericItem<TValue>, new()
// [DataMember(Name = "NewMember")] {
// public virtual new string NewMember { get; set; } public IList<T> Items { get; set; }
// public override string VirtualMember { get; set; }
// public string AddedMember { get; set; }
//}
//[Test] public GenericClass()
//public void ChildDataContractTest1() {
//{ Items = new List<T>();
// var cc = new ChildDataContract1 }
// {
// VirtualMember = "VirtualMember!",
// NonVirtualMember = "NonVirtualMember!",
// NewMember = "NewMember!"
// };
// string result = JsonConvert.SerializeObject(cc); public IEnumerator<T> GetEnumerator()
// Assert.AreEqual(@"{""NewMember"":""NewMember!"",""virtualMember"":""VirtualMember!"",""nonVirtualMember"":""NonVirtualMember!""}", result); {
//} if (Items != null)
{
foreach (T item in Items)
{
yield return item;
}
}
else
yield break;
}
IEnumerator IEnumerable.GetEnumerator()
{
return GetEnumerator();
}
}
public class NonGenericClass : GenericClass<GenericItem<string>, string>
{
}
[Test]
public void GenericCollectionInheritance()
{
string json;
GenericClass<GenericItem<string>, string> foo1 = new GenericClass<GenericItem<string>, string>();
foo1.Items.Add(new GenericItem<string> {Value = "Hello"});
json = JsonConvert.SerializeObject(new {selectList = foo1});
Assert.AreEqual(@"{""selectList"":[{""Value"":""Hello""}]}", json);
GenericClass<NonGenericItem, string> foo2 = new GenericClass<NonGenericItem, string>();
foo2.Items.Add(new NonGenericItem {Value = "Hello"});
json = JsonConvert.SerializeObject(new { selectList = foo2 });
Assert.AreEqual(@"{""selectList"":[{""Value"":""Hello""}]}", json);
NonGenericClass foo3 = new NonGenericClass();
foo3.Items.Add(new NonGenericItem {Value = "Hello"});
json = JsonConvert.SerializeObject(new { selectList = foo3 });
Assert.AreEqual(@"{""selectList"":[{""Value"":""Hello""}]}", json);
}
[Test] [Test]
public void PersonTypedObjectDeserialization() public void PersonTypedObjectDeserialization()
@@ -143,7 +143,7 @@ namespace Newtonsoft.Json.Serialization
ParametrizedConstructor = CollectionUtils.ResolveEnumableCollectionConstructor(underlyingType, CollectionItemType); ParametrizedConstructor = CollectionUtils.ResolveEnumableCollectionConstructor(underlyingType, CollectionItemType);
if (underlyingType.GetGenericTypeDefinition() == typeof (IEnumerable<>)) if (underlyingType.IsGenericType() && underlyingType.GetGenericTypeDefinition() == typeof(IEnumerable<>))
{ {
_genericCollectionDefinitionType = tempCollectionType; _genericCollectionDefinitionType = tempCollectionType;