-Rename JsonTokenReader, JsonTokenWriter, JsonTokenType to JTokenReader, JTokenWriter, JTokenType
This commit is contained in:
+4
-4
@@ -33,7 +33,7 @@ using Newtonsoft.Json.Linq;
|
||||
|
||||
namespace Newtonsoft.Json.Tests
|
||||
{
|
||||
public class JsonTokenReaderTest : TestFixtureBase
|
||||
public class JTokenReaderTest : TestFixtureBase
|
||||
{
|
||||
[Test]
|
||||
public void YahooFinance()
|
||||
@@ -46,7 +46,7 @@ namespace Newtonsoft.Json.Tests
|
||||
new JProperty("Test4", null)
|
||||
);
|
||||
|
||||
using (JsonTokenReader jsonReader = new JsonTokenReader(o))
|
||||
using (JTokenReader jsonReader = new JTokenReader(o))
|
||||
{
|
||||
IJsonLineInfo lineInfo = jsonReader;
|
||||
|
||||
@@ -96,7 +96,7 @@ namespace Newtonsoft.Json.Tests
|
||||
Assert.IsFalse(jsonReader.Read());
|
||||
}
|
||||
|
||||
using (JsonReader jsonReader = new JsonTokenReader(o.Property("Test2")))
|
||||
using (JsonReader jsonReader = new JTokenReader(o.Property("Test2")))
|
||||
{
|
||||
Assert.IsTrue(jsonReader.Read());
|
||||
Assert.AreEqual(JsonToken.PropertyName, jsonReader.TokenType);
|
||||
@@ -125,7 +125,7 @@ namespace Newtonsoft.Json.Tests
|
||||
|
||||
JObject o = JObject.Parse(input);
|
||||
|
||||
using (JsonTokenReader jsonReader = new JsonTokenReader(o))
|
||||
using (JTokenReader jsonReader = new JTokenReader(o))
|
||||
{
|
||||
IJsonLineInfo lineInfo = jsonReader;
|
||||
|
||||
+3
-3
@@ -34,13 +34,13 @@ using System.Linq;
|
||||
|
||||
namespace Newtonsoft.Json.Tests
|
||||
{
|
||||
public class JsonTokenWriterTest : TestFixtureBase
|
||||
public class JTokenWriterTest : TestFixtureBase
|
||||
{
|
||||
[Test]
|
||||
public void ValueFormatting()
|
||||
{
|
||||
JToken root;
|
||||
using (JsonTokenWriter jsonWriter = new JsonTokenWriter())
|
||||
using (JTokenWriter jsonWriter = new JTokenWriter())
|
||||
{
|
||||
jsonWriter.WriteStartArray();
|
||||
jsonWriter.WriteValue('@');
|
||||
@@ -78,7 +78,7 @@ namespace Newtonsoft.Json.Tests
|
||||
[Test]
|
||||
public void State()
|
||||
{
|
||||
using (JsonWriter jsonWriter = new JsonTokenWriter())
|
||||
using (JsonWriter jsonWriter = new JTokenWriter())
|
||||
{
|
||||
Assert.AreEqual(WriteState.Start, jsonWriter.WriteState);
|
||||
|
||||
@@ -246,13 +246,13 @@ Parameter name: arrayIndex")]
|
||||
JObject o = JObject.FromObject(raw);
|
||||
|
||||
Assert.AreEqual("FirstNameValue", (string)o["first_name"]);
|
||||
Assert.AreEqual(JsonTokenType.Raw, ((JValue)o["RawContent"]).Type);
|
||||
Assert.AreEqual(JTokenType.Raw, ((JValue)o["RawContent"]).Type);
|
||||
Assert.AreEqual("[1,2,3,4,5]", (string)o["RawContent"]);
|
||||
Assert.AreEqual("LastNameValue", (string)o["last_name"]);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void JsonTokenReader()
|
||||
public void JTokenReader()
|
||||
{
|
||||
PersonRaw raw = new PersonRaw
|
||||
{
|
||||
@@ -263,7 +263,7 @@ Parameter name: arrayIndex")]
|
||||
|
||||
JObject o = JObject.FromObject(raw);
|
||||
|
||||
JsonReader reader = new JsonTokenReader(o);
|
||||
JsonReader reader = new JTokenReader(o);
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.AreEqual(JsonToken.StartObject, reader.TokenType);
|
||||
@@ -304,7 +304,7 @@ Parameter name: arrayIndex")]
|
||||
|
||||
JObject o = JObject.FromObject(raw);
|
||||
|
||||
JsonReader reader = new JsonTokenReader(o);
|
||||
JsonReader reader = new JTokenReader(o);
|
||||
JsonSerializer serializer = new JsonSerializer();
|
||||
raw = (PersonRaw)serializer.Deserialize(reader, typeof(PersonRaw));
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
|
||||
property = JProperty.Load(reader);
|
||||
Assert.AreEqual("propertyname", property.Name);
|
||||
Assert.IsTrue(JToken.DeepEquals(new JValue(null, JsonTokenType.Null), property.Value));
|
||||
Assert.IsTrue(JToken.DeepEquals(new JValue(null, JTokenType.Null), property.Value));
|
||||
|
||||
Assert.AreEqual(JsonToken.EndObject, reader.TokenType);
|
||||
}
|
||||
|
||||
@@ -39,23 +39,23 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
{
|
||||
JValue v = new JValue(true);
|
||||
Assert.AreEqual(true, v.Value);
|
||||
Assert.AreEqual(JsonTokenType.Boolean, v.Type);
|
||||
Assert.AreEqual(JTokenType.Boolean, v.Type);
|
||||
|
||||
v.Value = "Pie";
|
||||
Assert.AreEqual("Pie", v.Value);
|
||||
Assert.AreEqual(JsonTokenType.String, v.Type);
|
||||
Assert.AreEqual(JTokenType.String, v.Type);
|
||||
|
||||
v.Value = null;
|
||||
Assert.AreEqual(null, v.Value);
|
||||
Assert.AreEqual(JsonTokenType.Null, v.Type);
|
||||
Assert.AreEqual(JTokenType.Null, v.Type);
|
||||
|
||||
v.Value = (int?)null;
|
||||
Assert.AreEqual(null, v.Value);
|
||||
Assert.AreEqual(JsonTokenType.Null, v.Type);
|
||||
Assert.AreEqual(JTokenType.Null, v.Type);
|
||||
|
||||
v.Value = "Pie";
|
||||
Assert.AreEqual("Pie", v.Value);
|
||||
Assert.AreEqual(JsonTokenType.String, v.Type);
|
||||
Assert.AreEqual(JTokenType.String, v.Type);
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -63,11 +63,11 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
{
|
||||
JValue commentValue = JValue.CreateComment(null);
|
||||
Assert.AreEqual(null, commentValue.Value);
|
||||
Assert.AreEqual(JsonTokenType.Comment, commentValue.Type);
|
||||
Assert.AreEqual(JTokenType.Comment, commentValue.Type);
|
||||
|
||||
commentValue.Value = "Comment";
|
||||
Assert.AreEqual("Comment", commentValue.Value);
|
||||
Assert.AreEqual(JsonTokenType.Comment, commentValue.Type);
|
||||
Assert.AreEqual(JTokenType.Comment, commentValue.Type);
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -75,7 +75,7 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
{
|
||||
JValue stringValue = JValue.CreateString(null);
|
||||
Assert.AreEqual(null, stringValue.Value);
|
||||
Assert.AreEqual(JsonTokenType.String, stringValue.Type);
|
||||
Assert.AreEqual(JTokenType.String, stringValue.Type);
|
||||
}
|
||||
|
||||
[Test]
|
||||
|
||||
@@ -76,7 +76,7 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
);
|
||||
|
||||
JsonSerializer serializer = new JsonSerializer();
|
||||
Person p = (Person)serializer.Deserialize(new JsonTokenReader(o), typeof(Person));
|
||||
Person p = (Person)serializer.Deserialize(new JTokenReader(o), typeof(Person));
|
||||
|
||||
// John Smith
|
||||
Console.WriteLine(p.Name);
|
||||
@@ -589,8 +589,8 @@ keyword such as type of business.""
|
||||
|
||||
JsonSerializer jsonSerializer = new JsonSerializer();
|
||||
|
||||
JsonTokenWriter jsonWriter;
|
||||
using (jsonWriter = new JsonTokenWriter())
|
||||
JTokenWriter jsonWriter;
|
||||
using (jsonWriter = new JTokenWriter())
|
||||
{
|
||||
jsonSerializer.Serialize(jsonWriter, testDates);
|
||||
}
|
||||
|
||||
@@ -60,6 +60,8 @@
|
||||
<ItemGroup>
|
||||
<Compile Include="Converters\BinaryConverterTests.cs" />
|
||||
<Compile Include="Converters\StringEnumConverterTests.cs" />
|
||||
<Compile Include="JTokenReaderTest.cs" />
|
||||
<Compile Include="JTokenWriterTest.cs" />
|
||||
<Compile Include="Serialization\CamelCaseMappingResolverTests.cs" />
|
||||
<Compile Include="JsonValidatingReaderTests.cs" />
|
||||
<Compile Include="Schema\ExtensionsTests.cs" />
|
||||
@@ -120,8 +122,6 @@
|
||||
<Compile Include="JsonSerializerTest.cs" />
|
||||
<Compile Include="JsonTextReaderTest.cs" />
|
||||
<Compile Include="JsonTextWriterTest.cs" />
|
||||
<Compile Include="JsonTokenReaderTest.cs" />
|
||||
<Compile Include="JsonTokenWriterTest.cs" />
|
||||
<Compile Include="Linq\JArrayTests.cs" />
|
||||
<Compile Include="Linq\JObjectTests.cs" />
|
||||
<Compile Include="Linq\JTokenEqualityComparerTests.cs" />
|
||||
|
||||
@@ -65,6 +65,8 @@
|
||||
<ItemGroup>
|
||||
<Compile Include="Converters\BinaryConverterTests.cs" />
|
||||
<Compile Include="Converters\StringEnumConverterTests.cs" />
|
||||
<Compile Include="JTokenReaderTest.cs" />
|
||||
<Compile Include="JTokenWriterTest.cs" />
|
||||
<Compile Include="Serialization\CamelCaseMappingResolverTests.cs" />
|
||||
<Compile Include="JsonValidatingReaderTests.cs" />
|
||||
<Compile Include="Schema\ExtensionsTests.cs" />
|
||||
@@ -125,8 +127,6 @@
|
||||
<Compile Include="JsonSerializerTest.cs" />
|
||||
<Compile Include="JsonTextReaderTest.cs" />
|
||||
<Compile Include="JsonTextWriterTest.cs" />
|
||||
<Compile Include="JsonTokenReaderTest.cs" />
|
||||
<Compile Include="JsonTokenWriterTest.cs" />
|
||||
<Compile Include="Linq\JArrayTests.cs" />
|
||||
<Compile Include="Linq\JObjectTests.cs" />
|
||||
<Compile Include="Linq\JTokenEqualityComparerTests.cs" />
|
||||
|
||||
@@ -142,8 +142,8 @@
|
||||
<Compile Include="JsonSerializerTest.cs" />
|
||||
<Compile Include="JsonTextReaderTest.cs" />
|
||||
<Compile Include="JsonTextWriterTest.cs" />
|
||||
<Compile Include="JsonTokenReaderTest.cs" />
|
||||
<Compile Include="JsonTokenWriterTest.cs" />
|
||||
<Compile Include="JTokenReaderTest.cs" />
|
||||
<Compile Include="JTokenWriterTest.cs" />
|
||||
<Compile Include="Linq\JArrayTests.cs" />
|
||||
<Compile Include="Linq\JObjectTests.cs" />
|
||||
<Compile Include="Linq\JTokenEqualityComparerTests.cs" />
|
||||
|
||||
@@ -378,7 +378,7 @@ namespace Newtonsoft.Json.Tests.Schema
|
||||
|
||||
DirectoryInfo temp = new DirectoryInfo(@"c:\temp");
|
||||
|
||||
JsonTokenWriter jsonWriter = new JsonTokenWriter();
|
||||
JTokenWriter jsonWriter = new JTokenWriter();
|
||||
JsonSerializer serializer = new JsonSerializer();
|
||||
serializer.Converters.Add(new IsoDateTimeConverter());
|
||||
serializer.MappingResolver = new CustomDirectoryInfoMapper();
|
||||
|
||||
@@ -68,7 +68,7 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void JsonTokenWriter()
|
||||
public void JTokenWriter()
|
||||
{
|
||||
JsonIgnoreAttributeOnClassTestClass ignoreAttributeOnClassTestClass = new JsonIgnoreAttributeOnClassTestClass();
|
||||
ignoreAttributeOnClassTestClass.Field = int.MinValue;
|
||||
@@ -76,7 +76,7 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
JsonSerializer serializer = new JsonSerializer();
|
||||
serializer.MappingResolver = new CamelCaseMappingResolver();
|
||||
|
||||
JsonTokenWriter writer = new JsonTokenWriter();
|
||||
JTokenWriter writer = new JTokenWriter();
|
||||
|
||||
serializer.Serialize(writer, ignoreAttributeOnClassTestClass);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user