-Fix ReadAsBytes for empty strings
-Fix (hopefully) signing merged assemblies
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3436,5 +3436,32 @@ keyword such as type of business.""
|
||||
Assert.IsTrue(d.Contains("III"));
|
||||
}
|
||||
#endif
|
||||
|
||||
private class MyClass
|
||||
{
|
||||
public byte[] Prop1 { get; set; }
|
||||
|
||||
public MyClass()
|
||||
{
|
||||
Prop1 = new byte[0];
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DeserializeByteArray()
|
||||
{
|
||||
JsonSerializer serializer1 = new JsonSerializer();
|
||||
serializer1.Converters.Add(new IsoDateTimeConverter());
|
||||
serializer1.NullValueHandling = NullValueHandling.Ignore;
|
||||
|
||||
string json = @"[{""Prop1"":""""},{""Prop1"":""""}]";
|
||||
|
||||
JsonTextReader reader = new JsonTextReader(new StringReader(json));
|
||||
|
||||
MyClass[] z = (MyClass[])serializer1.Deserialize(reader, typeof(MyClass[]));
|
||||
Assert.AreEqual(2, z.Length);
|
||||
Assert.AreEqual(0, z[0].Prop1.Length);
|
||||
Assert.AreEqual(0, z[1].Prop1.Length);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user