-Fixed writing Uri JValues to use OriginalString to be consistant with serializer
-Fixed comparing non-string JValues with JPath queries
This commit is contained in:
@@ -701,6 +701,22 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
}
|
||||
#endif
|
||||
|
||||
[Test]
|
||||
public void ToStringUri()
|
||||
{
|
||||
JArray a = new JArray(
|
||||
new JValue(new Uri("http://james.newtonking.com")),
|
||||
new JValue(new Uri("http://james.newtonking.com/install?v=7.0.1"))
|
||||
);
|
||||
|
||||
Console.WriteLine(a.ToString());
|
||||
|
||||
StringAssert.AreEqual(@"[
|
||||
""http://james.newtonking.com"",
|
||||
""http://james.newtonking.com/install?v=7.0.1""
|
||||
]", a.ToString());
|
||||
}
|
||||
|
||||
#if !NET20
|
||||
[Test]
|
||||
public void ParseIsoTimeZones()
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
#if !(PORTABLE || PORTABLE40 || NET35 || NET20)
|
||||
using System.Numerics;
|
||||
#endif
|
||||
@@ -739,6 +740,55 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
|
||||
Assert.AreEqual(1L, v.Value);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void QueryAgainstNonStringValues()
|
||||
{
|
||||
IList<object> values = new List<object>
|
||||
{
|
||||
"ff2dc672-6e15-4aa2-afb0-18f4f69596ad",
|
||||
Guid.Parse("ff2dc672-6e15-4aa2-afb0-18f4f69596ad"),
|
||||
"http://localhost",
|
||||
new Uri("http://localhost"),
|
||||
"2000-12-05T05:07:59Z",
|
||||
new DateTime(2000, 12, 5, 5, 7, 59, DateTimeKind.Utc),
|
||||
#if !NET20
|
||||
"2000-12-05T05:07:59-10:00",
|
||||
new DateTimeOffset(2000, 12, 5, 5, 7, 59, -TimeSpan.FromHours(10)),
|
||||
#endif
|
||||
"SGVsbG8gd29ybGQ=",
|
||||
Encoding.UTF8.GetBytes("Hello world"),
|
||||
"365.23:59:59",
|
||||
new TimeSpan(365, 23, 59, 59)
|
||||
};
|
||||
|
||||
JObject o = new JObject(
|
||||
new JProperty("prop",
|
||||
new JArray(
|
||||
values.Select(v => new JObject(new JProperty("childProp", v)))
|
||||
)
|
||||
)
|
||||
);
|
||||
|
||||
IList<JToken> t = o.SelectTokens("$.prop[?(@.childProp =='ff2dc672-6e15-4aa2-afb0-18f4f69596ad')]").ToList();
|
||||
Assert.AreEqual(2, t.Count);
|
||||
|
||||
t = o.SelectTokens("$.prop[?(@.childProp =='http://localhost')]").ToList();
|
||||
Assert.AreEqual(2, t.Count);
|
||||
|
||||
t = o.SelectTokens("$.prop[?(@.childProp =='2000-12-05T05:07:59Z')]").ToList();
|
||||
Assert.AreEqual(2, t.Count);
|
||||
|
||||
#if !NET20
|
||||
t = o.SelectTokens("$.prop[?(@.childProp =='2000-12-05T05:07:59-10:00')]").ToList();
|
||||
Assert.AreEqual(2, t.Count);
|
||||
#endif
|
||||
|
||||
t = o.SelectTokens("$.prop[?(@.childProp =='SGVsbG8gd29ybGQ=')]").ToList();
|
||||
Assert.AreEqual(2, t.Count);
|
||||
|
||||
t = o.SelectTokens("$.prop[?(@.childProp =='365.23:59:59')]").ToList();
|
||||
Assert.AreEqual(2, t.Count);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Example()
|
||||
|
||||
@@ -1235,7 +1235,7 @@ keyword such as type of business.""
|
||||
""NullableGuid"": ""9e9f3adf-e017-4f72-91e0-617ebe85967d"",
|
||||
""TimeSpan"": ""1.00:00:00"",
|
||||
""NullableTimeSpan"": ""01:00:00"",
|
||||
""Uri"": ""http://testuri.com/""
|
||||
""Uri"": ""http://testuri.com""
|
||||
}", o.ToString());
|
||||
|
||||
UriGuidTimeSpanTestClass c2 = o.ToObject<UriGuidTimeSpanTestClass>();
|
||||
@@ -1244,6 +1244,10 @@ keyword such as type of business.""
|
||||
Assert.AreEqual(c1.TimeSpan, c2.TimeSpan);
|
||||
Assert.AreEqual(c1.NullableTimeSpan, c2.NullableTimeSpan);
|
||||
Assert.AreEqual(c1.Uri, c2.Uri);
|
||||
|
||||
string j = JsonConvert.SerializeObject(c1, Formatting.Indented);
|
||||
|
||||
StringAssert.AreEqual(j, o.ToString());
|
||||
}
|
||||
|
||||
[Test]
|
||||
|
||||
Reference in New Issue
Block a user