-Implemented INotifyCollectionChanged on JContainer in Silverlight
-Added StreamingContext to JsonSerializer -Added CreateMemberValueProvider method to DefaultContractResolver -Fixed not falling back the original class from the metadata class when attribute not found
This commit is contained in:
@@ -9,6 +9,7 @@ using Newtonsoft.Json.Linq;
|
||||
using Newtonsoft.Json.Converters;
|
||||
using System.IO;
|
||||
using System.Collections;
|
||||
using System.Collections.Specialized;
|
||||
#if !PocketPC && !SILVERLIGHT
|
||||
using System.Web.UI;
|
||||
#endif
|
||||
@@ -1304,6 +1305,44 @@ Parameter name: arrayIndex")]
|
||||
Assert.AreEqual(index, 0);
|
||||
Assert.AreEqual(2, (int)o["Test1"]);
|
||||
}
|
||||
#else
|
||||
[Test]
|
||||
public void ListChanged()
|
||||
{
|
||||
JProperty p1 = new JProperty("Test1", 1);
|
||||
JProperty p2 = new JProperty("Test2", "Two");
|
||||
JObject o = new JObject(p1, p2);
|
||||
|
||||
NotifyCollectionChangedAction? changedType = null;
|
||||
int? index = null;
|
||||
|
||||
o.CollectionChanged += (s, a) =>
|
||||
{
|
||||
changedType = a.Action;
|
||||
index = a.NewStartingIndex;
|
||||
};
|
||||
|
||||
JProperty p3 = new JProperty("Test3", "III");
|
||||
|
||||
o.Add(p3);
|
||||
Assert.AreEqual(changedType, NotifyCollectionChangedAction.Add);
|
||||
Assert.AreEqual(index, 2);
|
||||
Assert.AreEqual(p3, ((IList<JToken>)o)[index.Value]);
|
||||
|
||||
JProperty p4 = new JProperty("Test4", "IV");
|
||||
|
||||
((IList<JToken>)o)[index.Value] = p4;
|
||||
Assert.AreEqual(changedType, NotifyCollectionChangedAction.Replace);
|
||||
Assert.AreEqual(index, 2);
|
||||
Assert.AreEqual(p4, ((IList<JToken>)o)[index.Value]);
|
||||
Assert.IsFalse(((IList<JToken>)o).Contains(p3));
|
||||
Assert.IsTrue(((IList<JToken>)o).Contains(p4));
|
||||
|
||||
o["Test1"] = 2;
|
||||
Assert.AreEqual(changedType, NotifyCollectionChangedAction.Replace);
|
||||
Assert.AreEqual(index, 0);
|
||||
Assert.AreEqual(2, (int)o["Test1"]);
|
||||
}
|
||||
#endif
|
||||
|
||||
[Test]
|
||||
|
||||
@@ -7,6 +7,8 @@ using Newtonsoft.Json.Tests.LinqToSql;
|
||||
using NUnit.Framework;
|
||||
using System.Reflection;
|
||||
using System.ComponentModel;
|
||||
using Newtonsoft.Json.Serialization;
|
||||
using System.Data.Linq.Mapping;
|
||||
|
||||
namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
{
|
||||
@@ -97,6 +99,12 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
Assert.AreEqual(1, person.PersonRoles[0].Role.PersonRoles.Count);
|
||||
|
||||
Assert.AreEqual("Name!", person.Department.Name);
|
||||
|
||||
TableAttribute tableAttribute = JsonTypeReflector.GetAttribute<TableAttribute>(typeof(Person));
|
||||
Assert.AreEqual("", tableAttribute.Name);
|
||||
|
||||
ColumnAttribute columnAttribute = JsonTypeReflector.GetAttribute<ColumnAttribute>(typeof(Person).GetProperty("FirstName"));
|
||||
Assert.AreEqual("_FirstName", columnAttribute.Storage);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -28,6 +28,7 @@ using System;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Runtime.Serialization;
|
||||
using System.Text;
|
||||
using Newtonsoft.Json.Tests;
|
||||
using Newtonsoft.Json.Tests.TestObjects;
|
||||
@@ -230,6 +231,37 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
Console.WriteLine(obj.Member4);
|
||||
// This value was set after deserialization.
|
||||
}
|
||||
|
||||
#if !SILVERLIGHT
|
||||
public class SerializationEventContextTestObject
|
||||
{
|
||||
public string TestMember { get; set; }
|
||||
|
||||
[OnSerializing]
|
||||
internal void OnSerializingMethod(StreamingContext context)
|
||||
{
|
||||
TestMember = context.State + " " + context.Context;
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void SerializationEventContextTest()
|
||||
{
|
||||
SerializationEventContextTestObject value = new SerializationEventContextTestObject();
|
||||
|
||||
string json = JsonConvert.SerializeObject(value, Formatting.Indented, new JsonSerializerSettings
|
||||
{
|
||||
Context =
|
||||
new StreamingContext(
|
||||
StreamingContextStates.Remoting,
|
||||
"ContextValue")
|
||||
});
|
||||
|
||||
Assert.AreEqual(@"{
|
||||
""TestMember"": ""Remoting ContextValue""
|
||||
}", json);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
#endif
|
||||
Reference in New Issue
Block a user