From a09c2110e823d44a7f67a1bf0ae411a16cb68a53 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Fri, 12 Sep 2014 21:43:17 +1200 Subject: [PATCH] -Fixed WinRT build --- .gitattributes | 2 -- .../Converters/JsonValueConverterTests.cs | 25 ++++++++----------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/.gitattributes b/.gitattributes index 47331e34..d27dfbfa 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,3 @@ -* text eol=crlf - *.doc diff=astextplain *.DOC diff=astextplain *.docx diff=astextplain diff --git a/Src/Newtonsoft.Json.Tests/Converters/JsonValueConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/JsonValueConverterTests.cs index d9e00e06..42e4307e 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/JsonValueConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/JsonValueConverterTests.cs @@ -140,11 +140,10 @@ namespace Newtonsoft.Json.Tests.Converters JsonValueConverter converter = new JsonValueConverter(); - ExceptionAssert.Throws("Unexpected or unsupported token: Undefined. Path '', line 1, position 9.", - () => + ExceptionAssert.Throws(() => { converter.ReadJson(writer, typeof(JsonValue), null, null); - }); + }, "Unexpected or unsupported token: Undefined. Path '', line 1, position 9."); } [Test] @@ -156,11 +155,10 @@ namespace Newtonsoft.Json.Tests.Converters JsonValueConverter converter = new JsonValueConverter(); - ExceptionAssert.Throws("Unexpected end. Path '', line 1, position 1.", - () => + ExceptionAssert.Throws(() => { converter.ReadJson(writer, typeof(JsonValue), null, null); - }); + }, "Unexpected end. Path '', line 1, position 1."); } [Test] @@ -172,11 +170,10 @@ namespace Newtonsoft.Json.Tests.Converters JsonValueConverter converter = new JsonValueConverter(); - ExceptionAssert.Throws("Unexpected end. Path '', line 1, position 13.", - () => + ExceptionAssert.Throws(() => { converter.ReadJson(writer, typeof(JsonValue), null, null); - }); + }, "Unexpected end. Path '', line 1, position 13."); } [Test] @@ -188,11 +185,10 @@ namespace Newtonsoft.Json.Tests.Converters JsonValueConverter converter = new JsonValueConverter(); - ExceptionAssert.Throws("Unexpected end. Path 'hi', line 1, position 6.", - () => + ExceptionAssert.Throws(() => { converter.ReadJson(writer, typeof(JsonValue), null, null); - }); + }, "Unexpected end. Path 'hi', line 1, position 6."); } [Test] @@ -204,11 +200,10 @@ namespace Newtonsoft.Json.Tests.Converters JsonValueConverter converter = new JsonValueConverter(); - ExceptionAssert.Throws("Could not convert 'Windows.Data.Json.JsonValue' to 'Windows.Data.Json.JsonObject'. Path '', line 1, position 4.", - () => + ExceptionAssert.Throws(() => { converter.ReadJson(writer, typeof(JsonObject), null, null); - }); + }, "Could not convert 'Windows.Data.Json.JsonValue' to 'Windows.Data.Json.JsonObject'. Path '', line 1, position 4."); } [Test]