LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-Rename JavaScriptConvert to JsonConvert

Browse Source
This commit is contained in:
JamesNK
2008-12-03 05:52:21 +00:00
parent fc6ffd0549
commit f95868233e
23 changed files with 220 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/Doc/SerializingJSON.html
+3 -3
View File
@@ -20,7 +20,7 @@
equivalent and back again.</p>
<p>For simple scenarios the <a href="./html/Overload_Newtonsoft_Json_JavaScriptConvert_SerializeObject.htm">SerializeObject</a> and <a href="./html/Overload_Newtonsoft_Json_JavaScriptConvert_DeserializeObject.htm">DeserializeObject</a> methods on <a href="./html/T_Newtonsoft_Json_JavaScriptConvert.htm">JavaScriptConvert</a> provide an easy to use wrapper over
<p>For simple scenarios the <a href="./html/Overload_Newtonsoft_Json_JsonConvert_SerializeObject.htm">SerializeObject</a> and <a href="./html/Overload_Newtonsoft_Json_JavaScriptConvert_DeserializeObject.htm">DeserializeObject</a> methods on <a href="./html/T_Newtonsoft_Json_JavaScriptConvert.htm">JavaScriptConvert</a> provide an easy to use wrapper over
JsonSerializer.</p>
@@ -34,7 +34,7 @@
<pre style="margin: 0px;">product.Price = 3.99M;</pre>
<pre style="margin: 0px;">product.Sizes = <span style="color: blue;">new</span> <span style="color: blue;">string</span>[] { <span style="color: #a31515;">"Small"</span>, <span style="color: #a31515;">"Medium"</span>, <span style="color: #a31515;">"Large"</span> };</pre>
<pre style="margin: 0px;">&nbsp;</pre>
<pre style="margin: 0px;"><span style="color: blue;">string</span> output = <span style="color: #2b91af;">JavaScriptConvert</span>.SerializeObject(product);</pre>
<pre style="margin: 0px;"><span style="color: blue;">string</span> output = <span style="color: #2b91af;">JsonConvert</span>.SerializeObject(product);</pre>
<pre style="margin: 0px;"><span style="color: green;">//{</span></pre>
<pre style="margin: 0px;"><span style="color: green;">//&nbsp; "Name": "Apple",</span></pre>
<pre style="margin: 0px;"><span style="color: green;">//&nbsp; "Expiry": &quot;\/Date(1230375600000+1300)\/&quot;,</span></pre>
@@ -46,7 +46,7 @@
<pre style="margin: 0px;"><span style="color: green;">//&nbsp; ]</span></pre>
<pre style="margin: 0px;"><span style="color: green;">//}</span></pre>
<pre style="margin: 0px;">&nbsp;</pre>
<pre style="margin: 0px;"><span style="color: #2b91af;">Product</span> deserializedProduct = (<span style="color: #2b91af;">Product</span>)<span style="color: #2b91af;">JavaScriptConvert</span>.DeserializeObject(output, <span style="color: blue;">typeof</span>(<span style="color: #2b91af;">Product</span>));</pre>
<pre style="margin: 0px;"><span style="color: #2b91af;">Product</span> deserializedProduct = (<span style="color: #2b91af;">Product</span>)<span style="color: #2b91af;">JsonConvert</span>.DeserializeObject(output, <span style="color: blue;">typeof</span>(<span style="color: #2b91af;">Product</span>));</pre>
</div>
</div></div>
Src/Newtonsoft.Json.Tests/Converters/IsoDateTimeConverterTests.cs
+24 -24
View File
@@ -64,13 +64,13 @@ namespace Newtonsoft.Json.Tests.Converters
DateTime d = new DateTime(2000, 12, 15, 22, 11, 3, 55, DateTimeKind.Utc);
string result;
result = JavaScriptConvert.SerializeObject(d, converter);
result = JsonConvert.SerializeObject(d, converter);
Assert.AreEqual(@"""2000-12-15T22:11:03.0550000Z""", result);
Assert.AreEqual(d, JavaScriptConvert.DeserializeObject<DateTime>(result, converter));
Assert.AreEqual(d, JsonConvert.DeserializeObject<DateTime>(result, converter));
d = new DateTime(2000, 12, 15, 22, 11, 3, 55, DateTimeKind.Local);
result = JavaScriptConvert.SerializeObject(d, converter);
result = JsonConvert.SerializeObject(d, converter);
Assert.AreEqual(@"""2000-12-15T22:11:03.0550000" + d.GetLocalOffset() + @"""", result);
}
@@ -82,13 +82,13 @@ namespace Newtonsoft.Json.Tests.Converters
DateTime d = new DateTime(2000, 12, 15, 22, 11, 3, 0, DateTimeKind.Utc);
string result;
result = JavaScriptConvert.SerializeObject(d, converter);
result = JsonConvert.SerializeObject(d, converter);
Assert.AreEqual(@"""Friday, 15 December 2000 22:11:03""", result);
Assert.AreEqual(d, JavaScriptConvert.DeserializeObject<DateTime>(result, converter));
Assert.AreEqual(d, JsonConvert.DeserializeObject<DateTime>(result, converter));
d = new DateTime(2000, 12, 15, 22, 11, 3, 0, DateTimeKind.Local);
result = JavaScriptConvert.SerializeObject(d, converter);
result = JsonConvert.SerializeObject(d, converter);
Assert.AreEqual(@"""Friday, 15 December 2000 22:11:03""", result);
}
@@ -99,7 +99,7 @@ namespace Newtonsoft.Json.Tests.Converters
string json = @"""09/12/2006""";
DateTime d = JavaScriptConvert.DeserializeObject<DateTime>(json, converter);
DateTime d = JsonConvert.DeserializeObject<DateTime>(json, converter);
Assert.AreEqual(9, d.Day);
Assert.AreEqual(12, d.Month);
@@ -115,13 +115,13 @@ namespace Newtonsoft.Json.Tests.Converters
DateTime d = new DateTime(2000, 12, 15, 22, 11, 3, 0, DateTimeKind.Utc);
string result;
result = JavaScriptConvert.SerializeObject(d, converter);
result = JsonConvert.SerializeObject(d, converter);
Assert.AreEqual(@"""Friday, 15 December 2000 10:11:03 p.m.""", result);
Assert.AreEqual(d, JavaScriptConvert.DeserializeObject<DateTime>(result, converter));
Assert.AreEqual(d, JsonConvert.DeserializeObject<DateTime>(result, converter));
d = new DateTime(2000, 12, 15, 22, 11, 3, 0, DateTimeKind.Local);
result = JavaScriptConvert.SerializeObject(d, converter);
result = JsonConvert.SerializeObject(d, converter);
Assert.AreEqual(@"""Friday, 15 December 2000 10:11:03 p.m.""", result);
}
@@ -132,7 +132,7 @@ namespace Newtonsoft.Json.Tests.Converters
string json = @"""09/12/2006""";
DateTime d = JavaScriptConvert.DeserializeObject<DateTime>(json, converter);
DateTime d = JsonConvert.DeserializeObject<DateTime>(json, converter);
Assert.AreEqual(9, d.Day);
Assert.AreEqual(12, d.Month);
@@ -148,10 +148,10 @@ namespace Newtonsoft.Json.Tests.Converters
DateTimeOffset d = new DateTimeOffset(2000, 12, 15, 22, 11, 3, 55, TimeSpan.Zero);
string result;
result = JavaScriptConvert.SerializeObject(d, converter);
result = JsonConvert.SerializeObject(d, converter);
Assert.AreEqual(@"""2000-12-15T22:11:03.0550000+00:00""", result);
Assert.AreEqual(d, JavaScriptConvert.DeserializeObject<DateTimeOffset>(result, converter));
Assert.AreEqual(d, JsonConvert.DeserializeObject<DateTimeOffset>(result, converter));
}
[Test]
@@ -162,7 +162,7 @@ namespace Newtonsoft.Json.Tests.Converters
c.DateTimeOffsetField = new DateTime(2008, 12, 12, 12, 12, 12, 0, DateTimeKind.Utc).ToLocalTime();
c.PreField = "Pre";
c.PostField = "Post";
string json = JavaScriptConvert.SerializeObject(c, new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal });
string json = JsonConvert.SerializeObject(c, new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal });
Assert.AreEqual(@"{""PreField"":""Pre"",""DateTimeField"":""2008-12-12T12:12:12.0000000Z"",""DateTimeOffsetField"":""2008-12-12T12:12:12.0000000+00:00"",""PostField"":""Post""}", json);
//test the other edge case too
@@ -170,7 +170,7 @@ namespace Newtonsoft.Json.Tests.Converters
c.DateTimeOffsetField = new DateTime(2008, 1, 1, 1, 1, 1, 0, DateTimeKind.Utc).ToLocalTime();
c.PreField = "Pre";
c.PostField = "Post";
json = JavaScriptConvert.SerializeObject(c, new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal });
json = JsonConvert.SerializeObject(c, new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal });
Assert.AreEqual(@"{""PreField"":""Pre"",""DateTimeField"":""2008-01-01T01:01:01.0000000Z"",""DateTimeOffsetField"":""2008-01-01T01:01:01.0000000+00:00"",""PostField"":""Post""}", json);
}
@@ -182,7 +182,7 @@ namespace Newtonsoft.Json.Tests.Converters
c.DateTimeOffsetField = new DateTime(2008, 12, 12, 12, 12, 12, 0, DateTimeKind.Utc).ToLocalTime();
c.PreField = "Pre";
c.PostField = "Post";
string json = JavaScriptConvert.SerializeObject(c, new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal });
string json = JsonConvert.SerializeObject(c, new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal });
Assert.AreEqual(@"{""PreField"":""Pre"",""DateTimeField"":""2008-12-12T12:12:12.0000000Z"",""DateTimeOffsetField"":""2008-12-12T12:12:12.0000000+00:00"",""PostField"":""Post""}", json);
//test the other edge case too
@@ -190,7 +190,7 @@ namespace Newtonsoft.Json.Tests.Converters
c.DateTimeOffsetField = null;
c.PreField = "Pre";
c.PostField = "Post";
json = JavaScriptConvert.SerializeObject(c, new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal });
json = JsonConvert.SerializeObject(c, new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal });
Assert.AreEqual(@"{""PreField"":""Pre"",""DateTimeField"":null,""DateTimeOffsetField"":null,""PostField"":""Post""}", json);
}
@@ -198,7 +198,7 @@ namespace Newtonsoft.Json.Tests.Converters
public void DeserializeUTC()
{
DateTimeTestClass c =
JavaScriptConvert.DeserializeObject<DateTimeTestClass>(@"{""PreField"":""Pre"",""DateTimeField"":""2008-12-12T12:12:12Z"",""DateTimeOffsetField"":""2008-12-12T12:12:12Z"",""PostField"":""Post""}", new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal });
JsonConvert.DeserializeObject<DateTimeTestClass>(@"{""PreField"":""Pre"",""DateTimeField"":""2008-12-12T12:12:12Z"",""DateTimeOffsetField"":""2008-12-12T12:12:12Z"",""PostField"":""Post""}", new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal });
Assert.AreEqual(new DateTime(2008, 12, 12, 12, 12, 12, 0, DateTimeKind.Utc).ToLocalTime(), c.DateTimeField);
Assert.AreEqual(new DateTimeOffset(2008, 12, 12, 12, 12, 12, 0, TimeSpan.Zero), c.DateTimeOffsetField);
@@ -206,7 +206,7 @@ namespace Newtonsoft.Json.Tests.Converters
Assert.AreEqual("Post", c.PostField);
DateTimeTestClass c2 =
JavaScriptConvert.DeserializeObject<DateTimeTestClass>(@"{""PreField"":""Pre"",""DateTimeField"":""2008-01-01T01:01:01Z"",""DateTimeOffsetField"":""2008-01-01T01:01:01Z"",""PostField"":""Post""}", new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal });
JsonConvert.DeserializeObject<DateTimeTestClass>(@"{""PreField"":""Pre"",""DateTimeField"":""2008-01-01T01:01:01Z"",""DateTimeOffsetField"":""2008-01-01T01:01:01Z"",""PostField"":""Post""}", new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal });
Assert.AreEqual(new DateTime(2008, 1, 1, 1, 1, 1, 0, DateTimeKind.Utc).ToLocalTime(), c2.DateTimeField);
Assert.AreEqual(new DateTimeOffset(2008, 1, 1, 1, 1, 1, 0, TimeSpan.Zero), c2.DateTimeOffsetField);
@@ -218,7 +218,7 @@ namespace Newtonsoft.Json.Tests.Converters
public void NullableDeserializeUTC()
{
NullableDateTimeTestClass c =
JavaScriptConvert.DeserializeObject<NullableDateTimeTestClass>(@"{""PreField"":""Pre"",""DateTimeField"":""2008-12-12T12:12:12Z"",""DateTimeOffsetField"":""2008-12-12T12:12:12Z"",""PostField"":""Post""}", new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal });
JsonConvert.DeserializeObject<NullableDateTimeTestClass>(@"{""PreField"":""Pre"",""DateTimeField"":""2008-12-12T12:12:12Z"",""DateTimeOffsetField"":""2008-12-12T12:12:12Z"",""PostField"":""Post""}", new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal });
Assert.AreEqual(new DateTime(2008, 12, 12, 12, 12, 12, 0, DateTimeKind.Utc).ToLocalTime(), c.DateTimeField);
Assert.AreEqual(new DateTimeOffset(2008, 12, 12, 12, 12, 12, 0, TimeSpan.Zero), c.DateTimeOffsetField);
@@ -226,7 +226,7 @@ namespace Newtonsoft.Json.Tests.Converters
Assert.AreEqual("Post", c.PostField);
NullableDateTimeTestClass c2 =
JavaScriptConvert.DeserializeObject<NullableDateTimeTestClass>(@"{""PreField"":""Pre"",""DateTimeField"":null,""DateTimeOffsetField"":null,""PostField"":""Post""}", new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal });
JsonConvert.DeserializeObject<NullableDateTimeTestClass>(@"{""PreField"":""Pre"",""DateTimeField"":null,""DateTimeOffsetField"":null,""PostField"":""Post""}", new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal });
Assert.AreEqual(null, c2.DateTimeField);
Assert.AreEqual(null, c2.DateTimeOffsetField);
@@ -239,7 +239,7 @@ namespace Newtonsoft.Json.Tests.Converters
public void DeserializeNullToNonNullable()
{
DateTimeTestClass c2 =
JavaScriptConvert.DeserializeObject<DateTimeTestClass>(@"{""PreField"":""Pre"",""DateTimeField"":null,""DateTimeOffsetField"":null,""PostField"":""Post""}", new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal });
JsonConvert.DeserializeObject<DateTimeTestClass>(@"{""PreField"":""Pre"",""DateTimeField"":null,""DateTimeOffsetField"":null,""PostField"":""Post""}", new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal });
}
[Test]
@@ -249,9 +249,9 @@ namespace Newtonsoft.Json.Tests.Converters
c.DateTimeField = new DateTime(2008, 1, 1, 1, 1, 1, 0, DateTimeKind.Local);
c.PreField = "Pre";
c.PostField = "Post";
string json = JavaScriptConvert.SerializeObject(c, new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal }); //note that this fails without the Utc converter...
string json = JsonConvert.SerializeObject(c, new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal }); //note that this fails without the Utc converter...
c.DateTimeField = new DateTime(2008, 1, 1, 1, 1, 1, 0, DateTimeKind.Utc);
string json2 = JavaScriptConvert.SerializeObject(c, new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal });
string json2 = JsonConvert.SerializeObject(c, new IsoDateTimeConverter() { DateTimeStyles = DateTimeStyles.AssumeUniversal });
Assert.AreNotEqual(json, json2);
}
}
Src/Newtonsoft.Json.Tests/Converters/JavaScriptDateTimeConverterTests.cs
+8 -8
View File
@@ -42,7 +42,7 @@ namespace Newtonsoft.Json.Tests.Converters
DateTime d = new DateTime(2000, 12, 15, 22, 11, 3, 55, DateTimeKind.Utc);
string result;
result = JavaScriptConvert.SerializeObject(d, converter);
result = JsonConvert.SerializeObject(d, converter);
Assert.AreEqual("new Date(976918263055)", result);
}
@@ -54,7 +54,7 @@ namespace Newtonsoft.Json.Tests.Converters
DateTimeOffset now = new DateTimeOffset(2000, 12, 15, 22, 11, 3, 55, TimeSpan.Zero);
string result;
result = JavaScriptConvert.SerializeObject(now, converter);
result = JsonConvert.SerializeObject(now, converter);
Assert.AreEqual("new Date(976918263055)", result);
}
@@ -71,7 +71,7 @@ namespace Newtonsoft.Json.Tests.Converters
string result;
result = JavaScriptConvert.SerializeObject(t, converter);
result = JsonConvert.SerializeObject(t, converter);
Assert.AreEqual(@"{""PreField"":null,""DateTimeField"":null,""DateTimeOffsetField"":null,""PostField"":null}", result);
t = new NullableDateTimeTestClass()
@@ -80,7 +80,7 @@ namespace Newtonsoft.Json.Tests.Converters
DateTimeOffsetField = new DateTimeOffset(2000, 12, 15, 22, 11, 3, 55, TimeSpan.Zero)
};
result = JavaScriptConvert.SerializeObject(t, converter);
result = JsonConvert.SerializeObject(t, converter);
Assert.AreEqual(@"{""PreField"":null,""DateTimeField"":new Date(976918263055),""DateTimeOffsetField"":new Date(976918263055),""PostField"":null}", result);
}
@@ -89,7 +89,7 @@ namespace Newtonsoft.Json.Tests.Converters
{
JavaScriptDateTimeConverter converter = new JavaScriptDateTimeConverter();
DateTime result = JavaScriptConvert.DeserializeObject<DateTime>("new Date(976918263055)", converter);
DateTime result = JsonConvert.DeserializeObject<DateTime>("new Date(976918263055)", converter);
Assert.AreEqual(new DateTime(2000, 12, 15, 22, 11, 3, 55, DateTimeKind.Utc), result);
}
@@ -98,7 +98,7 @@ namespace Newtonsoft.Json.Tests.Converters
public void DeserializeNullToNonNullable()
{
DateTimeTestClass c2 =
JavaScriptConvert.DeserializeObject<DateTimeTestClass>(@"{""PreField"":""Pre"",""DateTimeField"":null,""DateTimeOffsetField"":null,""PostField"":""Post""}", new JavaScriptDateTimeConverter());
JsonConvert.DeserializeObject<DateTimeTestClass>(@"{""PreField"":""Pre"",""DateTimeField"":null,""DateTimeOffsetField"":null,""PostField"":""Post""}", new JavaScriptDateTimeConverter());
}
[Test]
@@ -107,9 +107,9 @@ namespace Newtonsoft.Json.Tests.Converters
JavaScriptDateTimeConverter converter = new JavaScriptDateTimeConverter();
DateTimeOffset start = new DateTimeOffset(2000, 12, 15, 22, 11, 3, 55, TimeSpan.Zero);
string json = JavaScriptConvert.SerializeObject(start, converter);
string json = JsonConvert.SerializeObject(start, converter);
DateTimeOffset result = JavaScriptConvert.DeserializeObject<DateTimeOffset>(json, converter);
DateTimeOffset result = JsonConvert.DeserializeObject<DateTimeOffset>(json, converter);
Assert.AreEqual(new DateTimeOffset(2000, 12, 15, 22, 11, 3, 55, TimeSpan.Zero), result);
}
}
Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs
+21 -21
View File
@@ -122,7 +122,7 @@ namespace Newtonsoft.Json.Tests.Converters
XmlAttribute attribute = doc.CreateAttribute("msdata:IsDataSet");
attribute.Value = "true";
jsonText = JavaScriptConvert.SerializeXmlNode(attribute);
jsonText = JsonConvert.SerializeXmlNode(attribute);
Console.WriteLine(jsonText);
Assert.AreEqual(@"{""@msdata:IsDataSet"":""true""}", jsonText);
@@ -131,7 +131,7 @@ namespace Newtonsoft.Json.Tests.Converters
// XmlProcessingInstruction
XmlProcessingInstruction instruction = doc.CreateProcessingInstruction("xml-stylesheet", @"href=""classic.xsl"" type=""text/xml""");
jsonText = JavaScriptConvert.SerializeXmlNode(instruction);
jsonText = JsonConvert.SerializeXmlNode(instruction);
Console.WriteLine(jsonText);
Assert.AreEqual(@"{""?xml-stylesheet"":""href=\""classic.xsl\"" type=\""text/xml\""""}", jsonText);
@@ -140,7 +140,7 @@ namespace Newtonsoft.Json.Tests.Converters
// XmlProcessingInstruction
XmlCDataSection cDataSection = doc.CreateCDataSection("<Kiwi>true</Kiwi>");
jsonText = JavaScriptConvert.SerializeXmlNode(cDataSection);
jsonText = JsonConvert.SerializeXmlNode(cDataSection);
Console.WriteLine(jsonText);
Assert.AreEqual(@"{""#cdata-section"":""<Kiwi>true</Kiwi>""}", jsonText);
@@ -153,7 +153,7 @@ namespace Newtonsoft.Json.Tests.Converters
element.AppendChild(instruction);
element.AppendChild(cDataSection);
jsonText = JavaScriptConvert.SerializeXmlNode(element);
jsonText = JsonConvert.SerializeXmlNode(element);
Console.WriteLine(jsonText);
Assert.AreEqual(@"{""xs:Choice"":{""@msdata:IsDataSet"":""true"",""?xml-stylesheet"":""href=\""classic.xsl\"" type=\""text/xml\"""",""#cdata-section"":""<Kiwi>true</Kiwi>""}}", jsonText);
@@ -168,7 +168,7 @@ namespace Newtonsoft.Json.Tests.Converters
fragement.InnerXml = "<Item>widget</Item><Item>widget</Item>";
string jsonText = JavaScriptConvert.SerializeXmlNode(fragement);
string jsonText = JsonConvert.SerializeXmlNode(fragement);
string expected = @"{""Item"":[""widget"",""widget""]}";
@@ -209,9 +209,9 @@ namespace Newtonsoft.Json.Tests.Converters
XmlDocument doc = new XmlDocument();
doc.LoadXml(xml);
string jsonText = JavaScriptConvert.SerializeXmlNode(doc);
string jsonText = JsonConvert.SerializeXmlNode(doc);
XmlDocument deserializedDoc = (XmlDocument)JavaScriptConvert.DeserializeXmlNode(jsonText);
XmlDocument deserializedDoc = (XmlDocument)JsonConvert.DeserializeXmlNode(jsonText);
Assert.AreEqual(doc.InnerXml, deserializedDoc.InnerXml);
@@ -243,7 +243,7 @@ namespace Newtonsoft.Json.Tests.Converters
}
}";
XmlDocument doc = (XmlDocument)JavaScriptConvert.DeserializeXmlNode(jsonText);
XmlDocument doc = (XmlDocument)JsonConvert.DeserializeXmlNode(jsonText);
string expected = @"<?xml version=""1.0"" standalone=""no""?>
<span class=""vevent"">
@@ -294,9 +294,9 @@ namespace Newtonsoft.Json.Tests.Converters
XmlDocument doc = new XmlDocument();
doc.LoadXml(xml);
string jsonText = JavaScriptConvert.SerializeXmlNode(doc);
string jsonText = JsonConvert.SerializeXmlNode(doc);
XmlDocument newDoc = (XmlDocument)JavaScriptConvert.DeserializeXmlNode(jsonText);
XmlDocument newDoc = (XmlDocument)JsonConvert.DeserializeXmlNode(jsonText);
Assert.AreEqual(doc.InnerXml, newDoc.InnerXml);
}
@@ -319,11 +319,11 @@ namespace Newtonsoft.Json.Tests.Converters
XmlDocument doc = new XmlDocument();
doc.LoadXml(xml);
string jsonText = JavaScriptConvert.SerializeXmlNode(doc);
string jsonText = JsonConvert.SerializeXmlNode(doc);
Console.WriteLine(jsonText);
XmlDocument newDoc = (XmlDocument)JavaScriptConvert.DeserializeXmlNode(jsonText);
XmlDocument newDoc = (XmlDocument)JsonConvert.DeserializeXmlNode(jsonText);
Assert.AreEqual(doc.InnerXml, newDoc.InnerXml);
}
@@ -333,7 +333,7 @@ namespace Newtonsoft.Json.Tests.Converters
{
string jsonText = @"{""?xml"":{""@version"":""1.0"",""@standalone"":""no""},""root"":{""person"":[{""@id"":""1"",""Float"":2.5,""Integer"":99},{""@id"":""2"",""Boolean"":true,""date"":""\/Date(954374400000)\/""}]}}";
XmlDocument newDoc = (XmlDocument)JavaScriptConvert.DeserializeXmlNode(jsonText);
XmlDocument newDoc = (XmlDocument)JsonConvert.DeserializeXmlNode(jsonText);
string expected = @"<?xml version=""1.0"" standalone=""no""?><root><person id=""1""><Float>2.5</Float><Integer>99</Integer></person><person id=""2""><Boolean>true</Boolean><date>2000-03-30T00:00:00Z</date></person></root>";
@@ -344,14 +344,14 @@ namespace Newtonsoft.Json.Tests.Converters
[ExpectedException(typeof(JsonSerializationException), ExpectedMessage = "XmlNodeConverter can only convert JSON that begins with an object.")]
public void NoRootObject()
{
XmlDocument newDoc = (XmlDocument)JavaScriptConvert.DeserializeXmlNode(@"[1]");
XmlDocument newDoc = (XmlDocument)JsonConvert.DeserializeXmlNode(@"[1]");
}
[Test]
[ExpectedException(typeof(JsonSerializationException), ExpectedMessage = "JSON root object has multiple properties. The root object must have a single property in order to create a valid XML document.")]
public void RootObjectMultipleProperties()
{
XmlDocument newDoc = (XmlDocument)JavaScriptConvert.DeserializeXmlNode(@"{Prop1:1,Prop2:2}");
XmlDocument newDoc = (XmlDocument)JsonConvert.DeserializeXmlNode(@"{Prop1:1,Prop2:2}");
}
[Test]
@@ -359,13 +359,13 @@ namespace Newtonsoft.Json.Tests.Converters
{
string jsonText = @"{root:{r:new Date(34343, 55)}}";
XmlDocument newDoc = (XmlDocument)JavaScriptConvert.DeserializeXmlNode(jsonText);
XmlDocument newDoc = (XmlDocument)JsonConvert.DeserializeXmlNode(jsonText);
string expected = @"<root><r><-Date>34343</-Date><-Date>55</-Date></r></root>";
Assert.AreEqual(expected, newDoc.InnerXml);
string json = JavaScriptConvert.SerializeXmlNode(newDoc);
string json = JsonConvert.SerializeXmlNode(newDoc);
Assert.AreEqual(@"{""root"":{""r"":new Date(""34343"",""55"")}}", json);
}
@@ -383,7 +383,7 @@ namespace Newtonsoft.Json.Tests.Converters
XmlDocument arrayDoc = new XmlDocument();
arrayDoc.LoadXml(arrayXml);
string arrayJsonText = JavaScriptConvert.SerializeXmlNode(arrayDoc);
string arrayJsonText = JsonConvert.SerializeXmlNode(arrayDoc);
Assert.AreEqual(@"{""root"":{""person"":{""@id"":""1"",""name"":""Alan"",""url"":""http://www.google.com"",""role"":[""Admin""]}}}", arrayJsonText);
arrayXml = @"<root xmlns:json=""http://james.newtonking.com/projects/json"">
@@ -398,7 +398,7 @@ namespace Newtonsoft.Json.Tests.Converters
arrayDoc = new XmlDocument();
arrayDoc.LoadXml(arrayXml);
arrayJsonText = JavaScriptConvert.SerializeXmlNode(arrayDoc);
arrayJsonText = JsonConvert.SerializeXmlNode(arrayDoc);
Assert.AreEqual(@"{""root"":{""person"":{""@id"":""1"",""name"":""Alan"",""url"":""http://www.google.com"",""role"":[""Admin1"",""Admin2""]}}}", arrayJsonText);
arrayXml = @"<root xmlns:json=""http://james.newtonking.com/projects/json"">
@@ -412,7 +412,7 @@ namespace Newtonsoft.Json.Tests.Converters
arrayDoc = new XmlDocument();
arrayDoc.LoadXml(arrayXml);
arrayJsonText = JavaScriptConvert.SerializeXmlNode(arrayDoc);
arrayJsonText = JsonConvert.SerializeXmlNode(arrayDoc);
Assert.AreEqual(@"{""root"":{""person"":{""@id"":""1"",""name"":""Alan"",""url"":""http://www.google.com"",""role"":""Admin1""}}}", arrayJsonText);
}
@@ -453,7 +453,7 @@ namespace Newtonsoft.Json.Tests.Converters
]
}";
XmlDocument newDoc = (XmlDocument)JavaScriptConvert.DeserializeXmlNode(strJSON);
XmlDocument newDoc = (XmlDocument)JsonConvert.DeserializeXmlNode(strJSON);
}
}
}
Src/Newtonsoft.Json.Tests/JavaScriptConvertTest.cs → Src/Newtonsoft.Json.Tests/JsonConvertTest.cs
+32 -32
View File
@@ -33,7 +33,7 @@ using System.Linq;
namespace Newtonsoft.Json.Tests
{
public class JavaScriptConvertTest : TestFixtureBase
public class JsonConvertTest : TestFixtureBase
{
#if Entities
[Test]
@@ -90,7 +90,7 @@ namespace Newtonsoft.Json.Tests
""EntityKey"": null
}", json);
Purchase newPurchase = JavaScriptConvert.DeserializeObject<Purchase>(json);
Purchase newPurchase = JsonConvert.DeserializeObject<Purchase>(json);
Assert.AreEqual(1, newPurchase.Id);
Assert.AreEqual(2, newPurchase.PurchaseLine.Count);
@@ -162,21 +162,21 @@ now brown cow?", '"', true);
[ExpectedException(typeof(ArgumentException), ExpectedMessage = "Unsupported type: System.Version. Use the JsonSerializer class to get the object's JSON representation.")]
public void ToStringInvalid()
{
JavaScriptConvert.ToString(new Version(1, 0));
JsonConvert.ToString(new Version(1, 0));
}
[Test]
public void GuidToString()
{
Guid guid = new Guid("BED7F4EA-1A96-11d2-8F08-00A0C9A6186D");
string json = JavaScriptConvert.ToString(guid);
string json = JsonConvert.ToString(guid);
Assert.AreEqual(@"""bed7f4ea-1a96-11d2-8f08-00a0c9a6186d""", json);
}
[Test]
public void EnumToString()
{
string json = JavaScriptConvert.ToString(StringComparison.CurrentCultureIgnoreCase);
string json = JsonConvert.ToString(StringComparison.CurrentCultureIgnoreCase);
Assert.AreEqual("1", json);
}
@@ -186,58 +186,58 @@ now brown cow?", '"', true);
object value;
value = 1;
Assert.AreEqual("1", JavaScriptConvert.ToString(value));
Assert.AreEqual("1", JsonConvert.ToString(value));
value = 1.1;
Assert.AreEqual("1.1", JavaScriptConvert.ToString(value));
Assert.AreEqual("1.1", JsonConvert.ToString(value));
value = 1.1m;
Assert.AreEqual("1.1", JavaScriptConvert.ToString(value));
Assert.AreEqual("1.1", JsonConvert.ToString(value));
value = (float)1.1;
Assert.AreEqual("1.1", JavaScriptConvert.ToString(value));
Assert.AreEqual("1.1", JsonConvert.ToString(value));
value = (short)1;
Assert.AreEqual("1", JavaScriptConvert.ToString(value));
Assert.AreEqual("1", JsonConvert.ToString(value));
value = (long)1;
Assert.AreEqual("1", JavaScriptConvert.ToString(value));
Assert.AreEqual("1", JsonConvert.ToString(value));
value = (byte)1;
Assert.AreEqual("1", JavaScriptConvert.ToString(value));
Assert.AreEqual("1", JsonConvert.ToString(value));
value = (uint)1;
Assert.AreEqual("1", JavaScriptConvert.ToString(value));
Assert.AreEqual("1", JsonConvert.ToString(value));
value = (ushort)1;
Assert.AreEqual("1", JavaScriptConvert.ToString(value));
Assert.AreEqual("1", JsonConvert.ToString(value));
value = (sbyte)1;
Assert.AreEqual("1", JavaScriptConvert.ToString(value));
Assert.AreEqual("1", JsonConvert.ToString(value));
value = (ulong)1;
Assert.AreEqual("1", JavaScriptConvert.ToString(value));
Assert.AreEqual("1", JsonConvert.ToString(value));
value = new DateTime(JavaScriptConvert.InitialJavaScriptDateTicks, DateTimeKind.Utc);
Assert.AreEqual(@"""\/Date(0)\/""", JavaScriptConvert.ToString(value));
value = new DateTime(JsonConvert.InitialJavaScriptDateTicks, DateTimeKind.Utc);
Assert.AreEqual(@"""\/Date(0)\/""", JsonConvert.ToString(value));
value = new DateTimeOffset(JavaScriptConvert.InitialJavaScriptDateTicks, TimeSpan.Zero);
Assert.AreEqual(@"""\/Date(0+0000)\/""", JavaScriptConvert.ToString(value));
value = new DateTimeOffset(JsonConvert.InitialJavaScriptDateTicks, TimeSpan.Zero);
Assert.AreEqual(@"""\/Date(0+0000)\/""", JsonConvert.ToString(value));
value = null;
Assert.AreEqual("null", JavaScriptConvert.ToString(value));
Assert.AreEqual("null", JsonConvert.ToString(value));
value = DBNull.Value;
Assert.AreEqual("null", JavaScriptConvert.ToString(value));
Assert.AreEqual("null", JsonConvert.ToString(value));
value = "I am a string";
Assert.AreEqual(@"""I am a string""", JavaScriptConvert.ToString(value));
Assert.AreEqual(@"""I am a string""", JsonConvert.ToString(value));
value = true;
Assert.AreEqual("true", JavaScriptConvert.ToString(value));
Assert.AreEqual("true", JsonConvert.ToString(value));
value = 'c';
Assert.AreEqual(@"""c""", JavaScriptConvert.ToString(value));
Assert.AreEqual(@"""c""", JsonConvert.ToString(value));
}
[Test]
@@ -246,32 +246,32 @@ now brown cow?", '"', true);
{
string orig = @"this is a string ""that has quotes"" ";
string serialized = JavaScriptConvert.SerializeObject(orig);
string serialized = JsonConvert.SerializeObject(orig);
// *** Make string invalid by stripping \" \"
serialized = serialized.Replace(@"\""", "\"");
string result = JavaScriptConvert.DeserializeObject<string>(serialized);
string result = JsonConvert.DeserializeObject<string>(serialized);
}
[Test]
public void DeserializeValueObjects()
{
int i = JavaScriptConvert.DeserializeObject<int>("1");
int i = JsonConvert.DeserializeObject<int>("1");
Assert.AreEqual(1, i);
#if !PocketPC
DateTimeOffset d = JavaScriptConvert.DeserializeObject<DateTimeOffset>(@"""\/Date(-59011455539000+0000)\/""");
DateTimeOffset d = JsonConvert.DeserializeObject<DateTimeOffset>(@"""\/Date(-59011455539000+0000)\/""");
Assert.AreEqual(new DateTimeOffset(new DateTime(100, 1, 1, 1, 1, 1, DateTimeKind.Utc)), d);
#endif
bool b = JavaScriptConvert.DeserializeObject<bool>("true");
bool b = JsonConvert.DeserializeObject<bool>("true");
Assert.AreEqual(true, b);
object n = JavaScriptConvert.DeserializeObject<object>("null");
object n = JsonConvert.DeserializeObject<object>("null");
Assert.AreEqual(null, n);
object u = JavaScriptConvert.DeserializeObject<object>("undefined");
object u = JsonConvert.DeserializeObject<object>("undefined");
Assert.AreEqual(null, u);
}
}
Src/Newtonsoft.Json.Tests/JsonSerializerTest.cs
+84 -84
View File
@@ -223,9 +223,9 @@ namespace Newtonsoft.Json.Tests
{
Store store = new Store();
string jsonText = JavaScriptConvert.SerializeObject(store);
string jsonText = JsonConvert.SerializeObject(store);
Store deserializedStore = (Store)JavaScriptConvert.DeserializeObject(jsonText, typeof(Store));
Store deserializedStore = (Store)JsonConvert.DeserializeObject(jsonText, typeof(Store));
Assert.AreEqual(store.Establised, deserializedStore.Establised);
@@ -242,7 +242,7 @@ namespace Newtonsoft.Json.Tests
product.Price = 3.99M;
product.Sizes = new string[] { "Small", "Medium", "Large" };
string output = JavaScriptConvert.SerializeObject(product);
string output = JsonConvert.SerializeObject(product);
//{
// "Name": "Apple",
// "Expiry": "\/Date(1230375600000+1300)\/",
@@ -254,7 +254,7 @@ namespace Newtonsoft.Json.Tests
// ]
//}
Product deserializedProduct = (Product)JavaScriptConvert.DeserializeObject(output, typeof(Product));
Product deserializedProduct = (Product)JsonConvert.DeserializeObject(output, typeof(Product));
Assert.AreEqual("Apple", deserializedProduct.Name);
Assert.AreEqual(new DateTime(2008, 12, 28), deserializedProduct.Expiry);
@@ -283,11 +283,11 @@ namespace Newtonsoft.Json.Tests
//}
[Test]
public void JavaScriptConvertSerializer()
public void JsonConvertSerializer()
{
string value = @"{""Name"":""Orange"", ""Price"":3.99, ""Expiry"":""01/24/2010 12:00:00""}";
Product p = JavaScriptConvert.DeserializeObject(value, typeof(Product)) as Product;
Product p = JsonConvert.DeserializeObject(value, typeof(Product)) as Product;
Assert.AreEqual("Orange", p.Name);
Assert.AreEqual(new DateTime(2010, 1, 24, 12, 0, 0), p.Expiry);
@@ -301,9 +301,9 @@ namespace Newtonsoft.Json.Tests
Dictionary<string, object> testDictionary = new Dictionary<string, object>();
testDictionary["date"] = dateValue;
string jsonText = JavaScriptConvert.SerializeObject(testDictionary);
string jsonText = JsonConvert.SerializeObject(testDictionary);
Dictionary<string, object> deserializedDictionary = (Dictionary<string, object>)JavaScriptConvert.DeserializeObject(jsonText, typeof(Dictionary<string, object>));
Dictionary<string, object> deserializedDictionary = (Dictionary<string, object>)JsonConvert.DeserializeObject(jsonText, typeof(Dictionary<string, object>));
DateTime deserializedDate = (DateTime)deserializedDictionary["date"];
Assert.AreEqual(dateValue, deserializedDate);
@@ -329,9 +329,9 @@ namespace Newtonsoft.Json.Tests
executorObject.serverMethodParams = new object[] { "21321546", "101", "1236", "D:\\1.txt" };
executorObject.clientGetResultFunction = "ClientBanSubsCB";
string output = JavaScriptConvert.SerializeObject(executorObject);
string output = JsonConvert.SerializeObject(executorObject);
MethodExecutorObject executorObject2 = JavaScriptConvert.DeserializeObject(output, typeof(MethodExecutorObject)) as MethodExecutorObject;
MethodExecutorObject executorObject2 = JsonConvert.DeserializeObject(output, typeof(MethodExecutorObject)) as MethodExecutorObject;
Assert.AreNotSame(executorObject, executorObject2);
Assert.AreEqual(executorObject2.serverClassName, "BanSubs");
@@ -346,7 +346,7 @@ namespace Newtonsoft.Json.Tests
{
string value = @"{""Name"":""Orange"", ""Price"":3.99, ""Expiry"":""01/24/2010 12:00:00""}";
Hashtable p = JavaScriptConvert.DeserializeObject(value, typeof(Hashtable)) as Hashtable;
Hashtable p = JsonConvert.DeserializeObject(value, typeof(Hashtable)) as Hashtable;
Assert.AreEqual("Orange", p["Name"].ToString());
}
@@ -362,7 +362,7 @@ namespace Newtonsoft.Json.Tests
{
string value = @"{""Name"":""Orange"", ""Hash"":{""Expiry"":""01/24/2010 12:00:00"",""UntypedArray"":[""01/24/2010 12:00:00""]}}";
TypedSubHashtable p = JavaScriptConvert.DeserializeObject(value, typeof(TypedSubHashtable)) as TypedSubHashtable;
TypedSubHashtable p = JsonConvert.DeserializeObject(value, typeof(TypedSubHashtable)) as TypedSubHashtable;
Assert.AreEqual("01/24/2010 12:00:00", p.Hash["Expiry"].ToString());
Assert.AreEqual(@"[
@@ -384,9 +384,9 @@ namespace Newtonsoft.Json.Tests
[Test]
public void SerializeDeserializeGetOnlyProperty()
{
string value = JavaScriptConvert.SerializeObject(new GetOnlyPropertyClass());
string value = JsonConvert.SerializeObject(new GetOnlyPropertyClass());
GetOnlyPropertyClass c = JavaScriptConvert.DeserializeObject<GetOnlyPropertyClass>(value);
GetOnlyPropertyClass c = JsonConvert.DeserializeObject<GetOnlyPropertyClass>(value);
Assert.AreEqual(c.Field, "Field");
Assert.AreEqual(c.GetOnlyProperty, "GetOnlyProperty");
@@ -405,9 +405,9 @@ namespace Newtonsoft.Json.Tests
[Test]
public void SerializeDeserializeSetOnlyProperty()
{
string value = JavaScriptConvert.SerializeObject(new SetOnlyPropertyClass());
string value = JsonConvert.SerializeObject(new SetOnlyPropertyClass());
SetOnlyPropertyClass c = JavaScriptConvert.DeserializeObject<SetOnlyPropertyClass>(value);
SetOnlyPropertyClass c = JsonConvert.DeserializeObject<SetOnlyPropertyClass>(value);
Assert.AreEqual(c.Field, "Field");
}
@@ -439,11 +439,11 @@ namespace Newtonsoft.Json.Tests
[Test]
public void JsonIgnoreAttributeTest()
{
string json = JavaScriptConvert.SerializeObject(new JsonIgnoreAttributeTestClass());
string json = JsonConvert.SerializeObject(new JsonIgnoreAttributeTestClass());
Assert.AreEqual(@"{""Field"":0,""Property"":21}", json);
JsonIgnoreAttributeTestClass c = JavaScriptConvert.DeserializeObject<JsonIgnoreAttributeTestClass>(@"{""Field"":99,""Property"":-1,""IgnoredField"":-1,""IgnoredObject"":[1,2,3,4,5]}");
JsonIgnoreAttributeTestClass c = JsonConvert.DeserializeObject<JsonIgnoreAttributeTestClass>(@"{""Field"":99,""Property"":-1,""IgnoredField"":-1,""IgnoredObject"":[1,2,3,4,5]}");
Assert.AreEqual(0, c.IgnoredField);
Assert.AreEqual(99, c.Field);
@@ -530,7 +530,7 @@ keyword such as type of business.""
]
}
";
object o = JavaScriptConvert.DeserializeObject(json);
object o = JsonConvert.DeserializeObject(json);
string s = string.Empty;
s += s;
}
@@ -549,7 +549,7 @@ keyword such as type of business.""
""torrentc"": ""1816000723""
}";
JObject o = (JObject)JavaScriptConvert.DeserializeObject(jsonText);
JObject o = (JObject)JsonConvert.DeserializeObject(jsonText);
Assert.AreEqual(4, o.Children().Count());
JToken torrentsArray = (JToken)o["torrents"];
@@ -584,11 +584,11 @@ keyword such as type of business.""
test.Pie = "Delicious";
test.SweetCakesCount = int.MaxValue;
string jsonText = JavaScriptConvert.SerializeObject(test);
string jsonText = JsonConvert.SerializeObject(test);
Assert.AreEqual(@"{""pie"":""Delicious"",""pie1"":""PieChart!"",""sweet_cakes_count"":2147483647}", jsonText);
JsonPropertyClass test2 = JavaScriptConvert.DeserializeObject<JsonPropertyClass>(jsonText);
JsonPropertyClass test2 = JsonConvert.DeserializeObject<JsonPropertyClass>(jsonText);
Assert.AreEqual(test.Pie, test2.Pie);
Assert.AreEqual(test.SweetCakesCount, test2.SweetCakesCount);
@@ -606,7 +606,7 @@ keyword such as type of business.""
[ExpectedException(typeof(JsonSerializationException), ExpectedMessage = @"A member with the name 'pie' already exists on Newtonsoft.Json.Tests.JsonSerializerTest+BadJsonPropertyClass. Use the JsonPropertyAttribute to specify another name.")]
public void BadJsonPropertyClassSerialize()
{
JavaScriptConvert.SerializeObject(new BadJsonPropertyClass());
JsonConvert.SerializeObject(new BadJsonPropertyClass());
}
public class Article
@@ -637,9 +637,9 @@ keyword such as type of business.""
articles1.Add(a1);
articles1.Add(a2);
string jsonText = JavaScriptConvert.SerializeObject(articles1);
string jsonText = JsonConvert.SerializeObject(articles1);
ArticleCollection articles2 = JavaScriptConvert.DeserializeObject<ArticleCollection>(jsonText);
ArticleCollection articles2 = JsonConvert.DeserializeObject<ArticleCollection>(jsonText);
Assert.AreEqual(articles1.Count, articles2.Count);
Assert.AreEqual(articles1[0].Name, articles2[0].Name);
@@ -650,9 +650,9 @@ keyword such as type of business.""
{
ReadOnlyCollection<int> r1 = new ReadOnlyCollection<int>(new int[] { 0, 1, 2, 3, 4 });
string jsonText = JavaScriptConvert.SerializeObject(r1);
string jsonText = JsonConvert.SerializeObject(r1);
ReadOnlyCollection<int> r2 = JavaScriptConvert.DeserializeObject<ReadOnlyCollection<int>>(jsonText);
ReadOnlyCollection<int> r2 = JsonConvert.DeserializeObject<ReadOnlyCollection<int>>(jsonText);
CollectionAssert.AreEqual(r1, r2);
}
@@ -688,7 +688,7 @@ keyword such as type of business.""
product.Price = 3.99M;
product.Sizes = new string[] { "Small", "Medium", "Large" };
string output = JavaScriptConvert.SerializeObject(product);
string output = JsonConvert.SerializeObject(product);
//{
// "Name": "Apple",
// "Expiry": new Date(1230422400000),
@@ -700,7 +700,7 @@ keyword such as type of business.""
// ]
//}
ProductShort deserializedProductShort = (ProductShort)JavaScriptConvert.DeserializeObject(output, typeof(ProductShort));
ProductShort deserializedProductShort = (ProductShort)JsonConvert.DeserializeObject(output, typeof(ProductShort));
}
[Test]
@@ -713,7 +713,7 @@ keyword such as type of business.""
product.Price = 3.99M;
product.Sizes = new string[] { "Small", "Medium", "Large" };
string output = JavaScriptConvert.SerializeObject(product);
string output = JsonConvert.SerializeObject(product);
//{
// "Name": "Apple",
// "Expiry": new Date(1230422400000),
@@ -753,7 +753,7 @@ keyword such as type of business.""
DataContractJsonSerializer s = new DataContractJsonSerializer(typeof(List<string>));
List<string> dataContractResult = (List<string>)s.ReadObject(new MemoryStream(Encoding.UTF8.GetBytes(json)));
List<string> jsonNetResult = JavaScriptConvert.DeserializeObject<List<string>>(json);
List<string> jsonNetResult = JsonConvert.DeserializeObject<List<string>>(json);
Assert.AreEqual(1, jsonNetResult.Count);
Assert.AreEqual(dataContractResult[0], jsonNetResult[0]);
@@ -781,7 +781,7 @@ keyword such as type of business.""
string expected = sr.ReadToEnd();
result = JavaScriptConvert.SerializeObject(testDates);
result = JsonConvert.SerializeObject(testDates);
Assert.AreEqual(expected, result);
}
#endif
@@ -796,7 +796,7 @@ keyword such as type of business.""
new DateTimeOffset(2000, 1, 1, 1, 1, 1, TimeSpan.FromHours(-3.5)),
};
string result = JavaScriptConvert.SerializeObject(testDates);
string result = JsonConvert.SerializeObject(testDates);
Assert.AreEqual(@"[""\/Date(-59011455539000+0000)\/"",""\/Date(946688461000+0000)\/"",""\/Date(946641661000+1300)\/"",""\/Date(946701061000-0330)\/""]", result);
}
@@ -807,11 +807,11 @@ keyword such as type of business.""
values.Add(-5, 6);
values.Add(int.MinValue, int.MaxValue);
string json = JavaScriptConvert.SerializeObject(values);
string json = JsonConvert.SerializeObject(values);
Assert.AreEqual(@"{""-5"":6,""-2147483648"":2147483647}", json);
Dictionary<int, int> newValues = JavaScriptConvert.DeserializeObject<Dictionary<int, int>>(json);
Dictionary<int, int> newValues = JsonConvert.DeserializeObject<Dictionary<int, int>>(json);
CollectionAssert.AreEqual(values, newValues);
}
@@ -829,10 +829,10 @@ keyword such as type of business.""
Product = new Product() { Name = "TestProduct" }
};
string json = JavaScriptConvert.SerializeObject(anonymous);
string json = JsonConvert.SerializeObject(anonymous);
Assert.AreEqual(@"{""StringValue"":""I am a string"",""IntValue"":2147483647,""NestedAnonymous"":{""NestedValue"":255},""NestedArray"":[1,2],""Product"":{""Name"":""TestProduct"",""Expiry"":""\/Date(946684800000)\/"",""Price"":0,""Sizes"":null}}", json);
anonymous = JavaScriptConvert.DeserializeAnonymousType(json, anonymous);
anonymous = JsonConvert.DeserializeAnonymousType(json, anonymous);
Assert.AreEqual("I am a string", anonymous.StringValue);
Assert.AreEqual(int.MaxValue, anonymous.IntValue);
Assert.AreEqual(255, anonymous.NestedAnonymous.NestedValue);
@@ -878,7 +878,7 @@ keyword such as type of business.""
StringWriter sw = new StringWriter();
jsonSerializer.Serialize(sw, s1);
//JavaScriptConvert.ConvertDateTimeToJavaScriptTicks(s1.Establised.DateTime)
//JsonConvert.ConvertDateTimeToJavaScriptTicks(s1.Establised.DateTime)
Assert.AreEqual(@"{""Color"":2,""Establised"":""\/Date(1264122061000+0000)\/"",""Width"":1.1,""Employees"":999,""RoomsPerFloor"":[1,2,3,4,5,6,7,8,9],""Open"":false,""Symbol"":""@"",""Mottos"":[""Hello World"",""鲣�能\\'{new Date(12345);}[222]_礍渤~"",null,"" ""],""Cost"":100980.1,""Escape"":""\r\n\t\f\b?{\\r\\n\""'"",""product"":[{""Name"":""Rocket"",""Expiry"":""\/Date(949532490000)\/"",""Price"":0},{""Name"":""Alien"",""Expiry"":""\/Date(946684800000)\/"",""Price"":0}]}", sw.GetStringBuilder().ToString());
@@ -895,14 +895,14 @@ keyword such as type of business.""
[Test]
public void SerializeObject()
{
string json = JavaScriptConvert.SerializeObject(new object());
string json = JsonConvert.SerializeObject(new object());
Assert.AreEqual("{}", json);
}
[Test]
public void SerializeNull()
{
string json = JavaScriptConvert.SerializeObject(null);
string json = JsonConvert.SerializeObject(null);
Assert.AreEqual("null", json);
}
@@ -910,7 +910,7 @@ keyword such as type of business.""
public void CanDeserializeIntArrayWhenNotFirstPropertyInJson()
{
string json = "{foo:'hello',bar:[1,2,3]}";
ClassWithArray wibble = JavaScriptConvert.DeserializeObject<ClassWithArray>(json);
ClassWithArray wibble = JsonConvert.DeserializeObject<ClassWithArray>(json);
Assert.AreEqual("hello", wibble.Foo);
Assert.AreEqual(4, wibble.Bar.Count);
@@ -924,7 +924,7 @@ keyword such as type of business.""
public void CanDeserializeIntArray_WhenArrayIsFirstPropertyInJson()
{
string json = "{bar:[1,2,3], foo:'hello'}";
ClassWithArray wibble = JavaScriptConvert.DeserializeObject<ClassWithArray>(json);
ClassWithArray wibble = JsonConvert.DeserializeObject<ClassWithArray>(json);
Assert.AreEqual("hello", wibble.Foo);
Assert.AreEqual(4, wibble.Bar.Count);
@@ -957,9 +957,9 @@ keyword such as type of business.""
wibble.Bar.Add(1);
wibble.Bar.Add(2);
wibble.Bar.Add(3);
string json = JavaScriptConvert.SerializeObject(wibble);
string json = JsonConvert.SerializeObject(wibble);
ClassWithArray wibbleOut = JavaScriptConvert.DeserializeObject<ClassWithArray>(json);
ClassWithArray wibbleOut = JsonConvert.DeserializeObject<ClassWithArray>(json);
Assert.AreEqual("hello", wibbleOut.Foo);
Assert.AreEqual(5, wibbleOut.Bar.Count);
@@ -973,11 +973,11 @@ keyword such as type of business.""
[Test]
public void SerializeConverableObjects()
{
string json = JavaScriptConvert.SerializeObject(new ConverableMembers());
string json = JsonConvert.SerializeObject(new ConverableMembers());
Assert.AreEqual(@"{""String"":""string"",""Int32"":2147483647,""UInt32"":4294967295,""Byte"":255,""SByte"":127,""Short"":32767,""UShort"":65535,""Long"":9223372036854775807,""ULong"":9223372036854775807,""Double"":1.7976931348623157E+308,""Float"":3.40282347E+38,""DBNull"":null,""Bool"":true,""Char"":""\u0000""}", json);
ConverableMembers c = JavaScriptConvert.DeserializeObject<ConverableMembers>(json);
ConverableMembers c = JsonConvert.DeserializeObject<ConverableMembers>(json);
Assert.AreEqual("string", c.String);
Assert.AreEqual(double.MaxValue, c.Double);
Assert.AreEqual(DBNull.Value, c.DBNull);
@@ -991,7 +991,7 @@ keyword such as type of business.""
s.Push(2);
s.Push(3);
string json = JavaScriptConvert.SerializeObject(s);
string json = JsonConvert.SerializeObject(s);
Assert.AreEqual("[3,2,1]", json);
}
@@ -1000,31 +1000,31 @@ keyword such as type of business.""
{
Guid guid = new Guid("BED7F4EA-1A96-11d2-8F08-00A0C9A6186D");
string json = JavaScriptConvert.SerializeObject(new ClassWithGuid { GuidField = guid });
string json = JsonConvert.SerializeObject(new ClassWithGuid { GuidField = guid });
Assert.AreEqual(@"{""GuidField"":""bed7f4ea-1a96-11d2-8f08-00a0c9a6186d""}", json);
ClassWithGuid c = JavaScriptConvert.DeserializeObject<ClassWithGuid>(json);
ClassWithGuid c = JsonConvert.DeserializeObject<ClassWithGuid>(json);
Assert.AreEqual(guid, c.GuidField);
}
[Test]
public void EnumTest()
{
string json = JavaScriptConvert.SerializeObject(StringComparison.CurrentCultureIgnoreCase);
string json = JsonConvert.SerializeObject(StringComparison.CurrentCultureIgnoreCase);
Assert.AreEqual(@"1", json);
StringComparison s = JavaScriptConvert.DeserializeObject<StringComparison>(json);
StringComparison s = JsonConvert.DeserializeObject<StringComparison>(json);
Assert.AreEqual(StringComparison.CurrentCultureIgnoreCase, s);
}
[Test]
public void JsonIgnoreAttributeOnClassTest()
{
string json = JavaScriptConvert.SerializeObject(new JsonIgnoreAttributeOnClassTestClass());
string json = JsonConvert.SerializeObject(new JsonIgnoreAttributeOnClassTestClass());
Assert.AreEqual(@"{""TheField"":0,""Property"":21}", json);
JsonIgnoreAttributeOnClassTestClass c = JavaScriptConvert.DeserializeObject<JsonIgnoreAttributeOnClassTestClass>(@"{""TheField"":99,""Property"":-1,""IgnoredField"":-1}");
JsonIgnoreAttributeOnClassTestClass c = JsonConvert.DeserializeObject<JsonIgnoreAttributeOnClassTestClass>(@"{""TheField"":99,""Property"":-1,""IgnoredField"":-1}");
Assert.AreEqual(0, c.IgnoredField);
Assert.AreEqual(99, c.Field);
@@ -1035,7 +1035,7 @@ keyword such as type of business.""
public void SerializeArrayAsArrayList()
{
string jsonText = @"[3, ""somestring"",[1,2,3]]";
ArrayList o = JavaScriptConvert.DeserializeObject<ArrayList>(jsonText);
ArrayList o = JsonConvert.DeserializeObject<ArrayList>(jsonText);
Assert.AreEqual(3, o.Count);
Assert.AreEqual(3, ((JArray)o[2]).Count);
@@ -1075,9 +1075,9 @@ keyword such as type of business.""
name.pNumbers.Add(p1);
name.pNumbers.Add(p2);
string json = JavaScriptConvert.SerializeObject(name);
string json = JsonConvert.SerializeObject(name);
Name newName = JavaScriptConvert.DeserializeObject<Name>(json);
Name newName = JsonConvert.DeserializeObject<Name>(json);
Assert.AreEqual("The Idiot in Next To Me", newName.personsName);
@@ -1104,9 +1104,9 @@ keyword such as type of business.""
{
ConstructorCaseSensitivityClass c = new ConstructorCaseSensitivityClass("param1", "Param1", "Param2");
string json = JavaScriptConvert.SerializeObject(c);
string json = JsonConvert.SerializeObject(c);
ConstructorCaseSensitivityClass deserialized = JavaScriptConvert.DeserializeObject<ConstructorCaseSensitivityClass>(json);
ConstructorCaseSensitivityClass deserialized = JsonConvert.DeserializeObject<ConstructorCaseSensitivityClass>(json);
Assert.AreEqual("param1", deserialized.param1);
Assert.AreEqual("Param1", deserialized.Param1);
@@ -1184,10 +1184,10 @@ keyword such as type of business.""
{
ConverterPrecedenceClass c1 = new ConverterPrecedenceClass("!Test!");
string json = JavaScriptConvert.SerializeObject(c1);
string json = JsonConvert.SerializeObject(c1);
Assert.AreEqual(@"[""Class"",""!Test!""]", json);
ConverterPrecedenceClass c2 = JavaScriptConvert.DeserializeObject<ConverterPrecedenceClass>(json);
ConverterPrecedenceClass c2 = JsonConvert.DeserializeObject<ConverterPrecedenceClass>(json);
Assert.AreEqual("!Test!", c2.TestValue);
}
@@ -1197,10 +1197,10 @@ keyword such as type of business.""
{
ConverterPrecedenceClass c1 = new ConverterPrecedenceClass("!Test!");
string json = JavaScriptConvert.SerializeObject(c1, new ArgumentConverterPrecedenceClassConverter());
string json = JsonConvert.SerializeObject(c1, new ArgumentConverterPrecedenceClassConverter());
Assert.AreEqual(@"[""Class"",""!Test!""]", json);
ConverterPrecedenceClass c2 = JavaScriptConvert.DeserializeObject<ConverterPrecedenceClass>(json, new ArgumentConverterPrecedenceClassConverter());
ConverterPrecedenceClass c2 = JsonConvert.DeserializeObject<ConverterPrecedenceClass>(json, new ArgumentConverterPrecedenceClassConverter());
Assert.AreEqual("!Test!", c2.TestValue);
}
@@ -1215,13 +1215,13 @@ keyword such as type of business.""
[Test]
public void SerializerShouldUseMemberConverter()
{
DateTime testDate = new DateTime(JavaScriptConvert.InitialJavaScriptDateTicks, DateTimeKind.Utc);
DateTime testDate = new DateTime(JsonConvert.InitialJavaScriptDateTicks, DateTimeKind.Utc);
MemberConverterClass m1 = new MemberConverterClass { DefaultConverter = testDate, MemberConverter = testDate };
string json = JavaScriptConvert.SerializeObject(m1);
string json = JsonConvert.SerializeObject(m1);
Assert.AreEqual(@"{""DefaultConverter"":""\/Date(0)\/"",""MemberConverter"":""1970-01-01T00:00:00.0000000Z""}", json);
MemberConverterClass m2 = JavaScriptConvert.DeserializeObject<MemberConverterClass>(json);
MemberConverterClass m2 = JsonConvert.DeserializeObject<MemberConverterClass>(json);
Assert.AreEqual(testDate, m2.DefaultConverter);
Assert.AreEqual(testDate, m2.MemberConverter);
@@ -1230,13 +1230,13 @@ keyword such as type of business.""
[Test]
public void SerializerShouldUseMemberConverterOverArgumentConverter()
{
DateTime testDate = new DateTime(JavaScriptConvert.InitialJavaScriptDateTicks, DateTimeKind.Utc);
DateTime testDate = new DateTime(JsonConvert.InitialJavaScriptDateTicks, DateTimeKind.Utc);
MemberConverterClass m1 = new MemberConverterClass { DefaultConverter = testDate, MemberConverter = testDate };
string json = JavaScriptConvert.SerializeObject(m1, new JavaScriptDateTimeConverter());
string json = JsonConvert.SerializeObject(m1, new JavaScriptDateTimeConverter());
Assert.AreEqual(@"{""DefaultConverter"":new Date(0),""MemberConverter"":""1970-01-01T00:00:00.0000000Z""}", json);
MemberConverterClass m2 = JavaScriptConvert.DeserializeObject<MemberConverterClass>(json, new JavaScriptDateTimeConverter());
MemberConverterClass m2 = JsonConvert.DeserializeObject<MemberConverterClass>(json, new JavaScriptDateTimeConverter());
Assert.AreEqual(testDate, m2.DefaultConverter);
Assert.AreEqual(testDate, m2.MemberConverter);
@@ -1256,10 +1256,10 @@ keyword such as type of business.""
c1.DefaultConverter = new ConverterPrecedenceClass("DefaultConverterValue");
c1.MemberConverter = new ConverterPrecedenceClass("MemberConverterValue");
string json = JavaScriptConvert.SerializeObject(c1, new ArgumentConverterPrecedenceClassConverter());
string json = JsonConvert.SerializeObject(c1, new ArgumentConverterPrecedenceClassConverter());
Assert.AreEqual(@"{""DefaultConverter"":[""Class"",""DefaultConverterValue""],""MemberConverter"":[""Member"",""MemberConverterValue""]}", json);
ClassAndMemberConverterClass c2 = JavaScriptConvert.DeserializeObject<ClassAndMemberConverterClass>(json, new ArgumentConverterPrecedenceClassConverter());
ClassAndMemberConverterClass c2 = JsonConvert.DeserializeObject<ClassAndMemberConverterClass>(json, new ArgumentConverterPrecedenceClassConverter());
Assert.AreEqual("DefaultConverterValue", c2.DefaultConverter.TestValue);
Assert.AreEqual("MemberConverterValue", c2.MemberConverter.TestValue);
@@ -1275,7 +1275,7 @@ keyword such as type of business.""
public void IncompatibleJsonAttributeShouldThrow()
{
IncompatibleJsonAttributeClass c = new IncompatibleJsonAttributeClass();
JavaScriptConvert.SerializeObject(c);
JsonConvert.SerializeObject(c);
}
public abstract class AbstractGenericBase<TKey>
@@ -1291,7 +1291,7 @@ keyword such as type of business.""
[Test]
public void GenericAbstractProperty()
{
string json = JavaScriptConvert.SerializeObject(new GenericImpl());
string json = JsonConvert.SerializeObject(new GenericImpl());
Assert.AreEqual(@"{""Id"":0}", json);
}
@@ -1307,19 +1307,19 @@ keyword such as type of business.""
[Test]
public void DefaultValueAttributeTest()
{
string json = JavaScriptConvert.SerializeObject(new DefaultValueAttributeTestClass(),
string json = JsonConvert.SerializeObject(new DefaultValueAttributeTestClass(),
Formatting.None, new JsonSerializerSettings { DefaultValueHandling = DefaultValueHandling.Ignore });
Assert.AreEqual(@"{""TestField1"":0,""TestProperty1"":null}", json);
json = JavaScriptConvert.SerializeObject(new DefaultValueAttributeTestClass { TestField1 = int.MinValue, TestProperty1 = "NotDefault" },
json = JsonConvert.SerializeObject(new DefaultValueAttributeTestClass { TestField1 = int.MinValue, TestProperty1 = "NotDefault" },
Formatting.None, new JsonSerializerSettings { DefaultValueHandling = DefaultValueHandling.Ignore });
Assert.AreEqual(@"{""TestField1"":-2147483648,""TestProperty1"":""NotDefault""}", json);
json = JavaScriptConvert.SerializeObject(new DefaultValueAttributeTestClass { TestField1 = 21, TestProperty1 = "NotDefault" },
json = JsonConvert.SerializeObject(new DefaultValueAttributeTestClass { TestField1 = 21, TestProperty1 = "NotDefault" },
Formatting.None, new JsonSerializerSettings { DefaultValueHandling = DefaultValueHandling.Ignore });
Assert.AreEqual(@"{""TestProperty1"":""NotDefault""}", json);
json = JavaScriptConvert.SerializeObject(new DefaultValueAttributeTestClass { TestField1 = 21, TestProperty1 = "TestProperty1Value" },
json = JsonConvert.SerializeObject(new DefaultValueAttributeTestClass { TestField1 = 21, TestProperty1 = "TestProperty1Value" },
Formatting.None, new JsonSerializerSettings { DefaultValueHandling = DefaultValueHandling.Ignore });
Assert.AreEqual(@"{}", json);
}
@@ -1344,12 +1344,12 @@ keyword such as type of business.""
Paid = false
};
string json = JavaScriptConvert.SerializeObject(invoice);
string json = JsonConvert.SerializeObject(invoice);
Console.WriteLine(json);
// {"Company":"Acme Ltd.","Amount":50.0,"Paid":false,"PaidDate":null}
json = JavaScriptConvert.SerializeObject(invoice,
json = JsonConvert.SerializeObject(invoice,
Formatting.None,
new JsonSerializerSettings { DefaultValueHandling = DefaultValueHandling.Ignore });
@@ -1362,10 +1362,10 @@ keyword such as type of business.""
{
string json;
json = JavaScriptConvert.SerializeObject((int?)null);
json = JsonConvert.SerializeObject((int?)null);
Assert.AreEqual("null", json);
json = JavaScriptConvert.SerializeObject((int?)1);
json = JsonConvert.SerializeObject((int?)1);
Assert.AreEqual("1", json);
}
@@ -1416,7 +1416,7 @@ keyword such as type of business.""
string json;
json = JavaScriptConvert.SerializeObject(personRaw);
json = JsonConvert.SerializeObject(personRaw);
Assert.AreEqual(@"{""first_name"":""FirstNameValue"",""RawContent"":[1,2,3,4,5],""last_name"":""LastNameValue""}", json);
}
@@ -1425,7 +1425,7 @@ keyword such as type of business.""
{
string json = @"{""first_name"":""FirstNameValue"",""RawContent"":[1,2,3,4,5],""last_name"":""LastNameValue""}";
PersonRaw personRaw = JavaScriptConvert.DeserializeObject<PersonRaw>(json);
PersonRaw personRaw = JsonConvert.DeserializeObject<PersonRaw>(json);
Assert.AreEqual("FirstNameValue", personRaw.FirstName);
Assert.AreEqual("[1,2,3,4,5]", personRaw.RawContent.Content);
@@ -1457,11 +1457,11 @@ keyword such as type of business.""
Active = true
};
string json = JavaScriptConvert.SerializeObject(userNullablle);
string json = JsonConvert.SerializeObject(userNullablle);
Assert.AreEqual(@"{""Id"":""ad6205e8-0df4-465d-aea6-8ba18e93a7e7"",""FName"":""FirstValue"",""LName"":""LastValue"",""RoleId"":5,""NullableRoleId"":6,""NullRoleId"":null,""Active"":true}", json);
UserNullablle userNullablleDeserialized = JavaScriptConvert.DeserializeObject<UserNullablle>(json);
UserNullablle userNullablleDeserialized = JsonConvert.DeserializeObject<UserNullablle>(json);
Assert.AreEqual(new Guid("AD6205E8-0DF4-465d-AEA6-8BA18E93A7E7"), userNullablleDeserialized.Id);
Assert.AreEqual("FirstValue", userNullablleDeserialized.FName);
Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs
+1 -1
View File
@@ -213,7 +213,7 @@ namespace Newtonsoft.Json.Tests
]
}" + '\n';
object o = JavaScriptConvert.DeserializeObject(input);
object o = JsonConvert.DeserializeObject(input);
}
[Test]
Src/Newtonsoft.Json.Tests/JsonTextWriterTest.cs
+2 -2
View File
@@ -102,9 +102,9 @@ namespace Newtonsoft.Json.Tests
jsonWriter.WriteValue((decimal?)null);
jsonWriter.WriteValue((decimal?)1.1m);
jsonWriter.WriteValue((DateTime?)null);
jsonWriter.WriteValue((DateTime?)new DateTime(JavaScriptConvert.InitialJavaScriptDateTicks, DateTimeKind.Utc));
jsonWriter.WriteValue((DateTime?)new DateTime(JsonConvert.InitialJavaScriptDateTicks, DateTimeKind.Utc));
jsonWriter.WriteValue((DateTimeOffset?)null);
jsonWriter.WriteValue((DateTimeOffset?)new DateTimeOffset(JavaScriptConvert.InitialJavaScriptDateTicks, TimeSpan.Zero));
jsonWriter.WriteValue((DateTimeOffset?)new DateTimeOffset(JsonConvert.InitialJavaScriptDateTicks, TimeSpan.Zero));
jsonWriter.WriteEndArray();
}
Src/Newtonsoft.Json.Tests/JsonTokenReaderTest.cs
+1 -1
View File
@@ -192,7 +192,7 @@ namespace Newtonsoft.Json.Tests
]
}" + '\n';
object o = JavaScriptConvert.DeserializeObject(input);
object o = JsonConvert.DeserializeObject(input);
}
[Test]
Src/Newtonsoft.Json.Tests/Linq/JObjectTests.cs
+4 -4
View File
@@ -325,22 +325,22 @@ Parameter name: arrayIndex")]
{
string json = @"[new Date(1207285200000)]";
JArray a = (JArray)JavaScriptConvert.DeserializeObject(json, null);
JArray a = (JArray)JsonConvert.DeserializeObject(json, null);
JValue v = (JValue)a[0];
Assert.AreEqual(JavaScriptConvert.ConvertJavaScriptTicksToDateTime(1207285200000), (DateTime)v);
Assert.AreEqual(JsonConvert.ConvertJavaScriptTicksToDateTime(1207285200000), (DateTime)v);
}
[Test]
public void GenericValueCast()
{
string json = @"{""foo"":true}";
JObject o = (JObject)JavaScriptConvert.DeserializeObject(json);
JObject o = (JObject)JsonConvert.DeserializeObject(json);
bool? value = o.Value<bool?>("foo");
Assert.AreEqual(true, value);
json = @"{""foo"":null}";
o = (JObject)JavaScriptConvert.DeserializeObject(json);
o = (JObject)JsonConvert.DeserializeObject(json);
value = o.Value<bool?>("foo");
Assert.AreEqual(null, value);
}
Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Compact.csproj
+1 -1
View File
@@ -62,7 +62,7 @@
<Compile Include="Converters\JavaScriptDateTimeConverterTests.cs" />
<Compile Include="Converters\XmlNodeConverterTest.cs" />
<Compile Include="DateTimeTestClass.cs" />
<Compile Include="JavaScriptConvertTest.cs" />
<Compile Include="JsonConvertTest.cs" />
<Compile Include="JsonRawTests.cs" />
<Compile Include="JsonSerializerTest.cs" />
<Compile Include="JsonTextReaderTest.cs" />
Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Silverlight.csproj
+1 -52
View File
@@ -63,62 +63,11 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Newtonsoft.Json.Tests\Converters\IsoDateTimeConverterTests.cs">
<Link>Converters\IsoDateTimeConverterTests.cs</Link>
</Compile>
<Compile Include="..\Newtonsoft.Json.Tests\Converters\JavaScriptDateTimeConverterTests.cs">
<Link>Converters\JavaScriptDateTimeConverterTests.cs</Link>
</Compile>
<Compile Include="..\Newtonsoft.Json.Tests\Converters\XmlNodeConverterTest.cs">
<Link>Converters\XmlNodeConverterTest.cs</Link>
</Compile>
<Compile Include="..\Newtonsoft.Json.Tests\DateTimeTestClass.cs">
<Link>DateTimeTestClass.cs</Link>
</Compile>
<Compile Include="..\Newtonsoft.Json.Tests\JavaScriptConvertTest.cs">
<Link>JavaScriptConvertTest.cs</Link>
</Compile>
<Compile Include="..\Newtonsoft.Json.Tests\JsonSerializerTest.cs">
<Link>JsonSerializerTest.cs</Link>
</Compile>
<Compile Include="..\Newtonsoft.Json.Tests\JsonTextReaderTest.cs">
<Link>JsonTextReaderTest.cs</Link>
</Compile>
<Compile Include="..\Newtonsoft.Json.Tests\JsonTextWriterTest.cs">
<Link>JsonTextWriterTest.cs</Link>
</Compile>
<Compile Include="..\Newtonsoft.Json.Tests\JsonTokenReaderTest.cs">
<Link>JsonTokenReaderTest.cs</Link>
</Compile>
<Compile Include="..\Newtonsoft.Json.Tests\JsonTokenWriterTest.cs">
<Link>JsonTokenWriterTest.cs</Link>
</Compile>
<Compile Include="..\Newtonsoft.Json.Tests\Linq\JArrayTests.cs">
<Link>Linq\JArrayTests.cs</Link>
</Compile>
<Compile Include="..\Newtonsoft.Json.Tests\Linq\JObjectTests.cs">
<Link>Linq\JObjectTests.cs</Link>
</Compile>
<Compile Include="..\Newtonsoft.Json.Tests\Linq\JTokenEqualityComparerTests.cs">
<Link>Linq\JTokenEqualityComparerTests.cs</Link>
</Compile>
<Compile Include="..\Newtonsoft.Json.Tests\Linq\JTokenTests.cs">
<Link>Linq\JTokenTests.cs</Link>
</Compile>
<Compile Include="..\Newtonsoft.Json.Tests\Linq\JValueTests.cs">
<Link>Linq\JValueTests.cs</Link>
</Compile>
<Compile Include="..\Newtonsoft.Json.Tests\Linq\LinqToJsonTest.cs">
<Link>Linq\LinqToJsonTest.cs</Link>
</Compile>
<Compile Include="..\Newtonsoft.Json.Tests\TestFixtureBase.cs">
<Link>TestFixtureBase.cs</Link>
</Compile>
<Compile Include="Converters\IsoDateTimeConverterTests.cs" />
<Compile Include="Converters\JavaScriptDateTimeConverterTests.cs" />
<Compile Include="Converters\XmlNodeConverterTest.cs" />
<Compile Include="DateTimeTestClass.cs" />
<Compile Include="JavaScriptConvertTest.cs" />
<Compile Include="JsonConvertTest.cs" />
<Compile Include="JsonRawTests.cs" />
<Compile Include="JsonSerializerTest.cs" />
<Compile Include="JsonTextReaderTest.cs" />
Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj
+1 -1
View File
@@ -80,7 +80,7 @@
<Compile Include="NullableDateTimeTestClass.cs" />
<Compile Include="DateTimeTestClass.cs" />
<Compile Include="Converters\IsoDateTimeConverterTests.cs" />
<Compile Include="JavaScriptConvertTest.cs" />
<Compile Include="JsonConvertTest.cs" />
<Compile Include="Converters\JavaScriptDateTimeConverterTests.cs" />
<Compile Include="JsonSerializerTest.cs" />
<Compile Include="JsonTextReaderTest.cs" />
Src/Newtonsoft.Json.Tests/PerformanceTests.cs
+1 -1
View File
@@ -124,7 +124,7 @@ namespace Newtonsoft.Json.Tests
switch (method)
{
case SerializeMethod.JsonNet:
json = JavaScriptConvert.SerializeObject(value);
json = JsonConvert.SerializeObject(value);
break;
case SerializeMethod.JavaScriptSerializer:
json = SerializeWebExtensions(value);
Src/Newtonsoft.Json/Converters/JavaScriptDateTimeConverter.cs
+3 -3
View File
@@ -25,13 +25,13 @@ namespace Newtonsoft.Json.Converters
{
DateTime dateTime = (DateTime)value;
DateTime utcDateTime = dateTime.ToUniversalTime();
ticks = JavaScriptConvert.ConvertDateTimeToJavaScriptTicks(utcDateTime);
ticks = JsonConvert.ConvertDateTimeToJavaScriptTicks(utcDateTime);
}
else
{
DateTimeOffset dateTimeOffset = (DateTimeOffset)value;
DateTimeOffset utcDateTimeOffset = dateTimeOffset.ToUniversalTime();
ticks = JavaScriptConvert.ConvertDateTimeToJavaScriptTicks(utcDateTimeOffset.UtcDateTime);
ticks = JsonConvert.ConvertDateTimeToJavaScriptTicks(utcDateTimeOffset.UtcDateTime);
}
writer.WriteStartConstructor("Date");
@@ -69,7 +69,7 @@ namespace Newtonsoft.Json.Converters
long ticks = (long)reader.Value;
DateTime d = JavaScriptConvert.ConvertJavaScriptTicksToDateTime(ticks);
DateTime d = JsonConvert.ConvertJavaScriptTicksToDateTime(ticks);
reader.Read();
Src/Newtonsoft.Json/JavaScriptConvert.cs → Src/Newtonsoft.Json/JsonConvert.cs
+2 -2
View File
@@ -40,7 +40,7 @@ namespace Newtonsoft.Json
/// <summary>
/// Provides methods for converting between common language runtime types and JavaScript types.
/// </summary>
public static class JavaScriptConvert
public static class JsonConvert
{
/// <summary>
/// Represents JavaScript's boolean value true as a string. This field is read-only.
@@ -80,7 +80,7 @@ namespace Newtonsoft.Json
internal static long InitialJavaScriptDateTicks;
internal static DateTime MinimumJavaScriptDate;
static JavaScriptConvert()
static JsonConvert()
{
True = "true";
False = "false";
Src/Newtonsoft.Json/JsonSerializer.cs
+1 -1
View File
@@ -714,7 +714,7 @@ namespace Newtonsoft.Json
{
converter.WriteJson(writer, value);
}
else if (JavaScriptConvert.IsJsonPrimitive(value))
else if (JsonConvert.IsJsonPrimitive(value))
{
writer.WriteValue(value);
}
Src/Newtonsoft.Json/JsonTextReader.cs
+8 -8
View File
@@ -199,7 +199,7 @@ namespace Newtonsoft.Json
}
long javaScriptTicks = long.Parse(value, NumberStyles.Integer, CultureInfo.InvariantCulture);
DateTime utcDateTime = JavaScriptConvert.ConvertJavaScriptTicksToDateTime(javaScriptTicks);
DateTime utcDateTime = JsonConvert.ConvertJavaScriptTicksToDateTime(javaScriptTicks);
DateTime dateTime;
switch (kind)
@@ -724,7 +724,7 @@ namespace Newtonsoft.Json
// check characters equal 'true'
// and that it is followed by either a seperator character
// or the text ends
if (MatchValue(JavaScriptConvert.True, true))
if (MatchValue(JsonConvert.True, true))
{
SetToken(JsonToken.Boolean, true);
}
@@ -736,7 +736,7 @@ namespace Newtonsoft.Json
private void ParseNull()
{
if (MatchValue(JavaScriptConvert.Null, true))
if (MatchValue(JsonConvert.Null, true))
{
SetToken(JsonToken.Null);
}
@@ -748,7 +748,7 @@ namespace Newtonsoft.Json
private void ParseUndefined()
{
if (MatchValue(JavaScriptConvert.Undefined, true))
if (MatchValue(JsonConvert.Undefined, true))
{
SetToken(JsonToken.Undefined);
}
@@ -760,7 +760,7 @@ namespace Newtonsoft.Json
private void ParseFalse()
{
if (MatchValue(JavaScriptConvert.False, true))
if (MatchValue(JsonConvert.False, true))
{
SetToken(JsonToken.Boolean, false);
}
@@ -772,7 +772,7 @@ namespace Newtonsoft.Json
private void ParseNumberNegativeInfinity()
{
if (MatchValue(JavaScriptConvert.NegativeInfinity, true))
if (MatchValue(JsonConvert.NegativeInfinity, true))
{
SetToken(JsonToken.Float, double.NegativeInfinity);
}
@@ -784,7 +784,7 @@ namespace Newtonsoft.Json
private void ParseNumberPositiveInfinity()
{
if (MatchValue(JavaScriptConvert.PositiveInfinity, true))
if (MatchValue(JsonConvert.PositiveInfinity, true))
{
SetToken(JsonToken.Float, double.PositiveInfinity);
}
@@ -796,7 +796,7 @@ namespace Newtonsoft.Json
private void ParseNumberNaN()
{
if (MatchValue(JavaScriptConvert.NaN, true))
if (MatchValue(JsonConvert.NaN, true))
{
SetToken(JsonToken.Float, double.NaN);
}
Src/Newtonsoft.Json/JsonTextWriter.cs
+18 -18
View File
@@ -246,7 +246,7 @@ namespace Newtonsoft.Json
public override void WriteNull()
{
base.WriteNull();
WriteValueInternal(JavaScriptConvert.Null, JsonToken.Null);
WriteValueInternal(JsonConvert.Null, JsonToken.Null);
}
/// <summary>
@@ -255,7 +255,7 @@ namespace Newtonsoft.Json
public override void WriteUndefined()
{
base.WriteUndefined();
WriteValueInternal(JavaScriptConvert.Undefined, JsonToken.Undefined);
WriteValueInternal(JsonConvert.Undefined, JsonToken.Undefined);
}
/// <summary>
@@ -276,7 +276,7 @@ namespace Newtonsoft.Json
public override void WriteValue(string value)
{
base.WriteValue(value);
WriteValueInternal((value != null) ? JavaScriptConvert.ToString(value, _quoteChar) : JavaScriptConvert.Null, JsonToken.String);
WriteValueInternal((value != null) ? JsonConvert.ToString(value, _quoteChar) : JsonConvert.Null, JsonToken.String);
}
/// <summary>
@@ -286,7 +286,7 @@ namespace Newtonsoft.Json
public override void WriteValue(int value)
{
base.WriteValue(value);
WriteValueInternal(JavaScriptConvert.ToString(value), JsonToken.Integer);
WriteValueInternal(JsonConvert.ToString(value), JsonToken.Integer);
}
/// <summary>
@@ -296,7 +296,7 @@ namespace Newtonsoft.Json
public override void WriteValue(uint value)
{
base.WriteValue(value);
WriteValueInternal(JavaScriptConvert.ToString(value), JsonToken.Integer);
WriteValueInternal(JsonConvert.ToString(value), JsonToken.Integer);
}
/// <summary>
@@ -306,7 +306,7 @@ namespace Newtonsoft.Json
public override void WriteValue(long value)
{
base.WriteValue(value);
WriteValueInternal(JavaScriptConvert.ToString(value), JsonToken.Integer);
WriteValueInternal(JsonConvert.ToString(value), JsonToken.Integer);
}
/// <summary>
@@ -316,7 +316,7 @@ namespace Newtonsoft.Json
public override void WriteValue(ulong value)
{
base.WriteValue(value);
WriteValueInternal(JavaScriptConvert.ToString(value), JsonToken.Integer);
WriteValueInternal(JsonConvert.ToString(value), JsonToken.Integer);
}
/// <summary>
@@ -326,7 +326,7 @@ namespace Newtonsoft.Json
public override void WriteValue(float value)
{
base.WriteValue(value);
WriteValueInternal(JavaScriptConvert.ToString(value), JsonToken.Float);
WriteValueInternal(JsonConvert.ToString(value), JsonToken.Float);
}
/// <summary>
@@ -336,7 +336,7 @@ namespace Newtonsoft.Json
public override void WriteValue(double value)
{
base.WriteValue(value);
WriteValueInternal(JavaScriptConvert.ToString(value), JsonToken.Float);
WriteValueInternal(JsonConvert.ToString(value), JsonToken.Float);
}
/// <summary>
@@ -346,7 +346,7 @@ namespace Newtonsoft.Json
public override void WriteValue(bool value)
{
base.WriteValue(value);
WriteValueInternal(JavaScriptConvert.ToString(value), JsonToken.Boolean);
WriteValueInternal(JsonConvert.ToString(value), JsonToken.Boolean);
}
/// <summary>
@@ -356,7 +356,7 @@ namespace Newtonsoft.Json
public override void WriteValue(short value)
{
base.WriteValue(value);
WriteValueInternal(JavaScriptConvert.ToString(value), JsonToken.Integer);
WriteValueInternal(JsonConvert.ToString(value), JsonToken.Integer);
}
/// <summary>
@@ -366,7 +366,7 @@ namespace Newtonsoft.Json
public override void WriteValue(ushort value)
{
base.WriteValue(value);
WriteValueInternal(JavaScriptConvert.ToString(value), JsonToken.Integer);
WriteValueInternal(JsonConvert.ToString(value), JsonToken.Integer);
}
/// <summary>
@@ -376,7 +376,7 @@ namespace Newtonsoft.Json
public override void WriteValue(char value)
{
base.WriteValue(value);
WriteValueInternal(JavaScriptConvert.ToString(value), JsonToken.Integer);
WriteValueInternal(JsonConvert.ToString(value), JsonToken.Integer);
}
/// <summary>
@@ -386,7 +386,7 @@ namespace Newtonsoft.Json
public override void WriteValue(byte value)
{
base.WriteValue(value);
WriteValueInternal(JavaScriptConvert.ToString(value), JsonToken.Integer);
WriteValueInternal(JsonConvert.ToString(value), JsonToken.Integer);
}
/// <summary>
@@ -396,7 +396,7 @@ namespace Newtonsoft.Json
public override void WriteValue(sbyte value)
{
base.WriteValue(value);
WriteValueInternal(JavaScriptConvert.ToString(value), JsonToken.Integer);
WriteValueInternal(JsonConvert.ToString(value), JsonToken.Integer);
}
/// <summary>
@@ -406,7 +406,7 @@ namespace Newtonsoft.Json
public override void WriteValue(decimal value)
{
base.WriteValue(value);
WriteValueInternal(JavaScriptConvert.ToString(value), JsonToken.Float);
WriteValueInternal(JsonConvert.ToString(value), JsonToken.Float);
}
/// <summary>
@@ -416,7 +416,7 @@ namespace Newtonsoft.Json
public override void WriteValue(DateTime value)
{
base.WriteValue(value);
WriteValueInternal(JavaScriptConvert.ToString(value), JsonToken.Date);
WriteValueInternal(JsonConvert.ToString(value), JsonToken.Date);
}
/// <summary>
@@ -426,7 +426,7 @@ namespace Newtonsoft.Json
public override void WriteValue(DateTimeOffset value)
{
base.WriteValue(value);
WriteValueInternal(JavaScriptConvert.ToString(value), JsonToken.Date);
WriteValueInternal(JsonConvert.ToString(value), JsonToken.Date);
}
#endregion
Src/Newtonsoft.Json/JsonWriter.cs
+1 -1
View File
@@ -397,7 +397,7 @@ namespace Newtonsoft.Json
throw new Exception("Unexpected token while reading date constructor. Expected Integer, got " + reader.TokenType);
long ticks = (long)reader.Value;
DateTime date = JavaScriptConvert.ConvertJavaScriptTicksToDateTime(ticks);
DateTime date = JsonConvert.ConvertJavaScriptTicksToDateTime(ticks);
if (!reader.Read())
throw new Exception("Unexpected end while reading date constructor.");
Src/Newtonsoft.Json/Newtonsoft.Json.Compact.csproj
+1 -1
View File
@@ -62,7 +62,7 @@
<Compile Include="Converters\XmlNodeConverter.cs" />
<Compile Include="DateTimeOffset.cs" />
<Compile Include="DefaultValueHandling.cs" />
<Compile Include="JavaScriptConvert.cs" />
<Compile Include="JsonConvert.cs" />
<Compile Include="JsonConverter.cs" />
<Compile Include="JsonConverterAttribute.cs" />
<Compile Include="JsonConverterCollection.cs" />
Src/Newtonsoft.Json/Newtonsoft.Json.Silverlight.csproj
+1 -1
View File
@@ -54,7 +54,7 @@
<Compile Include="Converters\XmlNodeConverter.cs" />
<Compile Include="Converters\HtmlColorConverter.cs" />
<Compile Include="DefaultValueHandling.cs" />
<Compile Include="JavaScriptConvert.cs" />
<Compile Include="JsonConvert.cs" />
<Compile Include="JsonConverter.cs" />
<Compile Include="JsonConverterAttribute.cs" />
<Compile Include="JsonConverterCollection.cs" />
Src/Newtonsoft.Json/Newtonsoft.Json.csproj
+1 -1
View File
@@ -97,7 +97,7 @@
<Compile Include="JsonConverter.cs" />
<Compile Include="JsonConverterCollection.cs" />
<Compile Include="JsonReader.cs" />
<Compile Include="JavaScriptConvert.cs" />
<Compile Include="JsonConvert.cs" />
<Compile Include="JsonSerializationException.cs" />
<Compile Include="JsonSerializer.cs" />
<Compile Include="Linq\Extensions.cs" />