-Added support for reading GUID strings as bytes in JsonTextReader
-Changed reading GUIDs as bytes to only support 00000000-0000-0000-0000-000000000000 format
This commit is contained in:
@@ -92,6 +92,21 @@ namespace Newtonsoft.Json.Tests
|
||||
Assert.AreEqual(JsonToken.EndObject, jsonTextReader.TokenType);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ReadAsBytes_Base64AndGuid()
|
||||
{
|
||||
JsonTextReader jsonTextReader = new JsonTextReader(new StringReader("'AAAAAAAAAAAAAAAAAAAAAAAAAAABAAAA'"));
|
||||
byte[] data = jsonTextReader.ReadAsBytes();
|
||||
byte[] expected = Convert.FromBase64String("AAAAAAAAAAAAAAAAAAAAAAAAAAABAAAA");
|
||||
|
||||
CollectionAssert.AreEqual(expected, data);
|
||||
|
||||
jsonTextReader = new JsonTextReader(new StringReader("'AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAABAAAA'"));
|
||||
data = jsonTextReader.ReadAsBytes();
|
||||
expected = Guid.Parse("AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAABAAAA").ToByteArray();
|
||||
|
||||
CollectionAssert.AreEqual(expected, data);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ReadSingleQuoteInsideDoubleQuoteString()
|
||||
|
||||
@@ -54,6 +54,22 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
[TestFixture]
|
||||
public class LinqToJsonTest : TestFixtureBase
|
||||
{
|
||||
[Test]
|
||||
public void ToObject_Base64AndGuid()
|
||||
{
|
||||
JObject o = JObject.Parse("{'responseArray':'AAAAAAAAAAAAAAAAAAAAAAAAAAABAAAA'}");
|
||||
byte[] data = o["responseArray"].ToObject<byte[]>();
|
||||
byte[] expected = Convert.FromBase64String("AAAAAAAAAAAAAAAAAAAAAAAAAAABAAAA");
|
||||
|
||||
CollectionAssert.AreEqual(expected, data);
|
||||
|
||||
o = JObject.Parse("{'responseArray':'AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAABAAAA'}");
|
||||
data = o["responseArray"].ToObject<byte[]>();
|
||||
expected = Guid.Parse("AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAABAAAA").ToByteArray();
|
||||
|
||||
CollectionAssert.AreEqual(expected, data);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void IncompleteContainers()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user