-Renamed Identifier to JsonRaw
-Added support for reading, writing and serializing raw JSON
This commit is contained in:
@@ -0,0 +1,41 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using NUnit.Framework;
|
||||
|
||||
namespace Newtonsoft.Json.Tests
|
||||
{
|
||||
public class JsonRawTests : TestFixtureBase
|
||||
{
|
||||
[Test]
|
||||
public void Create()
|
||||
{
|
||||
JsonRaw raw = new JsonRaw("Test");
|
||||
Assert.AreEqual("Test", raw.Content);
|
||||
Assert.AreEqual("Test", raw.ToString());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void EqualsShouldEqualOnSameContent()
|
||||
{
|
||||
JsonRaw r1 = new JsonRaw("Test");
|
||||
JsonRaw r2 = new JsonRaw("Test");
|
||||
|
||||
Assert.AreEqual(r1, r2);
|
||||
Assert.AreNotEqual(r1, null);
|
||||
Assert.IsFalse(r1.Equals(null));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void GetHashCodeShouldEqualOnSameContent()
|
||||
{
|
||||
JsonRaw r1 = new JsonRaw("Test");
|
||||
JsonRaw r2 = new JsonRaw("Test");
|
||||
JsonRaw r3 = new JsonRaw("Test1");
|
||||
|
||||
Assert.AreEqual(r1.GetHashCode(), r2.GetHashCode());
|
||||
Assert.AreNotEqual(r1.GetHashCode(), r3.GetHashCode());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1335,5 +1335,68 @@ keyword such as type of business.""
|
||||
json = JavaScriptConvert.SerializeObject((int?)1);
|
||||
Assert.AreEqual("1", json);
|
||||
}
|
||||
|
||||
public class PersonRaw
|
||||
{
|
||||
private Guid _internalId;
|
||||
private string _firstName;
|
||||
private string _lastName;
|
||||
private JsonRaw _rawContent;
|
||||
|
||||
[JsonIgnore]
|
||||
public Guid InternalId
|
||||
{
|
||||
get { return _internalId; }
|
||||
set { _internalId = value; }
|
||||
}
|
||||
|
||||
[JsonProperty("first_name")]
|
||||
public string FirstName
|
||||
{
|
||||
get { return _firstName; }
|
||||
set { _firstName = value; }
|
||||
}
|
||||
|
||||
public JsonRaw RawContent
|
||||
{
|
||||
get { return _rawContent; }
|
||||
set { _rawContent = value; }
|
||||
}
|
||||
|
||||
[JsonProperty("last_name")]
|
||||
public string LastName
|
||||
{
|
||||
get { return _lastName; }
|
||||
set { _lastName = value; }
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void SerializeJsonRaw()
|
||||
{
|
||||
PersonRaw personRaw = new PersonRaw
|
||||
{
|
||||
FirstName = "FirstNameValue",
|
||||
RawContent = new JsonRaw("[1,2,3,4,5]"),
|
||||
LastName = "LastNameValue"
|
||||
};
|
||||
|
||||
string json;
|
||||
|
||||
json = JavaScriptConvert.SerializeObject(personRaw);
|
||||
Assert.AreEqual(@"{""first_name"":""FirstNameValue"",""RawContent"":[1,2,3,4,5],""last_name"":""LastNameValue""}", json);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DeserializeJsonRaw()
|
||||
{
|
||||
string json = @"{""first_name"":""FirstNameValue"",""RawContent"":[1,2,3,4,5],""last_name"":""LastNameValue""}";
|
||||
|
||||
PersonRaw personRaw = JavaScriptConvert.DeserializeObject<PersonRaw>(json);
|
||||
|
||||
Assert.AreEqual("FirstNameValue", personRaw.FirstName);
|
||||
Assert.AreEqual("[1,2,3,4,5]", personRaw.RawContent.Content);
|
||||
Assert.AreEqual("LastNameValue", personRaw.LastName);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -280,6 +280,8 @@ namespace Newtonsoft.Json.Tests
|
||||
jsonWriter.WriteValue(float.PositiveInfinity);
|
||||
jsonWriter.WriteValue(float.NegativeInfinity);
|
||||
jsonWriter.WriteEndArray();
|
||||
|
||||
jsonWriter.Flush();
|
||||
}
|
||||
|
||||
string expected = @"[
|
||||
@@ -294,5 +296,92 @@ namespace Newtonsoft.Json.Tests
|
||||
|
||||
Assert.AreEqual(expected, result);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void WriteRawInStart()
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
StringWriter sw = new StringWriter(sb);
|
||||
|
||||
using (JsonWriter jsonWriter = new JsonTextWriter(sw))
|
||||
{
|
||||
jsonWriter.Formatting = Formatting.Indented;
|
||||
|
||||
jsonWriter.WriteRaw("[1,2,3,4,5]");
|
||||
jsonWriter.WriteWhitespace(" ");
|
||||
jsonWriter.WriteStartArray();
|
||||
jsonWriter.WriteValue(double.NaN);
|
||||
jsonWriter.WriteEndArray();
|
||||
}
|
||||
|
||||
string expected = @"[1,2,3,4,5] [
|
||||
NaN
|
||||
]";
|
||||
string result = sb.ToString();
|
||||
|
||||
Assert.AreEqual(expected, result);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void WriteRawInArray()
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
StringWriter sw = new StringWriter(sb);
|
||||
|
||||
using (JsonWriter jsonWriter = new JsonTextWriter(sw))
|
||||
{
|
||||
jsonWriter.Formatting = Formatting.Indented;
|
||||
|
||||
jsonWriter.WriteStartArray();
|
||||
jsonWriter.WriteValue(double.NaN);
|
||||
jsonWriter.WriteRaw(",[1,2,3,4,5]");
|
||||
jsonWriter.WriteRaw(",[1,2,3,4,5]");
|
||||
jsonWriter.WriteValue(float.NaN);
|
||||
jsonWriter.WriteEndArray();
|
||||
}
|
||||
|
||||
string expected = @"[
|
||||
NaN,[1,2,3,4,5],[1,2,3,4,5],
|
||||
NaN
|
||||
]";
|
||||
string result = sb.ToString();
|
||||
|
||||
Assert.AreEqual(expected, result);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void WriteRawInObject()
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
StringWriter sw = new StringWriter(sb);
|
||||
|
||||
using (JsonWriter jsonWriter = new JsonTextWriter(sw))
|
||||
{
|
||||
jsonWriter.Formatting = Formatting.Indented;
|
||||
|
||||
jsonWriter.WriteStartObject();
|
||||
jsonWriter.WriteRaw(@"""PropertyName"":[1,2,3,4,5]");
|
||||
jsonWriter.WriteEnd();
|
||||
}
|
||||
|
||||
string expected = @"{""PropertyName"":[1,2,3,4,5]}";
|
||||
string result = sb.ToString();
|
||||
|
||||
Assert.AreEqual(expected, result);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void WriteToken()
|
||||
{
|
||||
JsonTextReader reader = new JsonTextReader(new StringReader("[1,2,3,4,5]"));
|
||||
reader.Read();
|
||||
reader.Read();
|
||||
|
||||
StringWriter sw = new StringWriter();
|
||||
JsonTextWriter writer = new JsonTextWriter(sw);
|
||||
writer.WriteToken(reader);
|
||||
|
||||
Assert.AreEqual("1", sw.ToString());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -229,5 +229,85 @@ Parameter name: arrayIndex")]
|
||||
|
||||
((ICollection<KeyValuePair<string, JToken>>)o).CopyTo(new KeyValuePair<string, JToken>[3], 1);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void FromObjectRaw()
|
||||
{
|
||||
JsonSerializerTest.PersonRaw raw = new JsonSerializerTest.PersonRaw
|
||||
{
|
||||
FirstName = "FirstNameValue",
|
||||
RawContent = new JsonRaw("[1,2,3,4,5]"),
|
||||
LastName = "LastNameValue"
|
||||
};
|
||||
|
||||
JObject o = JObject.FromObject(raw);
|
||||
|
||||
Assert.AreEqual("FirstNameValue", (string)o["first_name"]);
|
||||
Assert.AreEqual(JsonTokenType.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()
|
||||
{
|
||||
JsonSerializerTest.PersonRaw raw = new JsonSerializerTest.PersonRaw
|
||||
{
|
||||
FirstName = "FirstNameValue",
|
||||
RawContent = new JsonRaw("[1,2,3,4,5]"),
|
||||
LastName = "LastNameValue"
|
||||
};
|
||||
|
||||
JObject o = JObject.FromObject(raw);
|
||||
|
||||
JsonReader reader = new JsonTokenReader(o);
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.AreEqual(JsonToken.StartObject, reader.TokenType);
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.AreEqual(JsonToken.String, reader.TokenType);
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.AreEqual(JsonToken.Raw, reader.TokenType);
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.AreEqual(JsonToken.PropertyName, reader.TokenType);
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.AreEqual(JsonToken.String, reader.TokenType);
|
||||
|
||||
Assert.IsTrue(reader.Read());
|
||||
Assert.AreEqual(JsonToken.EndObject, reader.TokenType);
|
||||
|
||||
Assert.IsFalse(reader.Read());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DeserializeFromRaw()
|
||||
{
|
||||
JsonSerializerTest.PersonRaw raw = new JsonSerializerTest.PersonRaw
|
||||
{
|
||||
FirstName = "FirstNameValue",
|
||||
RawContent = new JsonRaw("[1,2,3,4,5]"),
|
||||
LastName = "LastNameValue"
|
||||
};
|
||||
|
||||
JObject o = JObject.FromObject(raw);
|
||||
|
||||
JsonReader reader = new JsonTokenReader(o);
|
||||
JsonSerializer serializer = new JsonSerializer();
|
||||
raw = (JsonSerializerTest.PersonRaw)serializer.Deserialize(reader, typeof(JsonSerializerTest.PersonRaw));
|
||||
|
||||
Assert.AreEqual("FirstNameValue", raw.FirstName);
|
||||
Assert.AreEqual("LastNameValue", raw.LastName);
|
||||
Assert.AreEqual("[1,2,3,4,5]", raw.RawContent.Content);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -63,6 +63,7 @@
|
||||
<Compile Include="Converters\XmlNodeConverterTest.cs" />
|
||||
<Compile Include="DateTimeTestClass.cs" />
|
||||
<Compile Include="JavaScriptConvertTest.cs" />
|
||||
<Compile Include="JsonRawTests.cs" />
|
||||
<Compile Include="JsonSerializerTest.cs" />
|
||||
<Compile Include="JsonTextReaderTest.cs" />
|
||||
<Compile Include="JsonTextWriterTest.cs" />
|
||||
|
||||
@@ -119,6 +119,7 @@
|
||||
<Compile Include="Converters\XmlNodeConverterTest.cs" />
|
||||
<Compile Include="DateTimeTestClass.cs" />
|
||||
<Compile Include="JavaScriptConvertTest.cs" />
|
||||
<Compile Include="JsonRawTests.cs" />
|
||||
<Compile Include="JsonSerializerTest.cs" />
|
||||
<Compile Include="JsonTextReaderTest.cs" />
|
||||
<Compile Include="JsonTextWriterTest.cs" />
|
||||
|
||||
@@ -73,6 +73,7 @@
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="JsonRawTests.cs" />
|
||||
<Compile Include="NullableDateTimeTestClass.cs" />
|
||||
<Compile Include="DateTimeTestClass.cs" />
|
||||
<Compile Include="Converters\IsoDateTimeConverterTests.cs" />
|
||||
|
||||
Reference in New Issue
Block a user