-Added generic JsonConvert.SerializeObject methods

-Fixed JToken.ToObject not using StringEnumConverter on enums
This commit is contained in:
James Newton-King
2015-12-09 08:45:36 +13:00
parent 45936d58a2
commit 2c7a51c50a
8 changed files with 222 additions and 9 deletions
@@ -48,6 +48,7 @@ using Newtonsoft.Json.Utilities.LinqBridge;
using System.Linq;
#endif
using System.IO;
using System.Runtime.Serialization;
namespace Newtonsoft.Json.Tests.Linq
{
@@ -1329,6 +1330,57 @@ keyword such as type of business.""
}
#endif
#if !(NET20)
[JsonConverter(typeof(StringEnumConverter))]
public enum FooBar
{
[EnumMember(Value = "SOME_VALUE")]
SomeValue,
[EnumMember(Value = "SOME_OTHER_VALUE")]
SomeOtherValue
}
public class MyObject
{
public FooBar FooBar { get; set; }
}
[Test]
public void ToObject_Enum_Converter()
{
JObject o = JObject.Parse("{'FooBar':'SOME_OTHER_VALUE'}");
FooBar e = o["FooBar"].ToObject<FooBar>();
Assert.AreEqual(FooBar.SomeOtherValue, e);
}
public enum FooBarNoEnum
{
[EnumMember(Value = "SOME_VALUE")]
SomeValue,
[EnumMember(Value = "SOME_OTHER_VALUE")]
SomeOtherValue
}
public class MyObjectNoEnum
{
public FooBarNoEnum FooBarNoEnum { get; set; }
}
[Test]
public void ToObject_Enum_NoConverter()
{
JObject o = JObject.Parse("{'FooBarNoEnum':'SOME_OTHER_VALUE'}");
ExceptionAssert.Throws<ArgumentException>(() =>
{
o["FooBarNoEnum"].ToObject<FooBarNoEnum>();
}, "Could not convert 'SOME_OTHER_VALUE' to FooBarNoEnum.");
}
#endif
[Test]
public void SerializeWithNoRedundentIdPropertiesTest()
{