-Fix ReadAsBytes for empty strings

-Fix (hopefully) signing merged assemblies
This commit is contained in:
JamesNK
2010-04-20 07:51:33 +00:00
parent 2f11d3f970
commit 7085a4915f
5 changed files with 60 additions and 5 deletions
@@ -261,8 +261,6 @@ namespace Newtonsoft.Json.Tests.Linq
TextReader textReader = new StringReader(json);
JsonReader jsonReader = new JsonTextReader(textReader);
//var result = (HasBytes)JsonSerializer.Create(null)
// .Deserialize(jsonReader, typeof(HasBytes));
var jToken = JToken.ReadFrom(jsonReader);
@@ -273,5 +271,24 @@ namespace Newtonsoft.Json.Tests.Linq
Assert.AreEqual(new byte[] { 1, 2, 3, 4 }, result2.Bytes);
}
[Test]
public void ReadBytesFromEmptyString()
{
var bytes = new HasBytes { Bytes = new byte[0] };
var json = JsonConvert.SerializeObject(bytes);
TextReader textReader = new StringReader(json);
JsonReader jsonReader = new JsonTextReader(textReader);
var jToken = JToken.ReadFrom(jsonReader);
jsonReader = new JTokenReader(jToken);
var result2 = (HasBytes)JsonSerializer.Create(null)
.Deserialize(jsonReader, typeof(HasBytes));
Assert.AreEqual(new byte[0], result2.Bytes);
}
}
}