-Fixed build

This commit is contained in:
James Newton-King
2013-06-06 11:04:12 +12:00
parent c4e812b47a
commit 876ef9ac8c
2 changed files with 6 additions and 2 deletions
@@ -899,7 +899,7 @@ Newtonsoft.Json Error: 0 : Error!
traceReader.ReadAsBytes(); traceReader.ReadAsBytes();
Assert.AreEqual(JsonToken.Bytes, traceReader.TokenType); Assert.AreEqual(JsonToken.Bytes, traceReader.TokenType);
Assert.AreEqual(Encoding.UTF8.GetBytes("String!"), traceReader.Value); CollectionAssert.AreEqual(Encoding.UTF8.GetBytes("String!"), (byte[])traceReader.Value);
traceReader.ReadAsInt32(); traceReader.ReadAsInt32();
Assert.AreEqual(JsonToken.Integer, traceReader.TokenType); Assert.AreEqual(JsonToken.Integer, traceReader.TokenType);
@@ -925,7 +925,7 @@ Newtonsoft.Json Error: 0 : Error!
traceReader.Read(); traceReader.Read();
Assert.AreEqual(JsonToken.Integer, traceReader.TokenType); Assert.AreEqual(JsonToken.Integer, traceReader.TokenType);
Assert.AreEqual(1, traceReader.Value); Assert.AreEqual(1L, traceReader.Value);
traceReader.Read(); traceReader.Read();
Assert.AreEqual(JsonToken.EndConstructor, traceReader.TokenType); Assert.AreEqual(JsonToken.EndConstructor, traceReader.TokenType);
@@ -1519,6 +1519,7 @@ namespace Newtonsoft.Json.Tests.Serialization
} }
#endif #endif
#if !NETFX_CORE
[Test] [Test]
public void SerializeDeserialize_DictionaryContextContainsGuid_DeserializesItemAsGuid() public void SerializeDeserialize_DictionaryContextContainsGuid_DeserializesItemAsGuid()
{ {
@@ -1651,8 +1652,10 @@ namespace Newtonsoft.Json.Tests.Serialization
CustomAssert.IsInstanceOfType(typeof(MyChild), p2.Child); CustomAssert.IsInstanceOfType(typeof(MyChild), p2.Child);
Assert.AreEqual("string!", ((MyChild)p2.Child).MyProperty); Assert.AreEqual("string!", ((MyChild)p2.Child).MyProperty);
} }
#endif
} }
#if !NETFX_CORE
public class ParentParent public class ParentParent
{ {
[JsonProperty(ItemTypeNameHandling = TypeNameHandling.Auto)] [JsonProperty(ItemTypeNameHandling = TypeNameHandling.Auto)]
@@ -1693,6 +1696,7 @@ namespace Newtonsoft.Json.Tests.Serialization
public interface ISomeBase public interface ISomeBase
{ {
} }
#endif
public class Message public class Message
{ {