-Added GetSchema, CanRead, CanWrite to JsonConverter
-Fix CustomCreationConverter erroring when writing JSON
This commit is contained in:
@@ -3,6 +3,7 @@ using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using Newtonsoft.Json.Converters;
|
||||
using NUnit.Framework;
|
||||
|
||||
namespace Newtonsoft.Json.Tests.Converters
|
||||
{
|
||||
@@ -87,5 +88,62 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
Console.WriteLine(employee.JobTitle);
|
||||
// Support
|
||||
}
|
||||
|
||||
public class MyClass
|
||||
{
|
||||
public string Value { get; set; }
|
||||
|
||||
[JsonConverter(typeof(MyThingConverter))]
|
||||
public IThing Thing { get; set; }
|
||||
}
|
||||
|
||||
public interface IThing
|
||||
{
|
||||
int Number { get; }
|
||||
}
|
||||
|
||||
public class MyThing : IThing
|
||||
{
|
||||
public int Number { get; set; }
|
||||
}
|
||||
|
||||
public class MyThingConverter : CustomCreationConverter<IThing>
|
||||
{
|
||||
public override IThing Create(Type objectType)
|
||||
{
|
||||
return new MyThing();
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void AssertDoesDeserialize()
|
||||
{
|
||||
const string json = @"{
|
||||
""Value"": ""A value"",
|
||||
""Thing"": {
|
||||
""Number"": 123
|
||||
}
|
||||
}
|
||||
";
|
||||
MyClass myClass = JsonConvert.DeserializeObject<MyClass>(json);
|
||||
Assert.IsNotNull(myClass);
|
||||
Assert.AreEqual("A value", myClass.Value);
|
||||
Assert.IsNotNull(myClass.Thing);
|
||||
Assert.AreEqual(123, myClass.Thing.Number);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void AssertShouldSerializeTest()
|
||||
{
|
||||
MyClass myClass = new MyClass
|
||||
{
|
||||
Value = "Foo",
|
||||
Thing = new MyThing { Number = 456, }
|
||||
};
|
||||
string json = JsonConvert.SerializeObject(myClass); // <-- Exception here
|
||||
|
||||
const string expected = @"{""Value"":""Foo"",""Thing"":{""Number"":456}}";
|
||||
Assert.AreEqual(expected, json);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
#region License
|
||||
// Copyright (c) 2007 James Newton-King
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person
|
||||
// obtaining a copy of this software and associated documentation
|
||||
// files (the "Software"), to deal in the Software without
|
||||
// restriction, including without limitation the rights to use,
|
||||
// copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
// copies of the Software, and to permit persons to whom the
|
||||
// Software is furnished to do so, subject to the following
|
||||
// conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
// OTHER DEALINGS IN THE SOFTWARE.
|
||||
#endregion
|
||||
|
||||
#if !SILVERLIGHT && !PocketPC
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Drawing;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using Newtonsoft.Json.Converters;
|
||||
using NUnit.Framework;
|
||||
|
||||
namespace Newtonsoft.Json.Tests.Converters
|
||||
{
|
||||
public class HtmlColorConverterTests : TestFixtureBase
|
||||
{
|
||||
[Test]
|
||||
public void WriteJsonTest()
|
||||
{
|
||||
string json;
|
||||
|
||||
json = JsonConvert.SerializeObject(Color.DarkGray, new HtmlColorConverter());
|
||||
Assert.AreEqual(@"""DarkGray""", json);
|
||||
|
||||
json = JsonConvert.SerializeObject(Color.FromArgb(255, 1, 2, 3), new HtmlColorConverter());
|
||||
Assert.AreEqual(@"""#010203""", json);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ReadJsonTest()
|
||||
{
|
||||
string json = @"""#010203""";
|
||||
|
||||
Color c = JsonConvert.DeserializeObject<Color>(json, new HtmlColorConverter());
|
||||
Assert.AreEqual(c.A, 255);
|
||||
Assert.AreEqual(c.R, 1);
|
||||
Assert.AreEqual(c.G, 2);
|
||||
Assert.AreEqual(c.B, 3);
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -62,8 +62,10 @@
|
||||
<Compile Include="Bson\BsonReaderTests.cs" />
|
||||
<Compile Include="Bson\BsonWriterTests.cs" />
|
||||
<Compile Include="Converters\BinaryConverterTests.cs" />
|
||||
<Compile Include="Converters\CustomCreationConverterTests.cs" />
|
||||
<Compile Include="Converters\DataSetConverterTests.cs" />
|
||||
<Compile Include="Converters\DataTableConverterTests.cs" />
|
||||
<Compile Include="Converters\HtmlColorConverterTests.cs" />
|
||||
<Compile Include="Converters\StringEnumConverterTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\BindingTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\JPropertyDescriptorTests.cs" />
|
||||
|
||||
@@ -57,6 +57,7 @@
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Security" />
|
||||
<Reference Include="System.Web" />
|
||||
<Reference Include="System.Xml" />
|
||||
@@ -68,6 +69,7 @@
|
||||
<Compile Include="Converters\CustomCreationConverterTests.cs" />
|
||||
<Compile Include="Converters\DataSetConverterTests.cs" />
|
||||
<Compile Include="Converters\DataTableConverterTests.cs" />
|
||||
<Compile Include="Converters\HtmlColorConverterTests.cs" />
|
||||
<Compile Include="Converters\StringEnumConverterTests.cs" />
|
||||
<Compile Include="JsonArrayAttributeTests.cs" />
|
||||
<Compile Include="ExceptionTests.cs" />
|
||||
|
||||
@@ -71,8 +71,10 @@
|
||||
<Compile Include="Bson\BsonReaderTests.cs" />
|
||||
<Compile Include="Bson\BsonWriterTests.cs" />
|
||||
<Compile Include="Converters\BinaryConverterTests.cs" />
|
||||
<Compile Include="Converters\CustomCreationConverterTests.cs" />
|
||||
<Compile Include="Converters\DataSetConverterTests.cs" />
|
||||
<Compile Include="Converters\DataTableConverterTests.cs" />
|
||||
<Compile Include="Converters\HtmlColorConverterTests.cs" />
|
||||
<Compile Include="Converters\StringEnumConverterTests.cs" />
|
||||
<Compile Include="ExceptionTests.cs" />
|
||||
<Compile Include="JsonArrayAttributeTests.cs" />
|
||||
|
||||
@@ -63,6 +63,7 @@
|
||||
<Reference Include="System.Data.Linq">
|
||||
<RequiredTargetFramework>3.5</RequiredTargetFramework>
|
||||
</Reference>
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Runtime.Serialization">
|
||||
<RequiredTargetFramework>3.0</RequiredTargetFramework>
|
||||
</Reference>
|
||||
@@ -89,6 +90,7 @@
|
||||
<Compile Include="Converters\DataTableConverterTests.cs" />
|
||||
<Compile Include="Converters\DataSetConverterTests.cs" />
|
||||
<Compile Include="Converters\CustomCreationConverterTests.cs" />
|
||||
<Compile Include="Converters\HtmlColorConverterTests.cs" />
|
||||
<Compile Include="Converters\StringEnumConverterTests.cs" />
|
||||
<Compile Include="FileSystemEntityModel.Designer.cs">
|
||||
<AutoGen>True</AutoGen>
|
||||
|
||||
Reference in New Issue
Block a user