-Fixed HTTP requests when resolving DTD urls in XmlNodeConverter

-Added support for reading BSON UUID bytes as Guid
This commit is contained in:
James Newton-King
2014-06-14 18:46:35 +12:00
parent 8c73a55c68
commit 0238b51162
7 changed files with 54 additions and 9 deletions
@@ -150,8 +150,8 @@ namespace Newtonsoft.Json.Tests.Bson
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.Bytes, reader.TokenType);
CollectionAssert.AreEqual(g.ToByteArray(), (byte[])reader.Value);
Assert.AreEqual(typeof(byte[]), reader.ValueType);
Assert.AreEqual(g, reader.Value);
Assert.AreEqual(typeof(Guid), reader.ValueType);
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.EndArray, reader.TokenType);
@@ -1603,5 +1603,33 @@ namespace Newtonsoft.Json.Tests.Bson
#endif
Assert.IsTrue(binder.BindToTypeCalled);
}
[Test]
public void GuidsShouldBeProperlyDeserialised()
{
Guid g = new Guid("822C0CE6-CC42-4753-A3C3-26F0684A4B88");
MemoryStream ms = new MemoryStream();
BsonWriter writer = new BsonWriter(ms);
writer.WriteStartObject();
writer.WritePropertyName("TheGuid");
writer.WriteValue(g);
writer.WriteEndObject();
writer.Flush();
byte[] bytes = ms.ToArray();
BsonReader reader = new BsonReader(new MemoryStream(bytes));
Assert.IsTrue(reader.Read());
Assert.IsTrue(reader.Read());
Assert.IsTrue(reader.Read());
Assert.AreEqual(JsonToken.Bytes, reader.TokenType);
Assert.AreEqual(typeof(Guid), reader.ValueType);
Assert.AreEqual(g, (Guid)reader.Value);
Assert.IsTrue(reader.Read());
Assert.IsFalse(reader.Read());
}
}
}