Update .NET 6 tests (#2678)

This commit is contained in:
James Newton-King
2022-05-16 17:13:53 +08:00
committed by GitHub
parent bf2e2a78e8
commit 5803c7722a
108 changed files with 262 additions and 262 deletions
@@ -28,7 +28,7 @@ using System.Collections.Generic;
#if !(NET20 || DNXCORE50)
using System.Data.Linq;
#endif
#if !DNXCORE50 || NETSTANDARD2_0
#if !DNXCORE50 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Data.SqlTypes;
#endif
using System.Text;
@@ -121,7 +121,7 @@ namespace Newtonsoft.Json.Tests.Converters
}", json);
}
#if !(PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD2_0
#if !(PORTABLE || PORTABLE40 || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
public class SqlBinaryClass
{
public SqlBinary SqlBinary { get; set; }
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System;
using Newtonsoft.Json.Converters;
#if DNXCORE50
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0
#if !(PORTABLE || DNXCORE50 || PORTABLE40) || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.IO;
using System.Text;
using Newtonsoft.Json.Bson;
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(NET40 || NET35 || NET20 || DNXCORE50) || NETSTANDARD2_0
#if !(NET40 || NET35 || NET20 || DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Diagnostics;
using System.Reflection;
using Microsoft.FSharp.Core;
@@ -123,7 +123,7 @@ namespace Newtonsoft.Json.Tests.Converters
Assert.AreEqual(2006, d.Year);
}
#if !(DNXCORE50) || NETSTANDARD2_0
#if !(DNXCORE50) || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test]
public void SerializeFormattedDateTimeNewZealandCulture()
{
@@ -23,7 +23,7 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion
#if !(DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0
#if !(DNXCORE50 || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
using System.Globalization;
#if NET20
using Newtonsoft.Json.Utilities.LinqBridge;
@@ -58,7 +58,7 @@ namespace Newtonsoft.Json.Tests.Converters
[TestFixture]
public class XmlNodeConverterTest : TestFixtureBase
{
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
private string SerializeXmlNode(XmlNode node)
{
string json = JsonConvert.SerializeXmlNode(node, Formatting.Indented);
@@ -151,7 +151,7 @@ namespace Newtonsoft.Json.Tests.Converters
return sw.ToString();
}
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test]
public void DeserializeXmlNode_DefaultDate()
{
@@ -569,7 +569,7 @@ namespace Newtonsoft.Json.Tests.Converters
}
#endif
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test]
public void MultipleNamespacesXmlDocument()
{
@@ -748,7 +748,7 @@ namespace Newtonsoft.Json.Tests.Converters
</root>", doc.ToString());
}
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test]
public void SerializeEmptyDocument()
{
@@ -794,7 +794,7 @@ namespace Newtonsoft.Json.Tests.Converters
Assert.IsTrue(equals);
}
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test]
public void DeserializeUndeclaredNamespacePrefix()
{
@@ -809,7 +809,7 @@ namespace Newtonsoft.Json.Tests.Converters
#endif
#endif
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test]
public void DeserializeMultipleRootElements()
{
@@ -1604,7 +1604,7 @@ namespace Newtonsoft.Json.Tests.Converters
]
}";
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
XmlDocument newDoc = JsonConvert.DeserializeXmlNode(json, "myRoot");
string xml = IndentXml(newDoc.InnerXml);
@@ -1642,7 +1642,7 @@ namespace Newtonsoft.Json.Tests.Converters
</myRoot>", IndentXml(newXDoc.ToString(SaveOptions.DisableFormatting)));
#endif
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
string newJson = JsonConvert.SerializeXmlNode(newDoc, Formatting.Indented);
Console.WriteLine(newJson);
#endif
@@ -1667,7 +1667,7 @@ namespace Newtonsoft.Json.Tests.Converters
]
}";
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
XmlDocument newDoc = JsonConvert.DeserializeXmlNode(json, "myRoot", true);
StringAssert.AreEqual(@"<myRoot>
@@ -1703,7 +1703,7 @@ namespace Newtonsoft.Json.Tests.Converters
</myRoot>", IndentXml(newXDoc.ToString(SaveOptions.DisableFormatting)));
#endif
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
string newJson = JsonConvert.SerializeXmlNode(newDoc, Formatting.Indented, true);
StringAssert.AreEqual(json, newJson);
#endif
@@ -1729,7 +1729,7 @@ namespace Newtonsoft.Json.Tests.Converters
]
}";
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
XmlDocument newDoc = JsonConvert.DeserializeXmlNode(json, "myRoot");
Assert.AreEqual(@"<myRoot><available_sizes><available_sizes><available_sizes>113</available_sizes><available_sizes>150</available_sizes></available_sizes><available_sizes>assets/images/resized/0001/1070/11070v1-max-150x150.jpg</available_sizes></available_sizes><available_sizes><available_sizes><available_sizes>189</available_sizes><available_sizes>250</available_sizes></available_sizes><available_sizes>assets/images/resized/0001/1070/11070v1-max-250x250.jpg</available_sizes></available_sizes><available_sizes><available_sizes><available_sizes>341</available_sizes><available_sizes>450</available_sizes></available_sizes><available_sizes>assets/images/resized/0001/1070/11070v1-max-450x450.jpg</available_sizes></available_sizes></myRoot>", newDoc.InnerXml);
@@ -1742,7 +1742,7 @@ namespace Newtonsoft.Json.Tests.Converters
#endif
}
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test]
public void Encoding()
{
@@ -1757,7 +1757,7 @@ namespace Newtonsoft.Json.Tests.Converters
}
#endif
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test]
public void SerializeComment()
{
@@ -2808,7 +2808,7 @@ namespace Newtonsoft.Json.Tests.Converters
}
#endif
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test]
public void DeserializeXmlNodeDefaultNamespace()
{
@@ -3136,7 +3136,7 @@ namespace Newtonsoft.Json.Tests.Converters
}
#endif
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0
#if !PORTABLE || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test]
public void SerializeAndDeserializeXmlElementWithNamespaceInChildrenRootDontHaveNameSpace()
{
@@ -3155,7 +3155,7 @@ namespace Newtonsoft.Json.Tests.Converters
Assert.AreEqual(@"<root><b xmlns=""http://www.example.com/ns"">Asd</b><c>AAA</c><test>adad</test></root>", xmlBack.OuterXml);
}
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0
#if !(NET20 || NET35 || PORTABLE || PORTABLE40) || NETSTANDARD1_3 || NETSTANDARD2_0 || NET6_0_OR_GREATER
[Test]
public void DeserializeBigInteger()
{