Update Newtonsoft.Json project to use nullable reference types (#1950)
This commit is contained in:
@@ -160,6 +160,14 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
Assert.AreEqual("<Time>0001-01-01T00:00:00</Time>", xmlNode.OuterXml);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void XmlNode_Null()
|
||||
{
|
||||
string json = JsonConvert.SerializeXmlNode(null);
|
||||
|
||||
Assert.AreEqual("null", json);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void XmlNode_Roundtrip_PropertyNameWithColon()
|
||||
{
|
||||
@@ -305,6 +313,14 @@ namespace Newtonsoft.Json.Tests.Converters
|
||||
}
|
||||
|
||||
#if !NET20
|
||||
[Test]
|
||||
public void XNode_Null()
|
||||
{
|
||||
string json = JsonConvert.SerializeXNode(null);
|
||||
|
||||
Assert.AreEqual("null", json);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void XNode_UnescapeTextContent()
|
||||
{
|
||||
|
||||
@@ -1563,14 +1563,15 @@ namespace Newtonsoft.Json.Tests
|
||||
public int Overload { get; set; }
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void JsonConverterConstructor_OverloadsWithBaseTypes()
|
||||
{
|
||||
OverloadWithBaseType value = new OverloadWithBaseType();
|
||||
string json = JsonConvert.SerializeObject(value);
|
||||
//[Test]
|
||||
//[Ignore("https://github.com/dotnet/roslyn/issues/36974")]
|
||||
//public void JsonConverterConstructor_OverloadsWithBaseTypes()
|
||||
//{
|
||||
// OverloadWithBaseType value = new OverloadWithBaseType();
|
||||
// string json = JsonConvert.SerializeObject(value);
|
||||
|
||||
Assert.AreEqual("{\"Overload\":\"IList<string>\"}", json);
|
||||
}
|
||||
// Assert.AreEqual("{\"Overload\":\"IList<string>\"}", json);
|
||||
//}
|
||||
|
||||
|
||||
[Test]
|
||||
|
||||
@@ -242,6 +242,26 @@ namespace Newtonsoft.Json.Tests.Linq
|
||||
Assert.AreEqual(2, a[2].BeforeSelf().Count());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void BeforeSelf_NoParent_ReturnEmpty()
|
||||
{
|
||||
JObject o = new JObject();
|
||||
|
||||
List<JToken> result = o.BeforeSelf().ToList();
|
||||
Assert.AreEqual(0, result.Count);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void BeforeSelf_OnlyChild_ReturnEmpty()
|
||||
{
|
||||
JArray a = new JArray();
|
||||
JObject o = new JObject();
|
||||
a.Add(o);
|
||||
|
||||
List<JToken> result = o.BeforeSelf().ToList();
|
||||
Assert.AreEqual(0, result.Count);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Casting()
|
||||
{
|
||||
|
||||
@@ -45,33 +45,12 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
|
||||
[Test]
|
||||
public void AndExpressionTest()
|
||||
{
|
||||
CompositeExpression compositeExpression = new CompositeExpression
|
||||
CompositeExpression compositeExpression = new CompositeExpression(QueryOperator.And)
|
||||
{
|
||||
Operator = QueryOperator.And,
|
||||
Expressions = new List<QueryExpression>
|
||||
{
|
||||
new BooleanQueryExpression
|
||||
{
|
||||
Operator = QueryOperator.Exists,
|
||||
Left = new List<PathFilter>
|
||||
{
|
||||
new FieldFilter
|
||||
{
|
||||
Name = "FirstName"
|
||||
}
|
||||
}
|
||||
},
|
||||
new BooleanQueryExpression
|
||||
{
|
||||
Operator = QueryOperator.Exists,
|
||||
Left = new List<PathFilter>
|
||||
{
|
||||
new FieldFilter
|
||||
{
|
||||
Name = "LastName"
|
||||
}
|
||||
}
|
||||
}
|
||||
new BooleanQueryExpression(QueryOperator.Exists, new List<PathFilter> { new FieldFilter("FirstName") }, null),
|
||||
new BooleanQueryExpression(QueryOperator.Exists, new List<PathFilter> { new FieldFilter("LastName") }, null)
|
||||
}
|
||||
};
|
||||
|
||||
@@ -103,33 +82,12 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
|
||||
[Test]
|
||||
public void OrExpressionTest()
|
||||
{
|
||||
CompositeExpression compositeExpression = new CompositeExpression
|
||||
CompositeExpression compositeExpression = new CompositeExpression(QueryOperator.Or)
|
||||
{
|
||||
Operator = QueryOperator.Or,
|
||||
Expressions = new List<QueryExpression>
|
||||
{
|
||||
new BooleanQueryExpression
|
||||
{
|
||||
Operator = QueryOperator.Exists,
|
||||
Left = new List<PathFilter>
|
||||
{
|
||||
new FieldFilter
|
||||
{
|
||||
Name = "FirstName"
|
||||
}
|
||||
}
|
||||
},
|
||||
new BooleanQueryExpression
|
||||
{
|
||||
Operator = QueryOperator.Exists,
|
||||
Left = new List<PathFilter>
|
||||
{
|
||||
new FieldFilter
|
||||
{
|
||||
Name = "LastName"
|
||||
}
|
||||
}
|
||||
}
|
||||
new BooleanQueryExpression(QueryOperator.Exists, new List<PathFilter> { new FieldFilter("FirstName") }, null),
|
||||
new BooleanQueryExpression(QueryOperator.Exists, new List<PathFilter> { new FieldFilter("LastName") }, null)
|
||||
}
|
||||
};
|
||||
|
||||
@@ -161,30 +119,14 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
|
||||
[Test]
|
||||
public void BooleanExpressionTest_RegexEqualsOperator()
|
||||
{
|
||||
BooleanQueryExpression e1 = new BooleanQueryExpression
|
||||
{
|
||||
Operator = QueryOperator.RegexEquals,
|
||||
Right = new JValue("/foo.*d/"),
|
||||
Left = new List<PathFilter>
|
||||
{
|
||||
new ArrayIndexFilter()
|
||||
}
|
||||
};
|
||||
BooleanQueryExpression e1 = new BooleanQueryExpression(QueryOperator.RegexEquals, new List<PathFilter> { new ArrayIndexFilter() }, new JValue("/foo.*d/"));
|
||||
|
||||
Assert.IsTrue(e1.IsMatch(null, new JArray("food")));
|
||||
Assert.IsTrue(e1.IsMatch(null, new JArray("fooood and drink")));
|
||||
Assert.IsFalse(e1.IsMatch(null, new JArray("FOOD")));
|
||||
Assert.IsFalse(e1.IsMatch(null, new JArray("foo", "foog", "good")));
|
||||
|
||||
BooleanQueryExpression e2 = new BooleanQueryExpression
|
||||
{
|
||||
Operator = QueryOperator.RegexEquals,
|
||||
Right = new JValue("/Foo.*d/i"),
|
||||
Left = new List<PathFilter>
|
||||
{
|
||||
new ArrayIndexFilter()
|
||||
}
|
||||
};
|
||||
BooleanQueryExpression e2 = new BooleanQueryExpression(QueryOperator.RegexEquals, new List<PathFilter> { new ArrayIndexFilter() }, new JValue("/Foo.*d/i"));
|
||||
|
||||
Assert.IsTrue(e2.IsMatch(null, new JArray("food")));
|
||||
Assert.IsTrue(e2.IsMatch(null, new JArray("fooood and drink")));
|
||||
@@ -195,28 +137,12 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
|
||||
[Test]
|
||||
public void BooleanExpressionTest_RegexEqualsOperator_CornerCase()
|
||||
{
|
||||
BooleanQueryExpression e1 = new BooleanQueryExpression
|
||||
{
|
||||
Operator = QueryOperator.RegexEquals,
|
||||
Right = new JValue("/// comment/"),
|
||||
Left = new List<PathFilter>
|
||||
{
|
||||
new ArrayIndexFilter()
|
||||
}
|
||||
};
|
||||
BooleanQueryExpression e1 = new BooleanQueryExpression(QueryOperator.RegexEquals, new List<PathFilter> { new ArrayIndexFilter() }, new JValue("/// comment/"));
|
||||
|
||||
Assert.IsTrue(e1.IsMatch(null, new JArray("// comment")));
|
||||
Assert.IsFalse(e1.IsMatch(null, new JArray("//comment", "/ comment")));
|
||||
|
||||
BooleanQueryExpression e2 = new BooleanQueryExpression
|
||||
{
|
||||
Operator = QueryOperator.RegexEquals,
|
||||
Right = new JValue("/<tag>.*</tag>/i"),
|
||||
Left = new List<PathFilter>
|
||||
{
|
||||
new ArrayIndexFilter()
|
||||
}
|
||||
};
|
||||
BooleanQueryExpression e2 = new BooleanQueryExpression(QueryOperator.RegexEquals, new List<PathFilter> { new ArrayIndexFilter() }, new JValue("/<tag>.*</tag>/i"));
|
||||
|
||||
Assert.IsTrue(e2.IsMatch(null, new JArray("<Tag>Test</Tag>", "")));
|
||||
Assert.IsFalse(e2.IsMatch(null, new JArray("<tag>Test<tag>")));
|
||||
@@ -225,15 +151,7 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
|
||||
[Test]
|
||||
public void BooleanExpressionTest()
|
||||
{
|
||||
BooleanQueryExpression e1 = new BooleanQueryExpression
|
||||
{
|
||||
Operator = QueryOperator.LessThan,
|
||||
Right = new JValue(3),
|
||||
Left = new List<PathFilter>
|
||||
{
|
||||
new ArrayIndexFilter()
|
||||
}
|
||||
};
|
||||
BooleanQueryExpression e1 = new BooleanQueryExpression(QueryOperator.LessThan, new List<PathFilter> { new ArrayIndexFilter() }, new JValue(3));
|
||||
|
||||
Assert.IsTrue(e1.IsMatch(null, new JArray(1, 2, 3, 4, 5)));
|
||||
Assert.IsTrue(e1.IsMatch(null, new JArray(2, 3, 4, 5)));
|
||||
@@ -241,15 +159,7 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
|
||||
Assert.IsFalse(e1.IsMatch(null, new JArray(4, 5)));
|
||||
Assert.IsFalse(e1.IsMatch(null, new JArray("11", 5)));
|
||||
|
||||
BooleanQueryExpression e2 = new BooleanQueryExpression
|
||||
{
|
||||
Operator = QueryOperator.LessThanOrEquals,
|
||||
Right = new JValue(3),
|
||||
Left = new List<PathFilter>
|
||||
{
|
||||
new ArrayIndexFilter()
|
||||
}
|
||||
};
|
||||
BooleanQueryExpression e2 = new BooleanQueryExpression(QueryOperator.LessThanOrEquals, new List<PathFilter> { new ArrayIndexFilter() }, new JValue(3));
|
||||
|
||||
Assert.IsTrue(e2.IsMatch(null, new JArray(1, 2, 3, 4, 5)));
|
||||
Assert.IsTrue(e2.IsMatch(null, new JArray(2, 3, 4, 5)));
|
||||
@@ -261,15 +171,7 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
|
||||
[Test]
|
||||
public void BooleanExpressionTest_GreaterThanOperator()
|
||||
{
|
||||
BooleanQueryExpression e1 = new BooleanQueryExpression
|
||||
{
|
||||
Operator = QueryOperator.GreaterThan,
|
||||
Right = new JValue(3),
|
||||
Left = new List<PathFilter>
|
||||
{
|
||||
new ArrayIndexFilter()
|
||||
}
|
||||
};
|
||||
BooleanQueryExpression e1 = new BooleanQueryExpression(QueryOperator.GreaterThan, new List<PathFilter> { new ArrayIndexFilter() }, new JValue(3));
|
||||
|
||||
Assert.IsTrue(e1.IsMatch(null, new JArray("2", "26")));
|
||||
Assert.IsTrue(e1.IsMatch(null, new JArray(2, 26)));
|
||||
@@ -280,15 +182,7 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
|
||||
[Test]
|
||||
public void BooleanExpressionTest_GreaterThanOrEqualsOperator()
|
||||
{
|
||||
BooleanQueryExpression e1 = new BooleanQueryExpression
|
||||
{
|
||||
Operator = QueryOperator.GreaterThanOrEquals,
|
||||
Right = new JValue(3),
|
||||
Left = new List<PathFilter>
|
||||
{
|
||||
new ArrayIndexFilter()
|
||||
}
|
||||
};
|
||||
BooleanQueryExpression e1 = new BooleanQueryExpression(QueryOperator.GreaterThanOrEquals, new List<PathFilter> { new ArrayIndexFilter() }, new JValue(3));
|
||||
|
||||
Assert.IsTrue(e1.IsMatch(null, new JArray("2", "26")));
|
||||
Assert.IsTrue(e1.IsMatch(null, new JArray(2, 26)));
|
||||
|
||||
@@ -42,8 +42,8 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)'=='net46'">
|
||||
<PackageReference Include="NUnit" Version="3.10.1" />
|
||||
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
|
||||
<PackageReference Include="NUnit" Version="3.11.0" />
|
||||
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
|
||||
<PackageReference Include="Autofac" Version="4.6.2" />
|
||||
<PackageReference Include="BenchmarkDotNet" Version="0.10.10" />
|
||||
<PackageReference Include="FSharp.Core" Version="4.2.3" />
|
||||
@@ -66,8 +66,8 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)'=='net451'">
|
||||
<PackageReference Include="NUnit" Version="3.10.1" />
|
||||
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
|
||||
<PackageReference Include="NUnit" Version="3.11.0" />
|
||||
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
|
||||
<PackageReference Include="Autofac" Version="4.6.2" />
|
||||
<PackageReference Include="FSharp.Core" Version="4.2.3" />
|
||||
<PackageReference Include="System.Buffers" Version="4.4.0" />
|
||||
@@ -89,8 +89,8 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)'=='net452'">
|
||||
<PackageReference Include="NUnit" Version="3.10.1" />
|
||||
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
|
||||
<PackageReference Include="NUnit" Version="3.11.0" />
|
||||
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
|
||||
<PackageReference Include="Autofac" Version="4.6.2" />
|
||||
<PackageReference Include="FSharp.Core" Version="4.2.3" />
|
||||
<PackageReference Include="System.Buffers" Version="4.4.0" />
|
||||
@@ -112,8 +112,8 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)'=='net40'">
|
||||
<PackageReference Include="NUnit" Version="3.10.1" />
|
||||
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
|
||||
<PackageReference Include="NUnit" Version="3.11.0" />
|
||||
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
|
||||
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Web" />
|
||||
@@ -129,8 +129,8 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)'=='net35'">
|
||||
<PackageReference Include="NUnit" Version="3.10.1" />
|
||||
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
|
||||
<PackageReference Include="NUnit" Version="3.11.0" />
|
||||
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
|
||||
<Reference Include="System.Web" />
|
||||
<Reference Include="System.Data.Linq" />
|
||||
<Reference Include="System.Data.Entity" />
|
||||
@@ -144,8 +144,8 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)'=='net20'">
|
||||
<PackageReference Include="NUnit" Version="3.10.1" />
|
||||
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
|
||||
<PackageReference Include="NUnit" Version="3.11.0" />
|
||||
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
|
||||
<Reference Include="System.Web" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup Condition="'$(TargetFramework)'=='net20'">
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
#endregion
|
||||
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.IO;
|
||||
@@ -727,6 +728,17 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void NonGenericDictionary_KeyValueTypes()
|
||||
{
|
||||
DefaultContractResolver resolver = new DefaultContractResolver();
|
||||
|
||||
JsonDictionaryContract c = (JsonDictionaryContract)resolver.ResolveContract(typeof(IDictionary));
|
||||
|
||||
Assert.IsNull(c.DictionaryKeyType);
|
||||
Assert.IsNull(c.DictionaryValueType);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DefaultContractResolverIgnoreIsSpecifiedTrue()
|
||||
{
|
||||
|
||||
@@ -212,11 +212,9 @@ namespace Newtonsoft.Json.Tests
|
||||
|
||||
public static string ResolvePath(string path)
|
||||
{
|
||||
#if !DNXCORE50
|
||||
return Path.Combine(TestContext.CurrentContext.TestDirectory, path);
|
||||
#else
|
||||
return path;
|
||||
#endif
|
||||
var assemblyPath = Path.GetDirectoryName(typeof(TestFixtureBase).Assembly().Location);
|
||||
|
||||
return Path.Combine(assemblyPath, path);
|
||||
}
|
||||
|
||||
protected string GetOffset(DateTime d, DateFormatHandling dateFormatHandling)
|
||||
|
||||
Reference in New Issue
Block a user