Imported Upstream version 5.20.0.180

Former-commit-id: ff953ca879339fe1e1211f7220f563e1342e66cb
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-02-04 20:11:37 +00:00
parent 0e2d47d1c8
commit 0510252385
3360 changed files with 83827 additions and 39243 deletions

View File

@@ -17,6 +17,8 @@ using System.ComponentModel;
using NUnit.Framework;
using System.Linq;
using MonoTests.Helpers;
namespace MonoTests.System.XmlSerialization
{
[TestFixture]
@@ -35,7 +37,7 @@ namespace MonoTests.System.XmlSerialization
string serialized = sw.ToString ();
serialized = XmlSerializerTests.Infoset (serialized);
StreamReader sr = new StreamReader ("Test/XmlFiles/literal-data.xml");
StreamReader sr = new StreamReader (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/literal-data.xml"));
string expected = sr.ReadToEnd ();
sr.Close ();
@@ -51,7 +53,7 @@ namespace MonoTests.System.XmlSerialization
XmlSerializer ss = new XmlSerializer (GetLiteralTypeMapping ());
XmlSerializerNamespaces nams = new XmlSerializerNamespaces ();
StreamReader sr = new StreamReader ("Test/XmlFiles/literal-data.xml");
StreamReader sr = new StreamReader (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/literal-data.xml"));
Test data = (Test) ss.Deserialize (sr);
sr.Close ();

View File

@@ -27,6 +27,8 @@ using NUnit.Framework;
using MonoTests.System.Xml.TestClasses;
using MonoTests.Helpers;
namespace MonoTests.System.XmlSerialization
{
[TestFixture]
@@ -931,7 +933,7 @@ namespace MonoTests.System.XmlSerialization
[Test]
public void DuplicateIdentifiers ()
{
XmlSchema xs = XmlSchema.Read (File.OpenText ("Test/XmlFiles/xsd/82078.xsd"), null);
XmlSchema xs = XmlSchema.Read (File.OpenText (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsd/82078.xsd")), null);
XmlSchemas xss = new XmlSchemas ();
xss.Add (xs);

View File

@@ -46,6 +46,8 @@ using NUnit.Framework;
using MonoTests.System.Xml.TestClasses;
using MonoTests.Helpers;
namespace MonoTests.System.Xml.Serialization
{
[TestFixture]
@@ -1159,8 +1161,8 @@ namespace MonoTests.System.Xml.Serialization
public void ImportWildcardElementAsClass ()
{
var xss = new XmlSchemas ();
xss.Add (XmlSchema.Read (XmlReader.Create ("Test/XmlFiles/xsd/670945-1.xsd"), null));
xss.Add (XmlSchema.Read (XmlReader.Create ("Test/XmlFiles/xsd/670945-2.xsd"), null));
xss.Add (XmlSchema.Read (XmlReader.Create (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsd/670945-1.xsd")), null));
xss.Add (XmlSchema.Read (XmlReader.Create (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsd/670945-2.xsd")), null));
var imp = new XmlSchemaImporter (xss);
var xtm = imp.ImportSchemaType (new XmlQualifiedName ("SystemDateTime", "http://www.onvif.org/ver10/schema"));
var cns = new CodeNamespace ();