Clean up test warnings (#1882)

This commit is contained in:
James Newton-King
2018-10-15 13:41:57 +13:00
committed by GitHub
parent 0ce23ff924
commit faaa23eb9e
3 changed files with 10 additions and 12 deletions
@@ -46,16 +46,13 @@ namespace Newtonsoft.Json.Tests.Benchmarks
[TestFixture] [TestFixture]
public class Runner : TestFixtureBase public class Runner : TestFixtureBase
{ {
#if DNXCORE50 #if false
[Test(Skip = "Don't run with other unit tests")]
#else
[Ignore("Don't run with other unit tests")]
[Test] [Test]
#endif
public void RunBenchmarks() public void RunBenchmarks()
{ {
new BenchmarkSwitcher(typeof(Runner).GetTypeInfo().Assembly).Run(new []{ "*" }); new BenchmarkSwitcher(typeof(Runner).GetTypeInfo().Assembly).Run(new []{ "*" });
} }
#endif
} }
} }
+2 -5
View File
@@ -1165,12 +1165,8 @@ namespace Newtonsoft.Json.Tests
Assert.AreEqual(typeof(DateTime), jsonReader.ValueType); Assert.AreEqual(typeof(DateTime), jsonReader.ValueType);
} }
#if DNXCORE50 #if false
[Test(Skip = "Don't run with other unit tests")]
#else
[Ignore("Don't run with other unit tests")]
[Test] [Test]
#endif
public void StackOverflowTest() public void StackOverflowTest()
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
@@ -1192,6 +1188,7 @@ namespace Newtonsoft.Json.Tests
JsonSerializer serializer = new JsonSerializer() { }; JsonSerializer serializer = new JsonSerializer() { };
serializer.Deserialize<Nest>(new JsonTextReader(new StringReader(json))); serializer.Deserialize<Nest>(new JsonTextReader(new StringReader(json)));
} }
#endif
public class Nest public class Nest
{ {
@@ -1541,7 +1541,12 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
foreach (var item in StrictMatchTestData()) foreach (var item in StrictMatchTestData())
{ {
yield return new object[] { item[0], item[1], item[2] }; yield return new object[] { item[0], item[1], item[2] };
yield return new object[] { item[1], item[0], item[2] };
if (!item[0].Equals(item[1]))
{
// Test the inverse
yield return new object[] { item[1], item[0], item[2] };
}
} }
} }
@@ -1558,7 +1563,6 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
yield return new object[] { "1", "null", false }; yield return new object[] { "1", "null", false };
yield return new object[] { "null", "null", true }; yield return new object[] { "null", "null", true };
yield return new object[] { "null", "'null'", false }; yield return new object[] { "null", "'null'", false };
yield return new object[] { "null", "1", false };
} }
} }
} }