-Added JSON Schema implementation
-Move test serialization objects to TestObjects namespace -Fixed JsonConvert to always write a floating point number with a decimal place -Changed Type values to serialize and deserialize to type name string -Fixed JsonWriter to allow objects and arrays to be written in a constructor -Added JsonContainerAttribute with Id, Title and Description members. JsonObject and JsonArray inherit from this attribute -Added JsonArrayAttribute. Has flag to control whether array can contain null items. -Added IsRequired to JsonProperty -Replaced protected method GetSerializableMembers with GetMemberMappings on JsonSerializer -Fixed QuoteChar not getting set when parsing property name -Added Load(JsonReader) to JProperty, JConstructor -Fixed error when populating JProperty with content from collection -Added the ability for JsonTokenWriter to write individual values as well as arrays and objects -Added CreateReader to JToken -Added FromObject to JToken -Added ReadFrom to JToken
This commit is contained in:
@@ -0,0 +1,35 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using NUnit.Framework;
|
||||
using System.IO;
|
||||
|
||||
namespace Newtonsoft.Json.Tests.Linq
|
||||
{
|
||||
public class JConstructorTests : TestFixtureBase
|
||||
{
|
||||
[Test]
|
||||
public void Load()
|
||||
{
|
||||
JsonReader reader = new JsonTextReader(new StringReader("new Date(123)"));
|
||||
reader.Read();
|
||||
|
||||
JConstructor constructor = JConstructor.Load(reader);
|
||||
Assert.AreEqual("Date", constructor.Name);
|
||||
Assert.IsTrue(JToken.DeepEquals(new JValue(123), constructor.Values().ElementAt(0)));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void CreateWithMultiValue()
|
||||
{
|
||||
JConstructor constructor = new JConstructor("Test", new List<int> { 1, 2, 3 });
|
||||
Assert.AreEqual("Test", constructor.Name);
|
||||
Assert.AreEqual(3, constructor.Children().Count());
|
||||
Assert.AreEqual(1, (int)constructor.Children().ElementAt(0));
|
||||
Assert.AreEqual(2, (int)constructor.Children().ElementAt(1));
|
||||
Assert.AreEqual(3, (int)constructor.Children().ElementAt(2));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using Newtonsoft.Json.Tests.TestObjects;
|
||||
using NUnit.Framework;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using Newtonsoft.Json.Converters;
|
||||
@@ -235,7 +236,7 @@ Parameter name: arrayIndex")]
|
||||
[Test]
|
||||
public void FromObjectRaw()
|
||||
{
|
||||
JsonSerializerTest.PersonRaw raw = new JsonSerializerTest.PersonRaw
|
||||
PersonRaw raw = new PersonRaw
|
||||
{
|
||||
FirstName = "FirstNameValue",
|
||||
RawContent = new JsonRaw("[1,2,3,4,5]"),
|
||||
@@ -253,7 +254,7 @@ Parameter name: arrayIndex")]
|
||||
[Test]
|
||||
public void JsonTokenReader()
|
||||
{
|
||||
JsonSerializerTest.PersonRaw raw = new JsonSerializerTest.PersonRaw
|
||||
PersonRaw raw = new PersonRaw
|
||||
{
|
||||
FirstName = "FirstNameValue",
|
||||
RawContent = new JsonRaw("[1,2,3,4,5]"),
|
||||
@@ -294,7 +295,7 @@ Parameter name: arrayIndex")]
|
||||
[Test]
|
||||
public void DeserializeFromRaw()
|
||||
{
|
||||
JsonSerializerTest.PersonRaw raw = new JsonSerializerTest.PersonRaw
|
||||
PersonRaw raw = new PersonRaw
|
||||
{
|
||||
FirstName = "FirstNameValue",
|
||||
RawContent = new JsonRaw("[1,2,3,4,5]"),
|
||||
@@ -305,7 +306,7 @@ Parameter name: arrayIndex")]
|
||||
|
||||
JsonReader reader = new JsonTokenReader(o);
|
||||
JsonSerializer serializer = new JsonSerializer();
|
||||
raw = (JsonSerializerTest.PersonRaw)serializer.Deserialize(reader, typeof(JsonSerializerTest.PersonRaw));
|
||||
raw = (PersonRaw)serializer.Deserialize(reader, typeof(PersonRaw));
|
||||
|
||||
Assert.AreEqual("FirstNameValue", raw.FirstName);
|
||||
Assert.AreEqual("LastNameValue", raw.LastName);
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using NUnit.Framework;
|
||||
using System.IO;
|
||||
|
||||
namespace Newtonsoft.Json.Tests.Linq
|
||||
{
|
||||
public class JPropertyTests : TestFixtureBase
|
||||
{
|
||||
[Test]
|
||||
public void Load()
|
||||
{
|
||||
JsonReader reader = new JsonTextReader(new StringReader("{'propertyname':['value1']}"));
|
||||
reader.Read();
|
||||
|
||||
Assert.AreEqual(JsonToken.StartObject, reader.TokenType);
|
||||
reader.Read();
|
||||
|
||||
JProperty property = JProperty.Load(reader);
|
||||
Assert.AreEqual("propertyname", property.Name);
|
||||
Assert.IsTrue(JToken.DeepEquals(JArray.Parse("['value1']"), property.Value));
|
||||
|
||||
Assert.AreEqual(JsonToken.EndObject, reader.TokenType);
|
||||
|
||||
reader = new JsonTextReader(new StringReader("{'propertyname':null}"));
|
||||
reader.Read();
|
||||
|
||||
Assert.AreEqual(JsonToken.StartObject, reader.TokenType);
|
||||
reader.Read();
|
||||
|
||||
property = JProperty.Load(reader);
|
||||
Assert.AreEqual("propertyname", property.Name);
|
||||
Assert.IsTrue(JToken.DeepEquals(new JValue(null, JsonTokenType.Null), property.Value));
|
||||
|
||||
Assert.AreEqual(JsonToken.EndObject, reader.TokenType);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void MultiContentConstructor()
|
||||
{
|
||||
JProperty p = new JProperty("error", new List<string> { "one", "two" });
|
||||
JArray a = (JArray) p.Value;
|
||||
|
||||
Assert.AreEqual(a.Count, 2);
|
||||
Assert.AreEqual("one", (string)a[0]);
|
||||
Assert.AreEqual("two", (string)a[1]);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -29,11 +29,47 @@ using System.Linq;
|
||||
using System.Text;
|
||||
using NUnit.Framework;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System.IO;
|
||||
|
||||
namespace Newtonsoft.Json.Tests.Linq
|
||||
{
|
||||
public class JTokenTests : TestFixtureBase
|
||||
{
|
||||
[Test]
|
||||
public void ReadFrom()
|
||||
{
|
||||
JObject o = (JObject)JToken.ReadFrom(new JsonTextReader(new StringReader("{'pie':true}")));
|
||||
Assert.AreEqual(true, (bool)o["pie"]);
|
||||
|
||||
JArray a = (JArray)JToken.ReadFrom(new JsonTextReader(new StringReader("[1,2,3]")));
|
||||
Assert.AreEqual(1, (int)a[0]);
|
||||
Assert.AreEqual(2, (int)a[1]);
|
||||
Assert.AreEqual(3, (int)a[2]);
|
||||
|
||||
JsonReader reader = new JsonTextReader(new StringReader("{'pie':true}"));
|
||||
reader.Read();
|
||||
reader.Read();
|
||||
|
||||
JProperty p = (JProperty)JToken.ReadFrom(reader);
|
||||
Assert.AreEqual("pie", p.Name);
|
||||
Assert.AreEqual(true, (bool)p.Value);
|
||||
|
||||
JConstructor c = (JConstructor)JToken.ReadFrom(new JsonTextReader(new StringReader("new Date(1)")));
|
||||
Assert.AreEqual("Date", c.Name);
|
||||
Assert.IsTrue(JToken.DeepEquals(new JValue(1), c.Values().ElementAt(0)));
|
||||
|
||||
JValue v;
|
||||
|
||||
v = (JValue)JToken.ReadFrom(new JsonTextReader(new StringReader(@"""stringvalue""")));
|
||||
Assert.AreEqual("stringvalue", (string)v);
|
||||
|
||||
v = (JValue)JToken.ReadFrom(new JsonTextReader(new StringReader(@"1")));
|
||||
Assert.AreEqual(1, (int)v);
|
||||
|
||||
v = (JValue)JToken.ReadFrom(new JsonTextReader(new StringReader(@"1.1")));
|
||||
Assert.AreEqual(1.1, (double)v);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Parent()
|
||||
{
|
||||
|
||||
@@ -32,6 +32,7 @@ using Newtonsoft.Json.Linq;
|
||||
using System.Xml;
|
||||
using System.IO;
|
||||
using Newtonsoft.Json.Converters;
|
||||
using Newtonsoft.Json.Tests.TestObjects;
|
||||
|
||||
namespace Newtonsoft.Json.Tests.Linq
|
||||
{
|
||||
@@ -351,13 +352,13 @@ keyword such as type of business.""
|
||||
[
|
||||
""1"",
|
||||
2,
|
||||
3,
|
||||
3.0,
|
||||
""\/Date(-62030076711000)\/""
|
||||
],
|
||||
new ConstructorName(
|
||||
""param1"",
|
||||
2,
|
||||
3
|
||||
3.0
|
||||
)
|
||||
]", a.ToString());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user