-Fixed build

-Removed unused code
This commit is contained in:
James Newton-King
2013-04-06 15:19:33 +13:00
parent 032bf82e0a
commit 695bb8368f
45 changed files with 755 additions and 574 deletions
@@ -61,6 +61,13 @@ namespace Newtonsoft.Json.Tests.Converters
Assert.AreEqual(DateTimeStyles.None, converter.DateTimeStyles);
}
public static string GetUtcOffsetText(DateTime d)
{
TimeSpan utcOffset = d.GetUtcOffset();
return utcOffset.Hours.ToString("+00;-00", CultureInfo.InvariantCulture) + ":" + utcOffset.Minutes.ToString("00;00", CultureInfo.InvariantCulture);
}
[Test]
public void SerializeDateTime()
{
@@ -76,7 +83,7 @@ namespace Newtonsoft.Json.Tests.Converters
d = new DateTime(2000, 12, 15, 22, 11, 3, 55, DateTimeKind.Local);
result = JsonConvert.SerializeObject(d, converter);
Assert.AreEqual(@"""2000-12-15T22:11:03.055" + d.GetUtcOffsetText() + @"""", result);
Assert.AreEqual(@"""2000-12-15T22:11:03.055" + GetUtcOffsetText(d) + @"""", result);
}
[Test]
@@ -52,7 +52,7 @@ namespace Newtonsoft.Json.Tests.Converters
{
ObjectIdTestClass c = new ObjectIdTestClass
{
Id = new BsonObjectId(MiscellaneousUtils.HexToBytes("4ABBED9D1D8B0F0218000001")),
Id = new BsonObjectId(HexToBytes("4ABBED9D1D8B0F0218000001")),
Test = "1234£56"
};
@@ -63,7 +63,7 @@ namespace Newtonsoft.Json.Tests.Converters
BsonWriter writer = new BsonWriter(ms);
serializer.Serialize(writer, c);
byte[] expected = MiscellaneousUtils.HexToBytes("29000000075F6964004ABBED9D1D8B0F02180000010274657374000900000031323334C2A335360000");
byte[] expected = HexToBytes("29000000075F6964004ABBED9D1D8B0F02180000010274657374000900000031323334C2A335360000");
CollectionAssert.AreEquivalent(expected, ms.ToArray());
}
@@ -71,14 +71,14 @@ namespace Newtonsoft.Json.Tests.Converters
[Test]
public void Deserialize()
{
byte[] bson = MiscellaneousUtils.HexToBytes("29000000075F6964004ABBED9D1D8B0F02180000010274657374000900000031323334C2A335360000");
byte[] bson = HexToBytes("29000000075F6964004ABBED9D1D8B0F02180000010274657374000900000031323334C2A335360000");
JsonSerializer serializer = new JsonSerializer();
BsonReader reader = new BsonReader(new MemoryStream(bson));
ObjectIdTestClass c = serializer.Deserialize<ObjectIdTestClass>(reader);
CollectionAssert.AreEquivalent(c.Id.Value, MiscellaneousUtils.HexToBytes("4ABBED9D1D8B0F0218000001"));
CollectionAssert.AreEquivalent(c.Id.Value, HexToBytes("4ABBED9D1D8B0F0218000001"));
Assert.AreEqual(c.Test, "1234£56");
}
}
@@ -81,7 +81,7 @@ namespace Newtonsoft.Json.Tests.Converters
serializer.Serialize(writer, new RegexTestClass { Regex = regex });
string expected = "13-00-00-00-0B-52-65-67-65-78-00-61-62-63-00-69-75-00-00";
string bson = MiscellaneousUtils.BytesToHex(ms.ToArray());
string bson = BytesToHex(ms.ToArray());
Assert.AreEqual(expected, bson);
}
@@ -102,7 +102,7 @@ namespace Newtonsoft.Json.Tests.Converters
[Test]
public void DeserializeFromBson()
{
MemoryStream ms = new MemoryStream(MiscellaneousUtils.HexToBytes("13-00-00-00-0B-52-65-67-65-78-00-61-62-63-00-69-75-00-00"));
MemoryStream ms = new MemoryStream(HexToBytes("13-00-00-00-0B-52-65-67-65-78-00-61-62-63-00-69-75-00-00"));
BsonReader reader = new BsonReader(ms);
JsonSerializer serializer = new JsonSerializer();
serializer.Converters.Add(new RegexConverter());
@@ -150,7 +150,7 @@ namespace Newtonsoft.Json.Tests.Converters
serializer.Serialize(writer, new RegexTestClass { Regex = regex });
string expected = "14-00-00-00-0B-52-65-67-65-78-00-2F-00-69-6D-73-75-78-00-00";
string bson = MiscellaneousUtils.BytesToHex(ms.ToArray());
string bson = BytesToHex(ms.ToArray());
Assert.AreEqual(expected, bson);