-Cleaned up preprocessor symbols

This commit is contained in:
James Newton-King
2017-03-05 15:12:52 +13:00
parent febdb8188b
commit ba514c4610
85 changed files with 226 additions and 235 deletions
+11 -11
View File
@@ -28,7 +28,7 @@ using System.Collections.Generic;
using System.IO;
using System.Runtime.Serialization;
using Newtonsoft.Json.Tests.TestObjects;
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3
using System.Numerics;
#endif
using System.Text;
@@ -150,7 +150,7 @@ namespace Newtonsoft.Json.Tests.Linq
Assert.AreEqual("Pie", v.Value);
Assert.AreEqual(JTokenType.String, v.Type);
#if !(PORTABLE || DNXCORE50 || PORTABLE40)
#if !(PORTABLE || DNXCORE50)
v.Value = DBNull.Value;
Assert.AreEqual(DBNull.Value, v.Value);
Assert.AreEqual(JTokenType.Null, v.Type);
@@ -179,7 +179,7 @@ namespace Newtonsoft.Json.Tests.Linq
Assert.AreEqual(g, v.Value);
Assert.AreEqual(JTokenType.Guid, v.Type);
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3
BigInteger i = BigInteger.Parse("123456789999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999990");
v.Value = i;
Assert.AreEqual(i, v.Value);
@@ -239,13 +239,13 @@ namespace Newtonsoft.Json.Tests.Linq
v = new JValue(new Guid("B282ADE7-C520-496C-A448-4084F6803DE5"));
Assert.AreEqual("b282ade7-c520-496c-a448-4084f6803de5", v.ToString(null, CultureInfo.InvariantCulture));
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3
v = new JValue(BigInteger.Parse("123456789999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999990"));
Assert.AreEqual("123456789999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999990", v.ToString(null, CultureInfo.InvariantCulture));
#endif
}
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3
[Test]
public void JValueParse()
{
@@ -513,7 +513,7 @@ namespace Newtonsoft.Json.Tests.Linq
Assert.AreEqual(Int32.MaxValue, Convert.ToInt32(new JValue(Int32.MaxValue)));
}
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3
[Test]
public void ConvertsToInt32_BigInteger()
{
@@ -641,7 +641,7 @@ namespace Newtonsoft.Json.Tests.Linq
}
#endif
#if !(PORTABLE40 || NET35 || NET20)
#if !(NET35 || NET20)
[Test]
public void ExpicitConversionTest()
{
@@ -675,7 +675,7 @@ namespace Newtonsoft.Json.Tests.Linq
v = new JValue(new Uri("http://www.google.com"));
Assert.AreEqual(TypeCode.Object, v.GetTypeCode());
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3
v = new JValue(new BigInteger(3));
Assert.AreEqual(TypeCode.Object, v.GetTypeCode());
#endif
@@ -694,7 +694,7 @@ namespace Newtonsoft.Json.Tests.Linq
int i = (int)v.ToType(typeof(int), CultureInfo.InvariantCulture);
Assert.AreEqual(9, i);
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_1
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3
BigInteger bi = (BigInteger)v.ToType(typeof(BigInteger), CultureInfo.InvariantCulture);
Assert.AreEqual(new BigInteger(9), bi);
#endif
@@ -709,7 +709,7 @@ namespace Newtonsoft.Json.Tests.Linq
Assert.AreEqual("2013", v.ToString("yyyy"));
}
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_1
#if !(NET20 || NET35 || PORTABLE) || NETSTANDARD1_3
[Test]
public void ToStringNewTypes()
{
@@ -796,7 +796,7 @@ namespace Newtonsoft.Json.Tests.Linq
}", json);
}
#if !(NET20 || NET35 || PORTABLE40)
#if !(NET20 || NET35)
[Test]
public void EnumTests()
{