This commit is contained in:
James Newton-King
2015-03-22 13:34:52 +13:00
parent 345c6f3512
commit f09cfcded0
3 changed files with 20 additions and 6 deletions
+16 -2
View File
@@ -3,5 +3,19 @@
$path = Split-Path -Path $MyInvocation.MyCommand.Path $path = Split-Path -Path $MyInvocation.MyCommand.Path
Import-Module ($path + '\..\Tools\PSake\psake.psm1') Import-Module ($path + '\..\Tools\PSake\psake.psm1')
Invoke-psake ($path + '\build.ps1') Test -framework 3.5
Remove-Module psake Try
{
Invoke-psake ($path + '\build.ps1') Test -framework 3.5
if ($error -ne '')
{
$exitCode = $error.Count
write-host "build.ps1 exit code: $exitCode" -fore RED
exit $exitCode
}
}
Finally
{
Remove-Module psake
}
@@ -151,7 +151,7 @@ namespace Newtonsoft.Json.Tests.Converters
string json = JsonConvert.SerializeObject(d, Formatting.Indented); string json = JsonConvert.SerializeObject(d, Formatting.Indented);
Assert.AreEqual(@"{ StringAssert.AreEqual(@"{
""result"": { ""result"": {
""@xp_0:end"": ""2014-08-15 13:12:11.9184"", ""@xp_0:end"": ""2014-08-15 13:12:11.9184"",
""@xp_0:start"": ""2014-08-15 13:11:49.3140"", ""@xp_0:start"": ""2014-08-15 13:11:49.3140"",
@@ -166,7 +166,7 @@ namespace Newtonsoft.Json.Tests.Converters
XDocument doc = JsonConvert.DeserializeObject<XDocument>(json); XDocument doc = JsonConvert.DeserializeObject<XDocument>(json);
Assert.AreEqual(xml, doc.ToString()); StringAssert.AreEqual(xml, doc.ToString());
} }
#endif #endif
@@ -195,7 +195,7 @@ namespace Newtonsoft.Json.Tests.Converters
XmlDocument doc = JsonConvert.DeserializeObject<XmlDocument>(json); XmlDocument doc = JsonConvert.DeserializeObject<XmlDocument>(json);
Assert.AreEqual(xml, doc.OuterXml); StringAssert.AreEqual(xml, doc.OuterXml);
} }
[Test] [Test]
@@ -922,7 +922,7 @@ keyword such as type of business.""
} }
}); });
Assert.AreEqual(@"{ StringAssert.AreEqual(@"{
""channel"": { ""channel"": {
""title"": ""James Newton-King"", ""title"": ""James Newton-King"",
""link"": ""http://james.newtonking.com"", ""link"": ""http://james.newtonking.com"",