Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 81e207ec authored by VKMTHD\franzjosefkober's avatar VKMTHD\franzjosefkober
Browse files

closed xml file readers to prevent IOException

parent fedefc53
No related branches found
No related tags found
No related merge requests found
......@@ -69,11 +69,13 @@ namespace VectoEngineTest
Assert.IsTrue(success);
var componentFile = Path.Combine(Job.OutPath, string.Format("{0}_{1}.xml", Job.Manufacturer, Job.Model));
var xml = XDocument.Load(new XmlTextReader(componentFile));
var expectedXml =
XDocument.Load(new XmlTextReader(Path.Combine(basepath, @"ExpectedResults\Dual fuel.xml")));
var componentFile = Path.Combine(Job.OutPath, $"{Job.Manufacturer}_{Job.Model}.xml");
using (var componentXmlReader = new XmlTextReader(componentFile))
{
using (var expectedXmlReader = new XmlTextReader(Path.Combine(basepath, @"ExpectedResults\Dual fuel.xml")))
{
var xml = XDocument.Load(componentXmlReader);
var expectedXml = XDocument.Load(expectedXmlReader);
AssertHelper.FullLoadCurvesAreEqual(
xml.XPathSelectElement(XMLHelper.QueryLocalName("FullLoadAndDragCurve")),
......@@ -92,6 +94,8 @@ namespace VectoEngineTest
xml.XPathSelectElements(XMLHelper.QueryLocalName("Mode", "Fuel")).ToArray()[1],
expectedXml.XPathSelectElements(XMLHelper.QueryLocalName("Mode", "Fuel")).ToArray()[1]);
}
}
}
private static string CreateOutputDirectory(string jobDir)
{
......
......@@ -71,8 +71,10 @@ namespace VectoEngineTest
Assert.IsTrue(success);
var componentFile = Path.Combine(Job.OutPath, string.Format("{0}_{1}.xml", Job.Manufacturer, Job.Model));
var xml = XDocument.Load(new XmlTextReader(componentFile));
var componentFile = Path.Combine(Job.OutPath, $"{Job.Manufacturer}_{Job.Model}.xml");
using (var xmlReader = new XmlTextReader(componentFile))
{
var xml = XDocument.Load(xmlReader);
Assert.AreEqual(1.0, GetDoubleValue(xml, "WHTCUrban"), 1e-4);
Assert.AreEqual(1.0741, GetDoubleValue(xml, "WHTCRural"), 1e-4);
......@@ -81,6 +83,7 @@ namespace VectoEngineTest
Assert.AreEqual(1.0, GetDoubleValue(xml, "CFRegPer"), 1e-4);
Assert.AreEqual(1.6459, GetDoubleValue(xml, "CFNCV"), 1e-4);
}
}
[TestMethod]
public void TestNegativeTorqueFullLoad()
......@@ -124,7 +127,7 @@ namespace VectoEngineTest
Assert.IsFalse(success);
var componentFile = Path.Combine(Job.OutPath, string.Format("{0}_{1}.xml", Job.Manufacturer, Job.Model));
var componentFile = Path.Combine(Job.OutPath, $"{Job.Manufacturer}_{Job.Model}.xml");
Assert.IsFalse(File.Exists(componentFile));
}
......@@ -171,11 +174,13 @@ namespace VectoEngineTest
Assert.IsTrue(success);
var componentFile = Path.Combine(Job.OutPath, string.Format("{0}_{1}.xml", Job.Manufacturer, Job.Model));
var xml = XDocument.Load(new XmlTextReader(componentFile));
var expectedXml =
XDocument.Load(new XmlTextReader(Path.Combine(basepath, @"ExpectedResults\Single fuel.xml")));
var componentFile = Path.Combine(Job.OutPath, $"{Job.Manufacturer}_{Job.Model}.xml");
using (var componentXmlReader = new XmlTextReader(componentFile))
{
using (var expectedXmlReader = new XmlTextReader(Path.Combine(basepath, @"ExpectedResults\Single fuel.xml")))
{
var xml = XDocument.Load(componentXmlReader);
var expectedXml = XDocument.Load(expectedXmlReader);
AssertHelper.FullLoadCurvesAreEqual(
xml.XPathSelectElement(XMLHelper.QueryLocalName("FullLoadAndDragCurve")),
......@@ -187,6 +192,8 @@ namespace VectoEngineTest
// xml.XPathSelectElement(XMLHelper.QueryLocalName("Mode", "Fuel")),
// expectedXml.XPathSelectElement(XMLHelper.QueryLocalName("Mode", "Fuel")));
}
}
}
private double GetDoubleValue(XDocument xml, string elementName)
......
......@@ -93,11 +93,13 @@ namespace VectoEngineTest
Assert.IsTrue(success);
var componentFile = Path.Combine(Job.OutPath, string.Format("{0}_{1}.xml", Job.Manufacturer, Job.Model));
var xml = XDocument.Load(new XmlTextReader(componentFile));
var expectedXml =
XDocument.Load(new XmlTextReader(Path.Combine(basepath, @"ExpectedResults\Dual fuel+WHR_el.xml")));
var componentFile = Path.Combine(Job.OutPath, $"{Job.Manufacturer}_{Job.Model}.xml");
using (var componentXmlReader = new XmlTextReader(componentFile))
{
using (var expectedXmlReader = new XmlTextReader(Path.Combine(basepath, @"ExpectedResults\Dual fuel+WHR_el.xml")))
{
var xml = XDocument.Load(componentXmlReader);
var expectedXml = XDocument.Load(expectedXmlReader);
AssertHelper.FullLoadCurvesAreEqual(
xml.XPathSelectElement(XMLHelper.QueryLocalName("FullLoadAndDragCurve")),
......@@ -123,6 +125,8 @@ namespace VectoEngineTest
xml.XPathSelectElement(XMLHelper.QueryLocalName("Mode", "Fuel", "WHRCorrectionFactors", "Electrical")),
expectedXml.XPathSelectElement(XMLHelper.QueryLocalName("Mode", "Fuel", "WHRCorrectionFactors", "Electrical")));
}
}
}
[TestMethod]
......@@ -186,11 +190,14 @@ namespace VectoEngineTest
Assert.IsTrue(success);
var componentFile = Path.Combine(Job.OutPath, string.Format("{0}_{1}.xml", Job.Manufacturer, Job.Model));
var xml = XDocument.Load(new XmlTextReader(componentFile));
var expectedXml =
XDocument.Load(new XmlTextReader(Path.Combine(basepath, @"ExpectedResults\Dual fuel+WHR_mech.xml")));
var componentFile = Path.Combine(Job.OutPath, $"{Job.Manufacturer}_{Job.Model}.xml");
using (var componentXmlReader = new XmlTextReader(componentFile))
{
using (var expectedXmlReader =
new XmlTextReader(Path.Combine(basepath, @"ExpectedResults\Dual fuel+WHR_mech.xml")))
{
var xml = XDocument.Load(componentXmlReader);
var expectedXml = XDocument.Load(expectedXmlReader);
AssertHelper.FullLoadCurvesAreEqual(
xml.XPathSelectElement(XMLHelper.QueryLocalName("FullLoadAndDragCurve")),
......@@ -214,7 +221,10 @@ namespace VectoEngineTest
expectedXml.XPathSelectElement(XMLHelper.QueryLocalName("FuelConsumptionMap")), "mechanicalPower");
AssertHelper.WHRCorrectionFactorsAreEqual(
xml.XPathSelectElement(XMLHelper.QueryLocalName("Mode", "Fuel", "WHRCorrectionFactors", "Mechanical")),
expectedXml.XPathSelectElement(XMLHelper.QueryLocalName("Mode", "Fuel", "WHRCorrectionFactors", "Mechanical")));
expectedXml.XPathSelectElement(XMLHelper.QueryLocalName("Mode", "Fuel", "WHRCorrectionFactors",
"Mechanical")));
}
}
}
private static string CreateOutputDirectory(string jobDir)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment