Skip to content

Commit c6003c7

Browse files
MaximysMaximys
committed
fix(#93189): Fix invalid test.
1 parent 970070e commit c6003c7

File tree

2 files changed

+87
-82
lines changed

2 files changed

+87
-82
lines changed

‎src/libraries/System.Private.Xml/tests/Xslt/TestFiles/TestData/XsltApiV2/baseline/bug93189.xml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<out xmlns:ms="urn:schemas-microsoft-com:xslt">
3-
<dates>
4-
<test1>Monday, June 15, 2009</test1>
5-
<test2>6/15/2009</test2>
6-
<test3>6/15/2009 1:45:30 PM</test3>
7-
<test4>6/15/2009</test4>
8-
<test5>lundi 15 juin 2009</test5>
9-
<test6>15/06/2009</test6>
10-
</dates>
3+
<dates>
4+
<test1>Monday, 15 June 2009</test1>
5+
<test2>06/15/2009</test2>
6+
<test3>06/15/2009 13:45:30</test3>
7+
<test4>6/15/2009</test4>
8+
<test5>lundi 15 juin 2009</test5>
9+
<test6>15/06/2009</test6>
10+
</dates>
1111
<times>
12-
<test1>1:45:30 PM</test1>
13-
<test2>1:45 PM</test2>
14-
<test3>6/15/2009 1:45:30 PM</test3>
15-
<test4>1:45 PM</test4>
16-
<test5>13:45:30</test5>
17-
<test6>13:45</test6>
18-
</times>
12+
<test1>13:45:30</test1>
13+
<test2>13:45</test2>
14+
<test3>06/15/2009 13:45:30</test3>
15+
<test4>1:45 PM</test4>
16+
<test5>13:45:30</test5>
17+
<test6>13:45</test6>
18+
</times>
1919
</out>

‎src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XslCompiledTransform.cs‎

Lines changed: 72 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
using System.Collections;
55
using System.Collections.Generic;
66
using System.Diagnostics;
7+
using System.Globalization;
78
using System.IO;
89
using System.Reflection;
910
using System.Reflection.Emit;
1011
using System.Runtime.Loader;
12+
using System.Tests;
1113
using System.Text;
1214
using System.Xml.Tests;
1315
using System.Xml.XPath;
@@ -3169,84 +3171,87 @@ public void ValidCases_ExternalURI(object param0, object param1, object param2,
31693171
[Theory]
31703172
public void ValidCases(object param0, object param1, object param2, object param3, object param4, object param5)
31713173
{
3172-
string xslFile = FullFilePath(param0 as string);
3173-
string xmlFile = FullFilePath(param1 as string);
3174-
string baseLineFile = Path.Combine("baseline", param2 as string);
3175-
bool expectedResult = (bool)param4;
3176-
bool actualResult = false;
3174+
using (new ThreadCultureChange(CultureInfo.InvariantCulture))
3175+
{
3176+
string xslFile = FullFilePath(param0 as string);
3177+
string xmlFile = FullFilePath(param1 as string);
3178+
string baseLineFile = Path.Combine("baseline", param2 as string);
3179+
bool expectedResult = (bool)param4;
3180+
bool actualResult = false;
31773181

3178-
XmlReader xmlReader = XmlReader.Create(xmlFile);
3179-
//Let's select randomly how to create navigator
3180-
IXPathNavigable navigator = null;
3181-
Random randGenerator = new Random(unchecked((int)DateTime.Now.Ticks));
3182-
switch (randGenerator.Next(2))
3183-
{
3184-
case 0:
3185-
_output.WriteLine("Using XmlDocument.CreateNavigator()");
3186-
XmlDocument xmlDoc = new XmlDocument();
3187-
xmlDoc.Load(xmlFile);
3188-
navigator = xmlDoc.CreateNavigator();
3189-
break;
3190-
3191-
case 1:
3192-
_output.WriteLine("Using XPathDocument.CreateNavigator()");
3193-
XPathDocument xpathDoc;
3194-
using (XmlReader reader = XmlReader.Create(xmlFile))
3195-
{
3196-
xpathDoc = new XPathDocument(reader);
3197-
navigator = xpathDoc.CreateNavigator();
3198-
}
3199-
break;
3182+
XmlReader xmlReader = XmlReader.Create(xmlFile);
3183+
//Let's select randomly how to create navigator
3184+
IXPathNavigable navigator = null;
3185+
Random randGenerator = new Random(unchecked((int)DateTime.Now.Ticks));
3186+
switch (randGenerator.Next(2))
3187+
{
3188+
case 0:
3189+
_output.WriteLine("Using XmlDocument.CreateNavigator()");
3190+
XmlDocument xmlDoc = new XmlDocument();
3191+
xmlDoc.Load(xmlFile);
3192+
navigator = xmlDoc.CreateNavigator();
3193+
break;
32003194

3201-
default:
3202-
break;
3203-
}
3195+
case 1:
3196+
_output.WriteLine("Using XPathDocument.CreateNavigator()");
3197+
XPathDocument xpathDoc;
3198+
using (XmlReader reader = XmlReader.Create(xmlFile))
3199+
{
3200+
xpathDoc = new XPathDocument(reader);
3201+
navigator = xpathDoc.CreateNavigator();
3202+
}
3203+
break;
32043204

3205-
XmlResolver resolver = null;
3206-
switch (param3 as string)
3207-
{
3208-
case "NullResolver":
3209-
break;
3205+
default:
3206+
break;
3207+
}
32103208

3211-
case "XmlUrlResolver":
3212-
resolver = new XmlUrlResolver();
3213-
break;
3209+
XmlResolver resolver = null;
3210+
switch (param3 as string)
3211+
{
3212+
case "NullResolver":
3213+
break;
32143214

3215-
case "CustomXmlResolver":
3216-
resolver = new CustomXmlResolver(Path.GetFullPath(Path.Combine(FilePathUtil.GetTestDataPath(), @"XsltApiV2")));
3217-
break;
3215+
case "XmlUrlResolver":
3216+
resolver = new XmlUrlResolver();
3217+
break;
32183218

3219-
default:
3220-
break;
3221-
}
3219+
case "CustomXmlResolver":
3220+
resolver = new CustomXmlResolver(Path.GetFullPath(Path.Combine(FilePathUtil.GetTestDataPath(), @"XsltApiV2")));
3221+
break;
32223222

3223-
try
3224-
{
3225-
XslCompiledTransform localXslt = new XslCompiledTransform();
3226-
XsltSettings settings = new XsltSettings(true, true);
3227-
using (XmlReader xslReader = XmlReader.Create(xslFile))
3228-
localXslt.Load(xslReader, settings, resolver);
3223+
default:
3224+
break;
3225+
}
32293226

3230-
using (XmlWriter writer = XmlWriter.Create("outputFile.txt"))
3227+
try
32313228
{
3232-
if (param5 as string == "XmlReader")
3233-
localXslt.Transform(xmlReader, null, writer, resolver);
3234-
else
3235-
localXslt.Transform(navigator, null, writer, resolver);
3236-
}
3237-
VerifyResult(baseLineFile, "outputFile.txt");
3238-
actualResult = true;
3239-
}
3240-
catch (Exception ex)
3241-
{
3242-
_output.WriteLine(ex.Message);
3243-
actualResult = false;
3244-
}
3229+
XslCompiledTransform localXslt = new XslCompiledTransform();
3230+
XsltSettings settings = new XsltSettings(true, true);
3231+
using (XmlReader xslReader = XmlReader.Create(xslFile))
3232+
localXslt.Load(xslReader, settings, resolver);
32453233

3246-
if (actualResult != expectedResult)
3247-
Assert.Fail();
3234+
using (XmlWriter writer = XmlWriter.Create("outputFile.txt"))
3235+
{
3236+
if (param5 as string == "XmlReader")
3237+
localXslt.Transform(xmlReader, null, writer, resolver);
3238+
else
3239+
localXslt.Transform(navigator, null, writer, resolver);
3240+
}
3241+
VerifyResult(baseLineFile, "outputFile.txt");
3242+
actualResult = true;
3243+
}
3244+
catch (Exception ex)
3245+
{
3246+
_output.WriteLine(ex.Message);
3247+
actualResult = false;
3248+
}
32483249

3249-
return;
3250+
if (actualResult != expectedResult)
3251+
{
3252+
Assert.Fail();
3253+
}
3254+
}
32503255
}
32513256

32523257
//[Variation("Invalid Arguments: null, valid, valid, valid", Pri = 0, Params = new object[] { 1, false })]

0 commit comments

Comments
 (0)