mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.20.0.180

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaAssertion.cs
View File

@ -13,13 +13,15 @@ using System.Xml;
using System.Xml.Schema;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.System.Xml
{
public class XmlSchemaAssertion
{
public static XmlSchema GetSchema (string path)
public static XmlSchema GetSchema (string resourceName)
{
XmlTextReader reader = new XmlTextReader (path);
XmlTextReader reader = new XmlTextReader (TestResourceHelper.GetFullPathOfResource (resourceName));
XmlSchema schema = XmlSchema.Read (reader, null);
reader.Close ();
return schema;

6
mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaCollectionTests.cs
View File

@ -14,14 +14,16 @@ using System.Xml;
using System.Xml.Schema;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.System.Xml
{
[TestFixture]
public class XmlSchemaCollectionTests
{
private XmlSchema GetSchema (string path)
private XmlSchema GetSchema (string resourceName)
{
return XmlSchema.Read (new XmlTextReader (path), null);
return XmlSchema.Read (new XmlTextReader (TestResourceHelper.GetFullPathOfResource (resourceName)), null);
}
private XmlQualifiedName QName (string name, string ns)

6
mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaDatatypeTests.cs
View File

@ -22,14 +22,16 @@ using SimpleType = System.Xml.Schema.XmlSchemaSimpleType;
using SimpleRest = System.Xml.Schema.XmlSchemaSimpleTypeRestriction;
using AssertType = NUnit.Framework.Assert;
using MonoTests.Helpers;
namespace MonoTests.System.Xml
{
[TestFixture]
public class XmlSchemaDatatypeTests
{
private XmlSchema GetSchema (string path)
private XmlSchema GetSchema (string resourceName)
{
return XmlSchema.Read (new XmlTextReader (path), null);
return XmlSchema.Read (new XmlTextReader (TestResourceHelper.GetFullPathOfResource (resourceName)), null);
}
private XmlQualifiedName QName (string name, string ns)

6
mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaSetTests.cs
View File

@ -15,6 +15,8 @@ using System.Xml;
using System.Xml.Schema;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.System.Xml
{
[TestFixture]
@ -203,8 +205,8 @@ type=""xsd:string"" use=""required""/>
// complexContent schema conformance check, and
// 3) the included schema is already added to XmlSchemaSet.
XmlSchemaSet xss = new XmlSchemaSet ();
xss.Add (null, "Test/XmlFiles/xsd/import-subst-dbr-base.xsd");
xss.Add (null, "Test/XmlFiles/xsd/import-subst-dbr-ext.xsd");
xss.Add (null, TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsd/import-subst-dbr-base.xsd"));
xss.Add (null, TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsd/import-subst-dbr-ext.xsd"));
// should not result in lack of substitutionGroup
// (and conformance error as its result)
xss.Compile ();

22
mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaTests.cs
View File

@ -15,6 +15,8 @@ using System.Xml.Schema;
using System.Xml.Serialization;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.System.Xml
{
[TestFixture]
@ -159,7 +161,7 @@ namespace MonoTests.System.Xml
[Test]
public void TestSimpleImport ()
{
XmlSchema schema = XmlSchema.Read (new XmlTextReader ("Test/XmlFiles/xsd/3.xsd"), null);
XmlSchema schema = XmlSchema.Read (new XmlTextReader (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsd/3.xsd")), null);
Assert.AreEqual ("urn:foo", schema.TargetNamespace);
XmlSchemaImport import = schema.Includes [0] as XmlSchemaImport;
Assert.IsNotNull (import);
@ -177,7 +179,7 @@ namespace MonoTests.System.Xml
[Category ("MobileNotWorking")]
public void TestSimpleMutualImport ()
{
XmlReader r = new XmlTextReader ("Test/XmlFiles/xsd/inter-inc-1.xsd");
XmlReader r = new XmlTextReader (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsd/inter-inc-1.xsd"));
try {
XmlSchema.Read (r, null).Compile (null);
} finally {
@ -188,7 +190,7 @@ namespace MonoTests.System.Xml
[Test]
public void TestQualification ()
{
XmlSchema schema = XmlSchema.Read (new XmlTextReader ("Test/XmlFiles/xsd/5.xsd"), null);
XmlSchema schema = XmlSchema.Read (new XmlTextReader (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsd/5.xsd")), null);
schema.Compile (null);
XmlSchemaElement el = schema.Elements [QName ("Foo", "urn:bar")] as XmlSchemaElement;
Assert.IsNotNull (el);
@ -197,7 +199,7 @@ namespace MonoTests.System.Xml
XmlSchemaElement elp = seq.Items [0] as XmlSchemaElement;
Assert.AreEqual (QName ("Bar", ""), elp.QualifiedName);
schema = XmlSchema.Read (new XmlTextReader ("Test/XmlFiles/xsd/6.xsd"), null);
schema = XmlSchema.Read (new XmlTextReader (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsd/6.xsd")), null);
schema.Compile (null);
el = schema.Elements [QName ("Foo", "urn:bar")] as XmlSchemaElement;
Assert.IsNotNull (el);
@ -385,7 +387,7 @@ namespace MonoTests.System.Xml
// bug #77687
public void CompileFillsSchemaPropertyInExternal ()
{
string schemaFileName = "Test/XmlFiles/xsd/77687.xsd";
string schemaFileName = TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsd/77687.xsd");
XmlTextReader tr = new XmlTextReader (schemaFileName);
XmlSchema schema = XmlSchema.Read (tr, null);
@ -401,8 +403,8 @@ namespace MonoTests.System.Xml
// two different keys where one is in scope within another)
public void DuplicateKeyFieldAttributePath ()
{
string schemaFileName = "Test/XmlFiles/xsd/78985.xsd";
string xmlFileName = "Test/XmlFiles/xsd/78985.xml";
string schemaFileName = TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsd/78985.xsd");
string xmlFileName = TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsd/78985.xml");
XmlTextReader tr = new XmlTextReader (schemaFileName);
XmlValidatingReader vr = new XmlValidatingReader (
@ -415,7 +417,7 @@ namespace MonoTests.System.Xml
[Test]
public void ThreeLevelNestedInclusion ()
{
XmlTextReader r = new XmlTextReader ("Test/XmlFiles/xsd/361818.xsd");
XmlTextReader r = new XmlTextReader (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsd/361818.xsd"));
try {
XmlSchema xs = XmlSchema.Read (r, null);
xs.Compile (null);
@ -542,7 +544,7 @@ namespace MonoTests.System.Xml
public void TestResolveUri ()
{
XmlSchemaSet schemaSet = new XmlSchemaSet ();
FileStream stream = new FileStream ("Test/XmlFiles/xsd/resolveUriSchema.xsd", FileMode.Open, FileAccess.Read);
FileStream stream = new FileStream (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsd/resolveUriSchema.xsd"), FileMode.Open, FileAccess.Read);
schemaSet.Add ("http://tempuri.org/resolveUriSchema.xsd", new XmlTextReader (stream));
XmlTestResolver resolver = new XmlTestResolver ();
@ -578,7 +580,7 @@ namespace MonoTests.System.Xml
settings.Schemas.Add (schemaSet);
settings.ValidationType = ValidationType.Schema;
XmlReader reader = XmlReader.Create ("Test/XmlFiles/xsd/xsdimporttest.xml", settings);
XmlReader reader = XmlReader.Create (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsd/xsdimporttest.xml"), settings);
// Parse the file.
while (reader.Read()) {}

20
mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaValidatorTests.cs
View File

@ -15,6 +15,8 @@ using System.Xml;
using System.Xml.Schema;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.System.Xml
{
[TestFixture]
@ -36,7 +38,7 @@ namespace MonoTests.System.Xml
{
// bug #358408
XmlSchemaSet schemas = new XmlSchemaSet ();
schemas.Add (null, "Test/XmlFiles/xsd/358408.xsd");
schemas.Add (null, TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsd/358408.xsd"));
XmlSchemaValidator v = new XmlSchemaValidator (
new NameTable (),
schemas,
@ -83,12 +85,12 @@ namespace MonoTests.System.Xml
[Test]
public void SkipInvolved () // bug #422581
{
XmlReader schemaReader = XmlReader.Create ("Test/XmlFiles/xsd/422581.xsd");
XmlReader schemaReader = XmlReader.Create (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsd/422581.xsd"));
XmlSchema schema = XmlSchema.Read (schemaReader, null);
XmlReaderSettings settings = new XmlReaderSettings ();
settings.ValidationType = ValidationType.Schema;
settings.Schemas.Add (schema);
XmlReader reader = XmlReader.Create ("Test/XmlFiles/xsd/422581.xml", settings);
XmlReader reader = XmlReader.Create (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsd/422581.xml"), settings);
while (reader.Read ());
}
@ -149,8 +151,8 @@ namespace MonoTests.System.Xml
[Test]
public void Bug496192_496205 ()
{
using (var xmlr = new StreamReader ("Test/XmlFiles/496192.xml"))
using (var xsdr = new StreamReader ("Test/XmlFiles/496192.xsd"))
using (var xmlr = new StreamReader (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/496192.xml")))
using (var xsdr = new StreamReader (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/496192.xsd")))
Validate (xmlr.ReadToEnd (), xsdr.ReadToEnd ());
}
@ -293,8 +295,8 @@ namespace MonoTests.System.Xml
[Test]
public void Bug584664 ()
{
Validate (File.ReadAllText ("Test/XmlFiles/xsd/584664a.xml"), File.ReadAllText ("Test/XmlFiles/xsd/584664a.xsd"));
Validate (File.ReadAllText ("Test/XmlFiles/xsd/584664b.xml"), File.ReadAllText ("Test/XmlFiles/xsd/584664b.xsd"));
Validate (File.ReadAllText (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsd/584664a.xml")), File.ReadAllText (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsd/584664a.xsd")));
Validate (File.ReadAllText (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsd/584664b.xml")), File.ReadAllText (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsd/584664b.xsd")));
}
[Test]
@ -332,7 +334,7 @@ namespace MonoTests.System.Xml
public void FacetsOnBaseSimpleContentRestriction ()
{
XmlReaderSettings settings = new XmlReaderSettings ();
settings.Schemas.Add (null, "Test/XmlFiles/595947.xsd");
settings.Schemas.Add (null, TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/595947.xsd"));
settings.ValidationType = ValidationType.Schema;
settings.Schemas.Compile ();
@ -370,7 +372,7 @@ namespace MonoTests.System.Xml
[Test]
public void Bug676993 ()
{
Validate (File.ReadAllText ("Test/XmlFiles/676993.xml"), File.ReadAllText ("Test/XmlFiles/676993.xsd"));
Validate (File.ReadAllText (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/676993.xml")), File.ReadAllText (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/676993.xsd")));
}
[Test]

6
mcs/class/System.XML/Test/System.Xml.Serialization/ComplexDataStructure.cs
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 ();

4
mcs/class/System.XML/Test/System.Xml.Serialization/XmlCodeExporterTests.cs
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);

6
mcs/class/System.XML/Test/System.Xml.Serialization/XmlSchemaImporterTests.cs
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 ();

36
mcs/class/System.XML/Test/System.Xml.Xsl/XslTransformTests.cs
View File

@ -16,6 +16,8 @@ using System.Xml.XPath;
using System.Xml.Xsl;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.System.Xml.Xsl
{
[TestFixture]
@ -40,8 +42,8 @@ namespace MonoTests.System.Xml.Xsl
{
string output = Path.Combine (Path.GetTempPath (), "result.xml");
doc.LoadXml ("<root/>");
xslt.Load ("Test/XmlFiles/xsl/empty.xsl");
xslt.Transform ("Test/XmlFiles/xsl/empty.xsl", output);
xslt.Load (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsl/empty.xsl"));
xslt.Transform (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsl/empty.xsl"), output);
result.Load (output);
Assert.AreEqual (2, result.ChildNodes.Count, "count");
}
@ -380,10 +382,10 @@ xmlns:xsl='http://www.w3.org/1999/XSL/Transform' xmlns:msxsl='urn:schemas-micros
";
XmlDocument d = new XmlDocument ();
d.Load ("Test/XmlFiles/xsl/91834.xml");
d.Load (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsl/91834.xml"));
XslTransform t = new XslTransform ();
t.Load ("Test/XmlFiles/xsl/91834.xsl");
t.Load (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsl/91834.xsl"));
StringWriter sw_raw = new StringWriter ();
t.Transform (d, null, sw_raw);
@ -1912,9 +1914,9 @@ Services
";
XslTransform t = new XslTransform ();
t.Load ("Test/XmlFiles/xsl/stripspace.xsl");
t.Load (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsl/stripspace.xsl"));
XPathDocument d = new XPathDocument (
"Test/XmlFiles/xsl/stripspace.xml", XmlSpace.Preserve);
TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsl/stripspace.xml"), XmlSpace.Preserve);
StringWriter sw = new StringWriter ();
t.Transform (d, null, sw);
Assert.AreEqual (result, sw.ToString ());
@ -1924,13 +1926,13 @@ Services
public void CurrentInSelect ()
{
XslTransform t = new XslTransform ();
t.Load ("Test/XmlFiles/xsl/current-in-select.xsl");
t.Load (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsl/current-in-select.xsl"));
XPathDocument d = new XPathDocument (
"Test/XmlFiles/xsl/current-in-select.xml", XmlSpace.Preserve);
TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsl/current-in-select.xml"), XmlSpace.Preserve);
StringWriter sw = new StringWriter ();
t.Transform (d, null, sw);
using (StreamReader sr = File.OpenText (
"Test/XmlFiles/xsl/current-in-select.ref")) {
TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsl/current-in-select.ref"))) {
string s = sr.ReadToEnd ();
Assert.AreEqual (s, sw.ToString ());
}
@ -1959,9 +1961,9 @@ Services
public void Bug82493 ()
{
XslTransform transformationObj = new XslTransform ();
transformationObj.Load ("Test/XmlFiles/xsl/82493.xsl");
transformationObj.Load (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsl/82493.xsl"));
XmlDocument doc = new XmlDocument ();
doc.Load ("Test/XmlFiles/xsl/82493.xml");
doc.Load (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsl/82493.xml"));
XslExtensionClass GetCalculation = new XslExtensionClass ("a4");
XsltArgumentList xslExtensionArgList = new XsltArgumentList ();
xslExtensionArgList.AddExtensionObject ("urn:e", GetCalculation);
@ -1974,9 +1976,9 @@ Services
public void BugNovell325482 ()
{
XmlDocument doc = new XmlDocument ();
doc.Load ("Test/XmlFiles/xsl/325482.xml");
doc.Load (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsl/325482.xml"));
XslTransform xt = new XslTransform ();
xt.Load ("Test/XmlFiles/xsl/325482.xsl");
xt.Load (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsl/325482.xsl"));
xt.Transform (doc, null, TextWriter.Null);
}
@ -2167,8 +2169,8 @@ Services
[Test] // bug #316238
public void ResolveVariableInXsltArgumentList ()
{
ResolveVariableInXsltArgumentList ("Test/XmlFiles/xsl/316238-1.xsl");
ResolveVariableInXsltArgumentList ("Test/XmlFiles/xsl/316238-2.xsl");
ResolveVariableInXsltArgumentList (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsl/316238-1.xsl"));
ResolveVariableInXsltArgumentList (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsl/316238-2.xsl"));
}
void ResolveVariableInXsltArgumentList (string file)
@ -2360,9 +2362,9 @@ NO
XslCompiledTransform xslTransform = new XslCompiledTransform ();
XsltSettings settings = new XsltSettings ();
settings.EnableDocumentFunction = true;
xslTransform.Load ("Test/XmlFiles/xsl/391424.xsl", settings, new XmlUrlResolver ());
xslTransform.Load (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsl/391424.xsl"), settings, new XmlUrlResolver ());
StringWriter sw = new StringWriter ();
xslTransform.Transform (new XPathDocument ("Test/XmlFiles/xsl/391424.xml", XmlSpace.Preserve), null, sw);
xslTransform.Transform (new XPathDocument (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsl/391424.xml"), XmlSpace.Preserve), null, sw);
Assert.AreEqual ("<?xml version=\"1.0\" encoding=\"utf-16\"?>Document found", sw.ToString ());
}

4
mcs/class/System.XML/Test/System.Xml/XmlNodeTests.cs
View File

@ -16,6 +16,8 @@ using System.Xml;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.System.Xml
{
[TestFixture]
@ -448,7 +450,7 @@ namespace MonoTests.System.Xml
{
// See bug #64120.
XmlDocument doc = new XmlDocument ();
doc.Load ("Test/XmlFiles/simple.xml");
doc.Load (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/simple.xml"));
XmlElement el = doc.CreateElement ("foo");
Assert.AreEqual (String.Empty, el.BaseURI);
doc.DocumentElement.AppendChild (el);

6
mcs/class/System.XML/Test/System.Xml/XmlReaderCommonTests.cs
View File

@ -20,6 +20,8 @@ using System.Threading.Tasks;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.System.Xml
{
[TestFixture]
@ -1515,7 +1517,7 @@ namespace MonoTests.System.Xml
{
XmlReaderSettings s = new XmlReaderSettings ();
s.ProhibitDtd = false;
XmlReader xr = XmlReader.Create ("Test/XmlFiles/nested-dtd-test.xml", s);
XmlReader xr = XmlReader.Create (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/nested-dtd-test.xml"), s);
xr.Read ();
Assert.AreEqual (XmlNodeType.DocumentType, xr.NodeType, "#1");
xr.Read ();
@ -1528,7 +1530,7 @@ namespace MonoTests.System.Xml
[ExpectedException (typeof (XmlException))]
public void CreateSimpleProhibitDtd ()
{
XmlReader xr = XmlReader.Create ("Test/XmlFiles/nested-dtd-test.xml");
XmlReader xr = XmlReader.Create (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/nested-dtd-test.xml"));
xr.Read ();
}

12
mcs/class/System.XML/Test/System.Xml/XmlReaderSettingsTests.cs
View File

@ -18,6 +18,8 @@ using System.Reflection;
using ValidationFlags = System.Xml.Schema.XmlSchemaValidationFlags;
using AssertType = NUnit.Framework.Assert;
using MonoTests.Helpers;
namespace MonoTests.System.Xml
{
[TestFixture]
@ -150,7 +152,7 @@ namespace MonoTests.System.Xml
public void CreateAndSettings ()
{
Assert.IsNotNull (XmlReader.Create (CreateStream ("<xml/>")).Settings);
Assert.IsNotNull (XmlReader.Create ("Test/XmlFiles/simple.xml").Settings);
Assert.IsNotNull (XmlReader.Create (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/simple.xml")).Settings);
}
[Test]
@ -297,7 +299,7 @@ namespace MonoTests.System.Xml
public void CreateValidatorFromNonIXmlNamespaceResolver ()
{
XmlReaderSettings settings = new XmlReaderSettings ();
settings.Schemas.Add (null, "Test/XmlFiles/xsd/xml.xsd");
settings.Schemas.Add (null, TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsd/xml.xsd"));
settings.ValidationType = ValidationType.Schema;
XmlReader xr = XmlReader.Create (new StringReader ("<root/>"));
XmlReader dr = new Commons.Xml.XmlDefaultReader (xr);
@ -311,7 +313,7 @@ namespace MonoTests.System.Xml
{
XmlReaderSettings settings = new XmlReaderSettings ();
settings.XmlResolver = null;
using (XmlReader xr = XmlReader.Create ("Test/XmlFiles/simple.xml", settings)) {
using (XmlReader xr = XmlReader.Create (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/simple.xml"), settings)) {
while (!xr.EOF)
xr.Read ();
}
@ -335,7 +337,7 @@ namespace MonoTests.System.Xml
{
XmlReaderSettings settings = new XmlReaderSettings ();
settings.XmlResolver = new ThrowExceptionResolver ();
using (XmlReader xr = XmlReader.Create ("Test/XmlFiles/simple.xml", settings)) {
using (XmlReader xr = XmlReader.Create (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/simple.xml"), settings)) {
while (!xr.EOF)
xr.Read ();
}
@ -367,7 +369,7 @@ namespace MonoTests.System.Xml
XmlSchema xs = new XmlSchema ();
settings.Schemas.Add (xs);
settings.ValidationType = ValidationType.Schema;
using (XmlReader r = XmlReader.Create ("Test/XmlFiles/simple.xml", settings)) {
using (XmlReader r = XmlReader.Create (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/simple.xml"), settings)) {
r.Read ();
}
}

8
mcs/class/System.XML/Test/System.Xml/XmlTextReaderTests.cs
View File

@ -15,6 +15,8 @@ using System.Text;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.System.Xml
{
[TestFixture]
@ -651,7 +653,7 @@ namespace MonoTests.System.Xml
public void ExternalDocument ()
{
XmlDocument doc = new XmlDocument ();
doc.Load ("Test/XmlFiles/nested-dtd-test.xml");
doc.Load (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/nested-dtd-test.xml"));
}
[Test]
@ -868,7 +870,7 @@ namespace MonoTests.System.Xml
[Test]
public void CloseIsNotAlwaysEOF2 ()
{
XmlTextReader xtr = new XmlTextReader ("Test/XmlFiles/simple.xml");
XmlTextReader xtr = new XmlTextReader (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/simple.xml"));
xtr.Close ();
Assert.IsTrue (!xtr.EOF); // Close() != EOF
}
@ -1119,7 +1121,7 @@ namespace MonoTests.System.Xml
{
XmlTextReader xtr = null;
try {
xtr = new XmlTextReader (File.OpenText ("Test/XmlFiles/76102.xml"));
xtr = new XmlTextReader (File.OpenText (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/76102.xml")));
while (!xtr.EOF)
xtr.Read ();
} finally {

4
mcs/class/System.XML/Test/System.Xml/XmlUrlResolverTests.cs
View File

@ -12,6 +12,8 @@ using System.Xml;
using NUnit.Framework;
using System.Reflection;
using MonoTests.Helpers;
namespace MonoTests.System.Xml
{
[TestFixture]
@ -28,7 +30,7 @@ namespace MonoTests.System.Xml
[Test]
public void FileUri ()
{
Uri resolved = resolver.ResolveUri (null, "Test/XmlFiles/xsd/xml.xsd");
Uri resolved = resolver.ResolveUri (null, TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/xsd/xml.xsd"));
Assert.AreEqual ("file", resolved.Scheme);
Stream s = resolver.GetEntity (resolved, null, typeof (Stream)) as Stream;
}

4
mcs/class/System.XML/Test/System.Xml/XsdParticleValidationTests.cs
View File

@ -13,6 +13,8 @@ using NUnit.Framework;
using ValidationException = System.Xml.Schema.XmlSchemaValidationException;
using MonoTests.Helpers;
namespace MonoTests.System.Xml
{
// using XmlValidatingReader = XmlTextReader;
@ -26,7 +28,7 @@ namespace MonoTests.System.Xml
private void PrepareReader1 (string xsdUrl, string xml)
{
schema = XmlSchema.Read (new XmlTextReader ("Test/XmlFiles/XsdValidation/" + xsdUrl), null);
schema = XmlSchema.Read (new XmlTextReader (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/XsdValidation/" + xsdUrl)), null);
xr = new XmlTextReader (xml, XmlNodeType.Document, null);
xvr = new XmlValidatingReader (xr);
xvr.Schemas.Add (schema);

1266
mcs/class/System.XML/Test/System.Xml/XsdValidatingReaderTests.cs
View File

File diff suppressed because it is too large Load Diff

14
mcs/class/System.XML/Test/System.Xml/nist_dom/util.cs
View File

@ -14,6 +14,8 @@
using System;
using System.Xml;
using MonoTests.Helpers;
namespace nist_dom
{
public class XmlNodeArrayList : XmlNodeList
@ -117,12 +119,12 @@ namespace nist_dom
try
{
//System.Console.WriteLine(System.IO.Directory.GetCurrentDirectory());
masterDoc.Load("Test/System.Xml/nist_dom/files/staff.xml");
originalDoc.Load("Test/System.Xml/nist_dom/files/staff.xml");
masterXML.Load("Test/System.Xml/nist_dom/files/staff.html");
otherDoc.Load("Test/System.Xml/nist_dom/files/otherDoc.xml");
HTMLDoc.Load("Test/System.Xml/nist_dom/files/staff.html");
noDTDXMLObject.Load("Test/System.Xml/nist_dom/files/noDTDXMLfile.xml");
masterDoc.Load(TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/nist_dom/files/staff.xml"));
originalDoc.Load(TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/nist_dom/files/staff.xml"));
masterXML.Load(TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/nist_dom/files/staff.html"));
otherDoc.Load(TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/nist_dom/files/otherDoc.xml"));
HTMLDoc.Load(TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/nist_dom/files/staff.html"));
noDTDXMLObject.Load(TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/nist_dom/files/noDTDXMLfile.xml"));
}
catch (System.Exception ex)
{