-Added DataSetConverter, DataTableConverter
-Added JPath and SelectToken to JToken -Fixed schema id not being written for collections -Fixed TimeSpan serialization on Compact Framework -Fixed unicode line break string encoding
This commit is contained in:
@@ -0,0 +1,199 @@
|
||||
#if !SILVERLIGHT
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using Newtonsoft.Json.Converters;
|
||||
using NUnit.Framework;
|
||||
using Newtonsoft.Json.Tests.TestObjects;
|
||||
using System.Data;
|
||||
|
||||
namespace Newtonsoft.Json.Tests.Converters
|
||||
{
|
||||
public class DataSetConverterTests : TestFixtureBase
|
||||
{
|
||||
[Test]
|
||||
public void SerializeAndDeserialize()
|
||||
{
|
||||
DataSet dataSet = new DataSet("dataSet");
|
||||
dataSet.Namespace = "NetFrameWork";
|
||||
DataTable table = new DataTable();
|
||||
DataColumn idColumn = new DataColumn("id", typeof(int));
|
||||
idColumn.AutoIncrement = true;
|
||||
|
||||
DataColumn itemColumn = new DataColumn("item");
|
||||
table.Columns.Add(idColumn);
|
||||
table.Columns.Add(itemColumn);
|
||||
dataSet.Tables.Add(table);
|
||||
|
||||
for (int i = 0; i < 2; i++)
|
||||
{
|
||||
DataRow newRow = table.NewRow();
|
||||
newRow["item"] = "item " + i;
|
||||
table.Rows.Add(newRow);
|
||||
}
|
||||
|
||||
dataSet.AcceptChanges();
|
||||
|
||||
string json = JsonConvert.SerializeObject(dataSet, Formatting.Indented);
|
||||
|
||||
Assert.AreEqual(@"{
|
||||
""Table1"": [
|
||||
{
|
||||
""id"": 0,
|
||||
""item"": ""item 0""
|
||||
},
|
||||
{
|
||||
""id"": 1,
|
||||
""item"": ""item 1""
|
||||
}
|
||||
]
|
||||
}", json);
|
||||
|
||||
DataSet deserializedDataSet = JsonConvert.DeserializeObject<DataSet>(json);
|
||||
Assert.IsNotNull(deserializedDataSet);
|
||||
|
||||
Assert.AreEqual(1, deserializedDataSet.Tables.Count);
|
||||
|
||||
DataTable dt = deserializedDataSet.Tables[0];
|
||||
|
||||
Assert.AreEqual("Table1", dt.TableName);
|
||||
Assert.AreEqual(2, dt.Columns.Count);
|
||||
Assert.AreEqual("id", dt.Columns[0].ColumnName);
|
||||
Assert.AreEqual(typeof(long), dt.Columns[0].DataType);
|
||||
Assert.AreEqual("item", dt.Columns[1].ColumnName);
|
||||
Assert.AreEqual(typeof(string), dt.Columns[1].DataType);
|
||||
|
||||
Assert.AreEqual(2, dt.Rows.Count);
|
||||
}
|
||||
|
||||
public void SerializeMultiTableDataSet()
|
||||
{
|
||||
DataSet ds = new DataSet();
|
||||
ds.Tables.Add(CreateDataTable("FirstTable"));
|
||||
ds.Tables.Add(CreateDataTable("SecondTable"));
|
||||
|
||||
string json = JsonConvert.SerializeObject(ds, Formatting.Indented, new IsoDateTimeConverter());
|
||||
|
||||
Assert.AreEqual(@"{
|
||||
""FirstTable"": [
|
||||
{
|
||||
""StringCol"": ""Item Name"",
|
||||
""Int32Col"": 2147483647,
|
||||
""BooleanCol"": true,
|
||||
""TimeSpanCol"": ""10.22:10:15.1000000"",
|
||||
""DateTimeCol"": ""2000-12-29T00:00:00"",
|
||||
""DecimalCol"": 64.0021
|
||||
}
|
||||
],
|
||||
""SecondTable"": [
|
||||
{
|
||||
""StringCol"": ""Item Name"",
|
||||
""Int32Col"": 2147483647,
|
||||
""BooleanCol"": true,
|
||||
""TimeSpanCol"": ""10.22:10:15.1000000"",
|
||||
""DateTimeCol"": ""2000-12-29T00:00:00"",
|
||||
""DecimalCol"": 64.0021
|
||||
}
|
||||
]
|
||||
}", json);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DeserializeMultiTableDataSet()
|
||||
{
|
||||
string json = @"{
|
||||
""FirstTable"": [
|
||||
{
|
||||
""StringCol"": ""Item Name"",
|
||||
""Int32Col"": 2147483647,
|
||||
""BooleanCol"": true,
|
||||
""TimeSpanCol"": ""10.22:10:15.1000000"",
|
||||
""DateTimeCol"": ""2000-12-29T00:00:00"",
|
||||
""DecimalCol"": 64.0021
|
||||
}
|
||||
],
|
||||
""SecondTable"": [
|
||||
{
|
||||
""StringCol"": ""Item Name"",
|
||||
""Int32Col"": 2147483647,
|
||||
""BooleanCol"": true,
|
||||
""TimeSpanCol"": ""10.22:10:15.1000000"",
|
||||
""DateTimeCol"": ""2000-12-29T00:00:00"",
|
||||
""DecimalCol"": 64.0021
|
||||
}
|
||||
]
|
||||
}";
|
||||
|
||||
DataSet ds = JsonConvert.DeserializeObject<DataSet>(json, new IsoDateTimeConverter());
|
||||
Assert.IsNotNull(ds);
|
||||
|
||||
Assert.AreEqual(2, ds.Tables.Count);
|
||||
Assert.AreEqual("FirstTable", ds.Tables[0].TableName);
|
||||
Assert.AreEqual("SecondTable", ds.Tables[1].TableName);
|
||||
|
||||
DataTable dt = ds.Tables[0];
|
||||
Assert.AreEqual("StringCol", dt.Columns[0].ColumnName);
|
||||
Assert.AreEqual(typeof(string), dt.Columns[0].DataType);
|
||||
Assert.AreEqual("Int32Col", dt.Columns[1].ColumnName);
|
||||
Assert.AreEqual(typeof(long), dt.Columns[1].DataType);
|
||||
Assert.AreEqual("BooleanCol", dt.Columns[2].ColumnName);
|
||||
Assert.AreEqual(typeof(bool), dt.Columns[2].DataType);
|
||||
Assert.AreEqual("TimeSpanCol", dt.Columns[3].ColumnName);
|
||||
Assert.AreEqual(typeof(string), dt.Columns[3].DataType);
|
||||
Assert.AreEqual("DateTimeCol", dt.Columns[4].ColumnName);
|
||||
Assert.AreEqual(typeof(string), dt.Columns[4].DataType);
|
||||
Assert.AreEqual("DecimalCol", dt.Columns[5].ColumnName);
|
||||
Assert.AreEqual(typeof(double), dt.Columns[5].DataType);
|
||||
|
||||
Assert.AreEqual(1, ds.Tables[0].Rows.Count);
|
||||
Assert.AreEqual(1, ds.Tables[1].Rows.Count);
|
||||
}
|
||||
|
||||
private DataTable CreateDataTable(string dataTableName)
|
||||
{
|
||||
// create a new DataTable.
|
||||
DataTable myTable = new DataTable(dataTableName);
|
||||
|
||||
// create DataColumn objects of data types.
|
||||
DataColumn colString = new DataColumn("StringCol");
|
||||
colString.DataType = typeof(string);
|
||||
myTable.Columns.Add(colString);
|
||||
|
||||
DataColumn colInt32 = new DataColumn("Int32Col");
|
||||
colInt32.DataType = typeof(int);
|
||||
myTable.Columns.Add(colInt32);
|
||||
|
||||
DataColumn colBoolean = new DataColumn("BooleanCol");
|
||||
colBoolean.DataType = typeof(bool);
|
||||
myTable.Columns.Add(colBoolean);
|
||||
|
||||
DataColumn colTimeSpan = new DataColumn("TimeSpanCol");
|
||||
colTimeSpan.DataType = typeof(TimeSpan);
|
||||
myTable.Columns.Add(colTimeSpan);
|
||||
|
||||
DataColumn colDateTime = new DataColumn("DateTimeCol");
|
||||
colDateTime.DataType = typeof(DateTime);
|
||||
colDateTime.DateTimeMode = DataSetDateTime.Utc;
|
||||
myTable.Columns.Add(colDateTime);
|
||||
|
||||
DataColumn colDecimal = new DataColumn("DecimalCol");
|
||||
colDecimal.DataType = typeof(decimal);
|
||||
myTable.Columns.Add(colDecimal);
|
||||
|
||||
// populate one row with values.
|
||||
DataRow myNewRow = myTable.NewRow();
|
||||
|
||||
myNewRow["StringCol"] = "Item Name";
|
||||
myNewRow["Int32Col"] = 2147483647;
|
||||
myNewRow["BooleanCol"] = true;
|
||||
myNewRow["TimeSpanCol"] = new TimeSpan(10, 22, 10, 15, 100);
|
||||
myNewRow["DateTimeCol"] = new DateTime(2000, 12, 29, 0, 0, 0, DateTimeKind.Utc);
|
||||
myNewRow["DecimalCol"] = 64.0021;
|
||||
myTable.Rows.Add(myNewRow);
|
||||
|
||||
return myTable;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -0,0 +1,107 @@
|
||||
#if !SILVERLIGHT
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using Newtonsoft.Json.Converters;
|
||||
using NUnit.Framework;
|
||||
using Newtonsoft.Json.Tests.TestObjects;
|
||||
using System.Data;
|
||||
|
||||
namespace Newtonsoft.Json.Tests.Converters
|
||||
{
|
||||
public class DataTableConverterTests : TestFixtureBase
|
||||
{
|
||||
[Test]
|
||||
public void Deserialize()
|
||||
{
|
||||
string json = @"[
|
||||
{
|
||||
""id"": 0,
|
||||
""item"": ""item 0""
|
||||
},
|
||||
{
|
||||
""id"": 1,
|
||||
""item"": ""item 1""
|
||||
}
|
||||
]";
|
||||
|
||||
DataTable deserializedDataTable = JsonConvert.DeserializeObject<DataTable>(json);
|
||||
Assert.IsNotNull(deserializedDataTable);
|
||||
|
||||
Assert.AreEqual(string.Empty, deserializedDataTable.TableName);
|
||||
Assert.AreEqual(2, deserializedDataTable.Columns.Count);
|
||||
Assert.AreEqual("id", deserializedDataTable.Columns[0].ColumnName);
|
||||
Assert.AreEqual(typeof(long), deserializedDataTable.Columns[0].DataType);
|
||||
Assert.AreEqual("item", deserializedDataTable.Columns[1].ColumnName);
|
||||
Assert.AreEqual(typeof(string), deserializedDataTable.Columns[1].DataType);
|
||||
|
||||
Assert.AreEqual(2, deserializedDataTable.Rows.Count);
|
||||
|
||||
DataRow dr1 = deserializedDataTable.Rows[0];
|
||||
Assert.AreEqual(0, dr1["id"]);
|
||||
Assert.AreEqual("item 0", dr1["item"]);
|
||||
|
||||
DataRow dr2 = deserializedDataTable.Rows[1];
|
||||
Assert.AreEqual(1, dr2["id"]);
|
||||
Assert.AreEqual("item 1", dr2["item"]);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Serialize()
|
||||
{
|
||||
// create a new DataTable.
|
||||
DataTable myTable = new DataTable("blah");
|
||||
|
||||
// create DataColumn objects of data types.
|
||||
DataColumn colString = new DataColumn("StringCol");
|
||||
colString.DataType = typeof(string);
|
||||
myTable.Columns.Add(colString);
|
||||
|
||||
DataColumn colInt32 = new DataColumn("Int32Col");
|
||||
colInt32.DataType = typeof(int);
|
||||
myTable.Columns.Add(colInt32);
|
||||
|
||||
DataColumn colBoolean = new DataColumn("BooleanCol");
|
||||
colBoolean.DataType = typeof(bool);
|
||||
myTable.Columns.Add(colBoolean);
|
||||
|
||||
DataColumn colTimeSpan = new DataColumn("TimeSpanCol");
|
||||
colTimeSpan.DataType = typeof(TimeSpan);
|
||||
myTable.Columns.Add(colTimeSpan);
|
||||
|
||||
DataColumn colDateTime = new DataColumn("DateTimeCol");
|
||||
colDateTime.DataType = typeof(DateTime);
|
||||
colDateTime.DateTimeMode = DataSetDateTime.Utc;
|
||||
myTable.Columns.Add(colDateTime);
|
||||
|
||||
DataColumn colDecimal = new DataColumn("DecimalCol");
|
||||
colDecimal.DataType = typeof(decimal);
|
||||
myTable.Columns.Add(colDecimal);
|
||||
|
||||
// populate one row with values.
|
||||
DataRow myNewRow = myTable.NewRow();
|
||||
|
||||
myNewRow["StringCol"] = "Item Name";
|
||||
myNewRow["Int32Col"] = 2147483647;
|
||||
myNewRow["BooleanCol"] = true;
|
||||
myNewRow["TimeSpanCol"] = new TimeSpan(10, 22, 10, 15, 100);
|
||||
myNewRow["DateTimeCol"] = new DateTime(2000, 12, 29, 0, 0, 0, DateTimeKind.Utc);
|
||||
myNewRow["DecimalCol"] = 64.0021;
|
||||
myTable.Rows.Add(myNewRow);
|
||||
|
||||
string json = JsonConvert.SerializeObject(myTable, Formatting.Indented);
|
||||
Assert.AreEqual(@"[
|
||||
{
|
||||
""StringCol"": ""Item Name"",
|
||||
""Int32Col"": 2147483647,
|
||||
""BooleanCol"": true,
|
||||
""TimeSpanCol"": ""10.22:10:15.1000000"",
|
||||
""DateTimeCol"": ""\/Date(978048000000)\/"",
|
||||
""DecimalCol"": 64.0021
|
||||
}
|
||||
]", json);
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -154,6 +154,21 @@ now brown cow?", '"', true);
|
||||
Assert.AreEqual(result, @"'Fred\'s ""cat"".'");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EscapeJavaScriptString_UnicodeLinefeeds()
|
||||
{
|
||||
string result;
|
||||
|
||||
result = JavaScriptUtils.ToEscapedJavaScriptString("before" + '\u0085' + "after", '"', true);
|
||||
Assert.AreEqual(@"""before\u0085after""", result);
|
||||
|
||||
result = JavaScriptUtils.ToEscapedJavaScriptString("before" + '\u2028' + "after", '"', true);
|
||||
Assert.AreEqual(@"""before\u2028after""", result);
|
||||
|
||||
result = JavaScriptUtils.ToEscapedJavaScriptString("before" + '\u2029' + "after", '"', true);
|
||||
Assert.AreEqual(@"""before\u2029after""", result);
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof(ArgumentException), ExpectedMessage = "Unsupported type: System.Version. Use the JsonSerializer class to get the object's JSON representation.")]
|
||||
public void ToStringInvalid()
|
||||
|
||||
@@ -0,0 +1,246 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using Newtonsoft.Json.Tests.TestObjects;
|
||||
using NUnit.Framework;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using Newtonsoft.Json.Converters;
|
||||
using System.IO;
|
||||
using System.Collections;
|
||||
|
||||
namespace Newtonsoft.Json.Tests.Linq
|
||||
{
|
||||
public class JPathTests : TestFixtureBase
|
||||
{
|
||||
[Test]
|
||||
public void SingleProperty()
|
||||
{
|
||||
JPath path = new JPath("Blah");
|
||||
Assert.AreEqual(1, path.Parts.Count);
|
||||
Assert.AreEqual("Blah", path.Parts[0]);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TwoProperties()
|
||||
{
|
||||
JPath path = new JPath("Blah.Two");
|
||||
Assert.AreEqual(2, path.Parts.Count);
|
||||
Assert.AreEqual("Blah", path.Parts[0]);
|
||||
Assert.AreEqual("Two", path.Parts[1]);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void SinglePropertyAndIndexer()
|
||||
{
|
||||
JPath path = new JPath("Blah[0]");
|
||||
Assert.AreEqual(2, path.Parts.Count);
|
||||
Assert.AreEqual("Blah", path.Parts[0]);
|
||||
Assert.AreEqual(0, path.Parts[1]);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void MultiplePropertiesAndIndexers()
|
||||
{
|
||||
JPath path = new JPath("Blah[0].Two.Three[1].Four");
|
||||
Assert.AreEqual(6, path.Parts.Count);
|
||||
Assert.AreEqual("Blah", path.Parts[0]);
|
||||
Assert.AreEqual(0, path.Parts[1]);
|
||||
Assert.AreEqual("Two", path.Parts[2]);
|
||||
Assert.AreEqual("Three", path.Parts[3]);
|
||||
Assert.AreEqual(1, path.Parts[4]);
|
||||
Assert.AreEqual("Four", path.Parts[5]);
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof(Exception), ExpectedMessage = @"Unexpected character while parsing path indexer: [")]
|
||||
public void BadCharactersInIndexer()
|
||||
{
|
||||
new JPath("Blah[[0]].Two.Three[1].Four");
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof(Exception), ExpectedMessage = @"Path ended with open indexer. Expected ]")]
|
||||
public void UnclosedIndexer()
|
||||
{
|
||||
new JPath("Blah[0");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void AdditionalDots()
|
||||
{
|
||||
JPath path = new JPath(".Blah..[0]..Two.Three....[1].Four.");
|
||||
Assert.AreEqual(6, path.Parts.Count);
|
||||
Assert.AreEqual("Blah", path.Parts[0]);
|
||||
Assert.AreEqual(0, path.Parts[1]);
|
||||
Assert.AreEqual("Two", path.Parts[2]);
|
||||
Assert.AreEqual("Three", path.Parts[3]);
|
||||
Assert.AreEqual(1, path.Parts[4]);
|
||||
Assert.AreEqual("Four", path.Parts[5]);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void IndexerOnly()
|
||||
{
|
||||
JPath path = new JPath("[111119990]");
|
||||
Assert.AreEqual(1, path.Parts.Count);
|
||||
Assert.AreEqual(111119990, path.Parts[0]);
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof(Exception), ExpectedMessage = "Empty path indexer.")]
|
||||
public void EmptyIndexer()
|
||||
{
|
||||
new JPath("[]");
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof(Exception), ExpectedMessage = "Unexpected character while parsing path: ]")]
|
||||
public void IndexerCloseInProperty()
|
||||
{
|
||||
new JPath("]");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void AdjacentIndexers()
|
||||
{
|
||||
JPath path = new JPath("[1][0][0][" + int.MaxValue + "]");
|
||||
Assert.AreEqual(4, path.Parts.Count);
|
||||
Assert.AreEqual(1, path.Parts[0]);
|
||||
Assert.AreEqual(0, path.Parts[1]);
|
||||
Assert.AreEqual(0, path.Parts[2]);
|
||||
Assert.AreEqual(int.MaxValue, path.Parts[3]);
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof(Exception), ExpectedMessage = "Unexpected character following indexer: B")]
|
||||
public void MissingDotAfterIndexer()
|
||||
{
|
||||
new JPath("[1]Blah");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EvaluateSingleProperty()
|
||||
{
|
||||
JObject o = new JObject(
|
||||
new JProperty("Blah", 1));
|
||||
|
||||
JToken t = o.SelectToken("Blah");
|
||||
Assert.IsNotNull(t);
|
||||
Assert.AreEqual(JTokenType.Integer, t.Type);
|
||||
Assert.AreEqual(1, (int)t);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EvaluateMissingProperty()
|
||||
{
|
||||
JObject o = new JObject(
|
||||
new JProperty("Blah", 1));
|
||||
|
||||
JToken t = o.SelectToken("Missing[1]");
|
||||
Assert.IsNull(t);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EvaluateIndexerOnObject()
|
||||
{
|
||||
JObject o = new JObject(
|
||||
new JProperty("Blah", 1));
|
||||
|
||||
JToken t = o.SelectToken("[1]");
|
||||
Assert.IsNull(t);
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof(Exception), ExpectedMessage = @"Index 1 not valid on JObject.")]
|
||||
public void EvaluateIndexerOnObjectWithError()
|
||||
{
|
||||
JObject o = new JObject(
|
||||
new JProperty("Blah", 1));
|
||||
|
||||
o.SelectToken("[1]", true);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EvaluatePropertyOnArray()
|
||||
{
|
||||
JArray a = new JArray(1, 2, 3, 4, 5);
|
||||
|
||||
JToken t = a.SelectToken("BlahBlah");
|
||||
Assert.IsNull(t);
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof(Exception), ExpectedMessage = @"Property 'BlahBlah' not valid on JArray.")]
|
||||
public void EvaluatePropertyOnArrayWithError()
|
||||
{
|
||||
JArray a = new JArray(1, 2, 3, 4, 5);
|
||||
|
||||
a.SelectToken("BlahBlah", true);
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof(Exception), ExpectedMessage = @"Index 1 not valid on JConstructor.")]
|
||||
public void EvaluateIndexerOnConstructorWithError()
|
||||
{
|
||||
JConstructor c = new JConstructor("Blah");
|
||||
|
||||
c.SelectToken("[1]", true);
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof(Exception), ExpectedMessage = "Property 'Missing' does not exist on JObject.")]
|
||||
public void EvaluateMissingPropertyWithError()
|
||||
{
|
||||
JObject o = new JObject(
|
||||
new JProperty("Blah", 1));
|
||||
|
||||
o.SelectToken("Missing", true);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EvaluateOutOfBoundsIndxer()
|
||||
{
|
||||
JArray a = new JArray(1, 2, 3, 4, 5);
|
||||
|
||||
JToken t = a.SelectToken("[1000].Ha");
|
||||
Assert.IsNull(t);
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof(IndexOutOfRangeException), ExpectedMessage = "Index 1000 outside the bounds of JArray.")]
|
||||
public void EvaluateOutOfBoundsIndxerWithError()
|
||||
{
|
||||
JArray a = new JArray(1, 2, 3, 4, 5);
|
||||
|
||||
a.SelectToken("[1000].Ha", true);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EvaluateArray()
|
||||
{
|
||||
JArray a = new JArray(1, 2, 3, 4);
|
||||
|
||||
JToken t = a.SelectToken("[1]");
|
||||
Assert.IsNotNull(t);
|
||||
Assert.AreEqual(JTokenType.Integer, t.Type);
|
||||
Assert.AreEqual(2, (int)t);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EvaluateSinglePropertyReturningArray()
|
||||
{
|
||||
JObject o = new JObject(
|
||||
new JProperty("Blah", new [] { 1, 2, 3 }));
|
||||
|
||||
JToken t = o.SelectToken("Blah");
|
||||
Assert.IsNotNull(t);
|
||||
Assert.AreEqual(JTokenType.Array, t.Type);
|
||||
|
||||
t = o.SelectToken("Blah[2]");
|
||||
Assert.AreEqual(JTokenType.Integer, t.Type);
|
||||
Assert.AreEqual(3, (int)t);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -60,11 +60,14 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Converters\BinaryConverterTests.cs" />
|
||||
<Compile Include="Converters\DataSetConverterTests.cs" />
|
||||
<Compile Include="Converters\DataTableConverterTests.cs" />
|
||||
<Compile Include="Converters\StringEnumConverterTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\BindingTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\JPropertyDescriptorTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\JTypeDescriptionProviderTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\JTypeDescriptorTests.cs" />
|
||||
<Compile Include="Linq\JPathTests.cs" />
|
||||
<Compile Include="Linq\JTokenReaderTest.cs" />
|
||||
<Compile Include="Linq\JTokenWriterTest.cs" />
|
||||
<Compile Include="JsonValidatingReaderTests.cs" />
|
||||
|
||||
@@ -64,6 +64,8 @@
|
||||
<ItemGroup>
|
||||
<Compile Include="Converters\BinaryConverterTests.cs" />
|
||||
<Compile Include="Converters\CustomCreationConverterTests.cs" />
|
||||
<Compile Include="Converters\DataSetConverterTests.cs" />
|
||||
<Compile Include="Converters\DataTableConverterTests.cs" />
|
||||
<Compile Include="Converters\StringEnumConverterTests.cs" />
|
||||
<Compile Include="JsonArrayAttributeTests.cs" />
|
||||
<Compile Include="ExceptionTests.cs" />
|
||||
@@ -72,6 +74,7 @@
|
||||
<Compile Include="Linq\ComponentModel\JPropertyDescriptorTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\JTypeDescriptionProviderTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\JTypeDescriptorTests.cs" />
|
||||
<Compile Include="Linq\JPathTests.cs" />
|
||||
<Compile Include="Serialization\ConstructorHandlingTests.cs" />
|
||||
<Compile Include="TestObjects\Content.cs" />
|
||||
<Compile Include="TestObjects\DictionaryInterfaceClass.cs" />
|
||||
|
||||
@@ -64,6 +64,8 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Converters\BinaryConverterTests.cs" />
|
||||
<Compile Include="Converters\DataSetConverterTests.cs" />
|
||||
<Compile Include="Converters\DataTableConverterTests.cs" />
|
||||
<Compile Include="Converters\StringEnumConverterTests.cs" />
|
||||
<Compile Include="ExceptionTests.cs" />
|
||||
<Compile Include="JsonArrayAttributeTests.cs" />
|
||||
@@ -71,6 +73,7 @@
|
||||
<Compile Include="Linq\ComponentModel\JPropertyDescriptorTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\JTypeDescriptionProviderTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\JTypeDescriptorTests.cs" />
|
||||
<Compile Include="Linq\JPathTests.cs" />
|
||||
<Compile Include="Linq\JTokenReaderTest.cs" />
|
||||
<Compile Include="Linq\JTokenWriterTest.cs" />
|
||||
<Compile Include="JsonValidatingReaderTests.cs" />
|
||||
|
||||
@@ -84,6 +84,8 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Converters\BinaryConverterTests.cs" />
|
||||
<Compile Include="Converters\DataTableConverterTests.cs" />
|
||||
<Compile Include="Converters\DataSetConverterTests.cs" />
|
||||
<Compile Include="Converters\CustomCreationConverterTests.cs" />
|
||||
<Compile Include="Converters\StringEnumConverterTests.cs" />
|
||||
<Compile Include="FileSystemEntityModel.Designer.cs">
|
||||
@@ -109,6 +111,7 @@
|
||||
<Compile Include="Linq\ComponentModel\JPropertyDescriptorTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\JTypeDescriptionProviderTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\JTypeDescriptorTests.cs" />
|
||||
<Compile Include="Linq\JPathTests.cs" />
|
||||
<Compile Include="Serialization\ConstructorHandlingTests.cs" />
|
||||
<Compile Include="TestObjects\PersonError.cs" />
|
||||
<Compile Include="TestObjects\PrivateConstructorTestClass.cs" />
|
||||
|
||||
@@ -498,5 +498,82 @@ namespace Newtonsoft.Json.Tests.Schema
|
||||
}
|
||||
}", json);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void CircularCollectionReferences()
|
||||
{
|
||||
Type type = typeof (Workspace);
|
||||
JsonSchemaGenerator jsonSchemaGenerator = new JsonSchemaGenerator();
|
||||
|
||||
jsonSchemaGenerator.UndefinedSchemaIdHandling = UndefinedSchemaIdHandling.UseTypeName;
|
||||
JsonSchema jsonSchema = jsonSchemaGenerator.Generate(type);
|
||||
|
||||
// should succeed
|
||||
Assert.IsNotNull(jsonSchema);
|
||||
}
|
||||
}
|
||||
|
||||
public class DMDSLBase
|
||||
{
|
||||
public String Comment;
|
||||
}
|
||||
|
||||
public class Workspace : DMDSLBase
|
||||
{
|
||||
public ControlFlowItemCollection Jobs = new ControlFlowItemCollection();
|
||||
}
|
||||
|
||||
public class ControlFlowItemBase : DMDSLBase
|
||||
{
|
||||
public String Name;
|
||||
}
|
||||
|
||||
public class ControlFlowItem : ControlFlowItemBase//A Job
|
||||
{
|
||||
public TaskCollection Tasks = new TaskCollection();
|
||||
public ContainerCollection Containers = new ContainerCollection();
|
||||
}
|
||||
|
||||
public class ControlFlowItemCollection : List<ControlFlowItem>
|
||||
{
|
||||
}
|
||||
|
||||
public class Task : ControlFlowItemBase
|
||||
{
|
||||
public DataFlowTaskCollection DataFlowTasks = new DataFlowTaskCollection();
|
||||
public BulkInsertTaskCollection BulkInsertTask = new BulkInsertTaskCollection();
|
||||
}
|
||||
|
||||
public class TaskCollection : List<Task>
|
||||
{
|
||||
}
|
||||
|
||||
public class Container : ControlFlowItemBase
|
||||
{
|
||||
public ControlFlowItemCollection ContainerJobs = new ControlFlowItemCollection();
|
||||
}
|
||||
|
||||
public class ContainerCollection : List<Container>
|
||||
{
|
||||
}
|
||||
|
||||
public class DataFlowTask_DSL : ControlFlowItemBase
|
||||
{
|
||||
}
|
||||
|
||||
public class DataFlowTaskCollection : List<DataFlowTask_DSL>
|
||||
{
|
||||
}
|
||||
|
||||
public class SequenceContainer_DSL : Container
|
||||
{
|
||||
}
|
||||
|
||||
public class BulkInsertTaskCollection : List<BulkInsertTask_DSL>
|
||||
{
|
||||
}
|
||||
|
||||
public class BulkInsertTask_DSL
|
||||
{
|
||||
}
|
||||
}
|
||||
@@ -659,6 +659,25 @@ keyword such as type of business.""
|
||||
Assert.AreEqual(StringComparison.CurrentCultureIgnoreCase, s);
|
||||
}
|
||||
|
||||
public class ClassWithTimeSpan
|
||||
{
|
||||
public TimeSpan TimeSpanField;
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TimeSpanTest()
|
||||
{
|
||||
TimeSpan ts = new TimeSpan(200, 23, 59, 1);
|
||||
|
||||
string json = JsonConvert.SerializeObject(new ClassWithTimeSpan { TimeSpanField = ts }, Formatting.Indented);
|
||||
Assert.AreEqual(@"{
|
||||
""TimeSpanField"": ""200.23:59:01""
|
||||
}", json);
|
||||
|
||||
ClassWithTimeSpan c = JsonConvert.DeserializeObject<ClassWithTimeSpan>(json);
|
||||
Assert.AreEqual(ts, c.TimeSpanField);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void JsonIgnoreAttributeOnClassTest()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user