-Added JsonConstructorAttribute to explicitly define which constructor to use during deserialization
-Added IFormattable to JValue -Changed JValue ToString to call ToString on the internal value -Fixed code emit error when deserializing interfaces in certain situations
This commit is contained in:
@@ -7,6 +7,7 @@ using System.Text;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using NUnit.Framework;
|
||||
using Newtonsoft.Json.Utilities;
|
||||
using System.Globalization;
|
||||
|
||||
namespace Newtonsoft.Json.Tests.Linq
|
||||
{
|
||||
@@ -106,6 +107,56 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
Assert.AreEqual("blah blah", (string)v);
|
||||
}
|
||||
|
||||
//[Test]
|
||||
//public void JValueEquals()
|
||||
//{
|
||||
// JObject o = new JObject(
|
||||
// new JProperty("Null", new JValue(null, JTokenType.Null)),
|
||||
// new JProperty("Integer", new JValue(1)),
|
||||
// new JProperty("Float", new JValue(1.1)),
|
||||
// new JProperty("DateTime", new JValue(new DateTime(2000, 12, 29, 23, 51, 10, DateTimeKind.Utc))),
|
||||
// new JProperty("Boolean", new JValue(true)),
|
||||
// new JProperty("String", new JValue("A string lol!")),
|
||||
// new JProperty("Bytes", new JValue(Encoding.UTF8.GetBytes("A string lol!")))
|
||||
// );
|
||||
|
||||
// dynamic d = o;
|
||||
|
||||
// Assert.IsTrue(d.Null == null);
|
||||
// Assert.IsTrue(d.Null == new JValue(null, JTokenType.Null));
|
||||
|
||||
// //if (d.NullValue == null)
|
||||
// // Console.WriteLine("Null");
|
||||
// //else
|
||||
// // Console.WriteLine("Not null");
|
||||
|
||||
// //Console.WriteLine(d.IntValue == 1);
|
||||
//}
|
||||
|
||||
[Test]
|
||||
public void JValueToString()
|
||||
{
|
||||
JObject o = new JObject(
|
||||
new JProperty("Null", new JValue(null, JTokenType.Null)),
|
||||
new JProperty("Integer", new JValue(1)),
|
||||
new JProperty("Float", new JValue(1.1)),
|
||||
new JProperty("DateTime", new JValue(new DateTime(2000, 12, 29, 23, 51, 10, DateTimeKind.Utc))),
|
||||
new JProperty("Boolean", new JValue(true)),
|
||||
new JProperty("String", new JValue("A string lol!")),
|
||||
new JProperty("Bytes", new JValue(Encoding.UTF8.GetBytes("A string lol!")))
|
||||
);
|
||||
|
||||
dynamic d = o;
|
||||
|
||||
Assert.AreEqual("", d.Null.ToString());
|
||||
Assert.AreEqual("1", d.Integer.ToString());
|
||||
Assert.AreEqual("1.1", d.Float.ToString());
|
||||
Assert.AreEqual("12/29/2000 23:51:10", d.DateTime.ToString(null, CultureInfo.InvariantCulture));
|
||||
Assert.AreEqual("True", d.Boolean.ToString());
|
||||
Assert.AreEqual("A string lol!", d.String.ToString());
|
||||
Assert.AreEqual("System.Byte[]", d.Bytes.ToString());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void JObjectGetDynamicPropertyNames()
|
||||
{
|
||||
|
||||
@@ -29,6 +29,7 @@ using System.Linq;
|
||||
using System.Text;
|
||||
using NUnit.Framework;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System.Globalization;
|
||||
|
||||
namespace Newtonsoft.Json.Tests.Linq
|
||||
{
|
||||
@@ -92,6 +93,30 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
Assert.AreEqual(JTokenType.String, stringValue.Type);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ToString()
|
||||
{
|
||||
JValue v;
|
||||
|
||||
v = new JValue(true);
|
||||
Assert.AreEqual("True", v.ToString());
|
||||
|
||||
v = new JValue(Encoding.UTF8.GetBytes("Blah"));
|
||||
Assert.AreEqual("System.Byte[]", v.ToString(null, CultureInfo.InvariantCulture));
|
||||
|
||||
v = new JValue("I am a string!");
|
||||
Assert.AreEqual("I am a string!", v.ToString());
|
||||
|
||||
v = new JValue(null, JTokenType.Null);
|
||||
Assert.AreEqual("", v.ToString());
|
||||
|
||||
v = new JValue(null, JTokenType.Null);
|
||||
Assert.AreEqual("", v.ToString(null, CultureInfo.InvariantCulture));
|
||||
|
||||
v = new JValue(new DateTime(2000, 12, 12, 20, 59, 59, DateTimeKind.Utc), JTokenType.Date);
|
||||
Assert.AreEqual("12/12/2000 20:59:59", v.ToString(null, CultureInfo.InvariantCulture));
|
||||
}
|
||||
|
||||
[Test]
|
||||
[ExpectedException(typeof(InvalidOperationException), ExpectedMessage = "Cannot access child value on Newtonsoft.Json.Linq.JValue.")]
|
||||
public void Last()
|
||||
|
||||
@@ -287,7 +287,7 @@ keyword such as type of business.""
|
||||
Assert.AreEqual(@"""Width"": 1.1", o.Property("Width").ToString());
|
||||
Assert.AreEqual(@"1.1", o.Property("Width").Value.ToString());
|
||||
Assert.AreEqual(@"""Open"": false", o.Property("Open").ToString());
|
||||
Assert.AreEqual(@"false", o.Property("Open").Value.ToString());
|
||||
Assert.AreEqual(@"False", o.Property("Open").Value.ToString());
|
||||
|
||||
json = @"[null,undefined]";
|
||||
|
||||
@@ -296,8 +296,8 @@ keyword such as type of business.""
|
||||
null,
|
||||
undefined
|
||||
]", a.ToString());
|
||||
Assert.AreEqual(@"null", a.Children().ElementAt(0).ToString());
|
||||
Assert.AreEqual(@"undefined", a.Children().ElementAt(1).ToString());
|
||||
Assert.AreEqual(@"", a.Children().ElementAt(0).ToString());
|
||||
Assert.AreEqual(@"", a.Children().ElementAt(1).ToString());
|
||||
}
|
||||
|
||||
[Test]
|
||||
|
||||
Reference in New Issue
Block a user