Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/corefx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Deseyn <tom.deseyn@gmail.com>2017-06-02 10:28:47 +0300
committerTom Deseyn <tom.deseyn@gmail.com>2017-06-02 10:28:47 +0300
commit253fe52705ebbba72cb69d5fa37228b1d24dec49 (patch)
tree43f94b625eb88cd4125358c45a5c06d2f339c78c /src/System.Private.Xml/tests/Xslt
parente32aa7d98e006121e5115f9447ce9f661de281c0 (diff)
Uri: preserve backslash for file:/// uris on Unix
Diffstat (limited to 'src/System.Private.Xml/tests/Xslt')
-rw-r--r--src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XslTransformMultith.cs10
-rw-r--r--src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XsltArgumentListMultith.cs6
-rw-r--r--src/System.Private.Xml/tests/Xslt/XslTransformApi/CXsltArgumentListMultith.cs2
3 files changed, 9 insertions, 9 deletions
diff --git a/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XslTransformMultith.cs b/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XslTransformMultith.cs
index a15b046c08..719c96e0d4 100644
--- a/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XslTransformMultith.cs
+++ b/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XslTransformMultith.cs
@@ -29,7 +29,7 @@ namespace System.Xml.Tests
public new void Init(object objParam)
{
xsltSameInstance = new XslCompiledTransform();
- _strPath = Path.Combine(@"TestFiles\", FilePathUtil.GetTestDataPath(), @"XsltApiV2\");
+ _strPath = Path.Combine("TestFiles", FilePathUtil.GetTestDataPath(), "XsltApiV2");
return;
}
}
@@ -48,7 +48,7 @@ namespace System.Xml.Tests
public void Load(string _strXslFile, string _strXmlFile)
{
- _xrData = XmlReader.Create(_strPath + _strXmlFile);
+ _xrData = XmlReader.Create(Path.Combine(_strPath, _strXmlFile));
_xd = new XPathDocument(_xrData, XmlSpace.Preserve);
_xrData.Dispose();
@@ -56,7 +56,7 @@ namespace System.Xml.Tests
#pragma warning disable 0618
xrs.ProhibitDtd = false;
#pragma warning restore 0618
- XmlReader xrTemp = XmlReader.Create(_strPath + _strXslFile, xrs);
+ XmlReader xrTemp = XmlReader.Create(Path.Combine(_strPath, _strXslFile), xrs);
xsltSameInstance.Load(xrTemp);
}
@@ -362,7 +362,7 @@ namespace System.Xml.Tests
public void Load(string _strXslFile, string _strXmlFile)
{
- _xrData = XmlReader.Create(_strPath + _strXmlFile);
+ _xrData = XmlReader.Create(Path.Combine(_strPath, _strXmlFile));
_xd = new XPathDocument(_xrData, XmlSpace.Preserve);
_xrData.Dispose();
@@ -370,7 +370,7 @@ namespace System.Xml.Tests
#pragma warning disable 0618
xrs.ProhibitDtd = false;
#pragma warning restore 0618
- XmlReader xrTemp = XmlReader.Create(_strPath + _strXslFile, xrs);
+ XmlReader xrTemp = XmlReader.Create(Path.Combine(_strPath, _strXslFile), xrs);
xsltSameInstance.Load(xrTemp);
}
diff --git a/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XsltArgumentListMultith.cs b/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XsltArgumentListMultith.cs
index 1df71c169d..9a94fab58c 100644
--- a/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XsltArgumentListMultith.cs
+++ b/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XsltArgumentListMultith.cs
@@ -29,7 +29,7 @@ namespace System.Xml.Tests
public new void Init(object objParam)
{
// Get parameter info
- _strPath = Path.Combine(@"TestFiles\", FilePathUtil.GetTestDataPath(), @"XsltApiV2\");
+ _strPath = Path.Combine("TestFiles", FilePathUtil.GetTestDataPath(), "XsltApiV2");
xsltArg1 = new XsltArgumentList();
MyObject obj1 = new MyObject(1, _output);
@@ -246,9 +246,9 @@ namespace System.Xml.Tests
string _strXmlFile = ((object[])args)[2].ToString();
if (_strXslFile.Substring(0, 5) != "http:")
- _strXslFile = _strPath + _strXslFile;
+ _strXslFile = Path.Combine(_strPath, _strXslFile);
if (_strXmlFile.Substring(0, 5) != "http:")
- _strXmlFile = _strPath + _strXmlFile;
+ _strXmlFile = Path.Combine(_strPath, _strXmlFile);
XmlReader xrData = XmlReader.Create(_strXmlFile);
XPathDocument xd = new XPathDocument(xrData, XmlSpace.Preserve);
diff --git a/src/System.Private.Xml/tests/Xslt/XslTransformApi/CXsltArgumentListMultith.cs b/src/System.Private.Xml/tests/Xslt/XslTransformApi/CXsltArgumentListMultith.cs
index 57e1f1e5bf..b711520fcb 100644
--- a/src/System.Private.Xml/tests/Xslt/XslTransformApi/CXsltArgumentListMultith.cs
+++ b/src/System.Private.Xml/tests/Xslt/XslTransformApi/CXsltArgumentListMultith.cs
@@ -31,7 +31,7 @@ namespace System.Xml.Tests
public new void Init(object objParam)
{
// Get parameter info
- _strPath = Path.Combine(@"TestFiles\", FilePathUtil.GetTestDataPath(), @"XsltApi\");
+ _strPath = Path.Combine("TestFiles", FilePathUtil.GetTestDataPath(), "XsltApi");
xsltArg1 = new XsltArgumentList();