-Added more IBindingList functionality
-Fixed many bugs around JProperty and JObject -Changed JProperty constructor that doesn't take a value to internal -Added many unit tests -Renamed CloneNode to CloseToken -Changed JPropertyDescriptor to always return the token rather than value
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using Newtonsoft.Json.Linq;
|
||||
@@ -10,6 +12,82 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
{
|
||||
public class JPropertyTests : TestFixtureBase
|
||||
{
|
||||
[Test]
|
||||
public void NullValue()
|
||||
{
|
||||
JProperty p = new JProperty("TestProperty", null);
|
||||
Assert.IsNotNull(p.Value);
|
||||
Assert.AreEqual(JTokenType.Null, p.Value.Type);
|
||||
Assert.AreEqual(p, p.Value.Parent);
|
||||
|
||||
p.Value = null;
|
||||
Assert.IsNotNull(p.Value);
|
||||
Assert.AreEqual(JTokenType.Null, p.Value.Type);
|
||||
Assert.AreEqual(p, p.Value.Parent);
|
||||
}
|
||||
|
||||
#if !SILVERLIGHT
|
||||
[Test]
|
||||
public void ListChanged()
|
||||
{
|
||||
JProperty p = new JProperty("TestProperty", null);
|
||||
IBindingList l = p;
|
||||
|
||||
ListChangedType? listChangedType = null;
|
||||
int? index = null;
|
||||
|
||||
l.ListChanged += (sender, args) =>
|
||||
{
|
||||
listChangedType = args.ListChangedType;
|
||||
index = args.NewIndex;
|
||||
};
|
||||
|
||||
p.Value = 1;
|
||||
|
||||
Assert.AreEqual(ListChangedType.ItemChanged, listChangedType.Value);
|
||||
Assert.AreEqual(0, index.Value);
|
||||
}
|
||||
#endif
|
||||
|
||||
[Test]
|
||||
public void IListCount()
|
||||
{
|
||||
JProperty p = new JProperty("TestProperty", null);
|
||||
IList l = p;
|
||||
|
||||
Assert.AreEqual(1, l.Count);
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof(Exception), ExpectedMessage = "Cannot add or remove items from Newtonsoft.Json.Linq.JProperty.")]
|
||||
public void IListClear()
|
||||
{
|
||||
JProperty p = new JProperty("TestProperty", null);
|
||||
IList l = p;
|
||||
|
||||
l.Clear();
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof(Exception), ExpectedMessage = "Newtonsoft.Json.Linq.JProperty cannot have multiple values.")]
|
||||
public void IListAdd()
|
||||
{
|
||||
JProperty p = new JProperty("TestProperty", null);
|
||||
IList l = p;
|
||||
|
||||
l.Add(null);
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof(Exception), ExpectedMessage = "Cannot add or remove items from Newtonsoft.Json.Linq.JProperty.")]
|
||||
public void IListRemove()
|
||||
{
|
||||
JProperty p = new JProperty("TestProperty", null);
|
||||
IList l = p;
|
||||
|
||||
l.Remove(p.Value);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Load()
|
||||
{
|
||||
@@ -48,5 +126,14 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
Assert.AreEqual("one", (string)a[0]);
|
||||
Assert.AreEqual("two", (string)a[1]);
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof(Exception), ExpectedMessage = "Newtonsoft.Json.Linq.JProperty cannot have multiple values.")]
|
||||
public void IListGenericAdd()
|
||||
{
|
||||
IList<JToken> t = new JProperty("error", new List<string> { "one", "two" });
|
||||
t.Add(1);
|
||||
t.Add(2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user