This site uses cookies. Visit our cookies policy page or click the link in any footer for more information and to change your preferences.

Accept all cookies Accept only essential cookies

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 e5e83225 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

use new xml report implementation in testcases

parent 7226a86f
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
VectoCore/VectoCoreTest/Integration/XMLReportTest.cs
+ 26
− 24
View file @ e5e83225
......@@ -80,7 +80,7 @@ namespace TUGraz.VectoCore.Tests.Integration
var jobfile = @"Testdata\XML\XMLReaderDeclaration\vecto_vehicle-sample.xml";
var dataProvider = xmlInputReader.CreateDeclaration(jobfile);
var writer = new FileOutputWriter(InputDataHelper.GetRandomFilename(jobfile));
var xmlReport = new XMLDeclarationReport(writer);
var xmlReport = _kernel.Get<IXMLDeclarationReportFactory>().CreateReport(dataProvider, writer);
var sumData = new SummaryDataContainer(writer);
var jobContainer = new JobContainer(sumData);
......@@ -100,15 +100,15 @@ namespace TUGraz.VectoCore.Tests.Integration
// no need to run the simulation, we only check whether the meta-data is correct, no results are considered
//jobContainer.Execute();
//jobContainer.WaitFinished();
xmlReport.DoWriteReport();
(xmlReport as XMLDeclarationReport09).DoWriteReport();
var manufacturerReport = xmlReport.FullReport;
var manufacturerReport = (xmlReport as XMLDeclarationReport09).FullReport;
Assert.AreEqual(5, manufacturerReport.XPathSelectElement("//*[local-name()='VehicleGroup']")?.Value.ToInt());
Assert.IsFalse(XmlConvert.ToBoolean(manufacturerReport.XPathSelectElement("//*[local-name()='PTO']").Value));
Assert.IsFalse(XmlConvert.ToBoolean(manufacturerReport.XPathSelectElement("//*[local-name()='PowerTakeOff']").Value));
var reportWheels = manufacturerReport.XPathSelectElements("//*[local-name()='TyreCertificationNumber']").ToList();
var reportWheels = manufacturerReport.XPathSelectElements("//*[local-name()='Tyre']/*[local-name()='CertificationNumber']").ToList();
Assert.AreEqual(dataProvider.JobInputData.Vehicle.Components.AxleWheels.AxlesDeclaration.Count, reportWheels.Count);
var i = 0;
......@@ -116,7 +116,7 @@ namespace TUGraz.VectoCore.Tests.Integration
Assert.AreEqual(axleDeclarationInputData.Tyre.CertificationNumber, reportWheels[i++].Value);
}
var digestWheels = manufacturerReport.XPathSelectElements("//*[local-name()='Axle']/*[local-name()='DigestValue']").ToArray();
var digestWheels = manufacturerReport.XPathSelectElements("//*[local-name()='Axle']/*[local-name()='Tyre']/*[local-name()='DigestValue']").ToArray();
Assert.NotNull(digestWheels);
Assert.AreEqual(2, digestWheels.Count());
foreach (var digestWheel in digestWheels) {
......@@ -138,7 +138,7 @@ namespace TUGraz.VectoCore.Tests.Integration
{
var dataProvider = xmlInputReader.CreateDeclaration(jobfile);
var writer = new FileOutputWriter(jobfile);
var xmlReport = new XMLDeclarationReport(writer);
var xmlReport = _kernel.Get<IXMLDeclarationReportFactory>().CreateReport(dataProvider, writer);
var sumData = new SummaryDataContainer(writer);
var jobContainer = new JobContainer(sumData);
......@@ -155,9 +155,9 @@ namespace TUGraz.VectoCore.Tests.Integration
// no need to run the simulation, we only check whether the meta-data is correct, no results are considered
jobContainer.Execute();
jobContainer.WaitFinished();
xmlReport.DoWriteReport();
(xmlReport as XMLDeclarationReport09).DoWriteReport();
var customerReport = xmlReport.CustomerReport;
var customerReport = (xmlReport as XMLDeclarationReport09).CustomerReport;
//check if the customerReport contains the summary XML-Element
Assert.AreNotEqual(null,customerReport.XPathSelectElement("//*[local-name()='Summary']"));
......@@ -169,7 +169,7 @@ namespace TUGraz.VectoCore.Tests.Integration
{
var dataProvider = xmlInputReader.CreateDeclaration(jobfile);
var writer = new FileOutputWriter(InputDataHelper.GetRandomFilename(jobfile));
var xmlReport = new XMLDeclarationReport(writer);
var xmlReport = _kernel.Get<IXMLDeclarationReportFactory>().CreateReport(dataProvider, writer);
var sumData = new SummaryDataContainer(writer);
var jobContainer = new JobContainer(sumData);
......@@ -189,10 +189,10 @@ namespace TUGraz.VectoCore.Tests.Integration
jobContainer.Execute();
jobContainer.WaitFinished();
var mrfValidator = GetValidator(xmlReport.FullReport);
var mrfValidator = GetValidator((xmlReport as XMLDeclarationReport09).FullReport);
mrfValidator.ValidateXML(XmlDocumentType.DeclarationComponentData | XmlDocumentType.DeclarationJobData | XmlDocumentType.CustomerReport | XmlDocumentType.ManufacturerReport);
var cifValidator = GetValidator(xmlReport.CustomerReport);
var cifValidator = GetValidator((xmlReport as XMLDeclarationReport09).CustomerReport);
cifValidator.ValidateXML(XmlDocumentType.DeclarationComponentData | XmlDocumentType.DeclarationJobData | XmlDocumentType.CustomerReport | XmlDocumentType.ManufacturerReport);
//var monitoringValidator = GetValidator(xmlReport.MonitoringReport);
......@@ -259,13 +259,15 @@ namespace TUGraz.VectoCore.Tests.Integration
ptoOtherNode.SetValue(ptoOther);
var modified = XmlReader.Create(new StringReader(nav.OuterXml));
var dataProvider = xmlInputReader.CreateDeclaration(modified);
var writer = new FileOutputWriter(InputDataHelper.GetRandomFilename(jobfile));
var xmlReport = new XMLDeclarationReport(writer);
var xmlReport = _kernel.Get<IXMLDeclarationReportFactory>()
.CreateReport(dataProvider, writer);
var sumData = new SummaryDataContainer(writer);
var jobContainer = new JobContainer(sumData);
var dataProvider = xmlInputReader.CreateDeclaration(modified);
var runsFactory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, dataProvider, writer,
xmlReport, validate: false);
......@@ -276,13 +278,13 @@ namespace TUGraz.VectoCore.Tests.Integration
//};
jobContainer.AddRuns(runsFactory);
xmlReport.DoWriteReport();
(xmlReport as XMLDeclarationReport09).DoWriteReport();
var manufacturerReport = xmlReport.FullReport;
var manufacturerReport = (xmlReport as XMLDeclarationReport09).FullReport;
Assert.AreEqual(
ptoGearWheel != "none",
XmlConvert.ToBoolean(manufacturerReport.XPathSelectElement("//*[local-name()='PTO']").Value),
XmlConvert.ToBoolean(manufacturerReport.XPathSelectElement("//*[local-name()='PowerTakeOff']").Value),
"PTO Type: {0} {1}", ptoGearWheel, ptoOther);
}
......@@ -296,7 +298,7 @@ namespace TUGraz.VectoCore.Tests.Integration
var jobfile = @"Testdata\XML\XMLReaderDeclaration\vecto_vehicle-sample.xml";
var dataProvider = xmlInputReader.CreateDeclaration(jobfile);
var writer = new FileOutputWriter(InputDataHelper.GetRandomFilename(jobfile));
var xmlReport = new XMLDeclarationReport(writer);
var xmlReport = _kernel.Get<IXMLDeclarationReportFactory>().CreateReport(dataProvider, writer);
var sumData = new SummaryDataContainer(writer);
var jobContainer = new JobContainer(sumData);
......@@ -316,23 +318,23 @@ namespace TUGraz.VectoCore.Tests.Integration
// no need to run the simulation, we only check whether the meta-data is correct, no results are considered
//jobContainer.Execute();
//jobContainer.WaitFinished();
xmlReport.DoWriteReport();
(xmlReport as XMLDeclarationReport09).DoWriteReport();
var inputHash = VectoHash.Load(jobfile);
var mrfDigestData = new DigestData(xmlReport.FullReport.Document.XPathSelectElement("//*[local-name()='InputDataSignature']"));
var mrfDigestData = new DigestData((xmlReport as XMLDeclarationReport09).FullReport.Document.XPathSelectElement("//*[local-name()='InputDataSignature']"));
var mrfInputDigest = inputHash.ComputeHash(mrfDigestData.CanonicalizationMethods, mrfDigestData.DigestMethod);
Assert.AreEqual(mrfInputDigest, mrfDigestData.DigestValue);
var cifDigestData = new DigestData(xmlReport.CustomerReport.Document.XPathSelectElement("//*[local-name()='InputDataSignature']"));
var cifDigestData = new DigestData((xmlReport as XMLDeclarationReport09).CustomerReport.Document.XPathSelectElement("//*[local-name()='InputDataSignature']"));
var cifInputDigest = inputHash.ComputeHash(cifDigestData.CanonicalizationMethods, cifDigestData.DigestMethod);
Assert.AreEqual(cifInputDigest, cifDigestData.DigestValue);
var mrfHash = VectoHash.Load(writer.XMLFullReportName);
var mrfCifDigestData = new DigestData(xmlReport.CustomerReport.Document.XPathSelectElement("//*[local-name()='ResultDataSignature']"));
var mrfCifDigestData = new DigestData((xmlReport as XMLDeclarationReport09).CustomerReport.Document.XPathSelectElement("//*[local-name()='ManufacturerRecordSignature']"));
var mrfCifDigest = mrfHash.ComputeHash(mrfCifDigestData.CanonicalizationMethods, mrfCifDigestData.DigestMethod);
Assert.AreEqual(mrfCifDigest, mrfCifDigestData.DigestValue);
......@@ -345,7 +347,7 @@ namespace TUGraz.VectoCore.Tests.Integration
var jobfile = @"Testdata\XML\XMLReaderDeclaration\SchemaVersion2.4/vecto_vehicle-primary_heavyBus-sample.xml";
var dataProvider = xmlInputReader.CreateDeclaration(jobfile);
var writer = new FileOutputWriter(jobfile);
var xmlReport = new XMLDeclarationReport(writer);
var xmlReport = _kernel.Get<IXMLDeclarationReportFactory>().CreateReport(dataProvider, writer);
var sumData = new SummaryDataContainer(writer);
var jobContainer = new JobContainer(sumData);
......@@ -365,7 +367,7 @@ namespace TUGraz.VectoCore.Tests.Integration
// no need to run the simulation, we only check whether the meta-data is correct, no results are considered
//jobContainer.Execute();
//jobContainer.WaitFinished();
xmlReport.DoWriteReport();
(xmlReport as XMLDeclarationReport09).DoWriteReport();
}
}
}
VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationAdapterCreateVocationalVehicleTest.cs
+ 3
− 3
View file @ e5e83225
......@@ -57,7 +57,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration.DataAdapter
var dataProvider = xmlInputReader.CreateDeclaration(modified);
var writer = new FileOutputWriter(jobfile);
var xmlReport = new XMLDeclarationReport(writer);
var xmlReport = _kernel.Get<IXMLDeclarationReportFactory>().CreateReport(dataProvider, writer);
var sumData = new SummaryDataContainer(null);
var jobContainer = new JobContainer(sumData);
......@@ -69,9 +69,9 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration.DataAdapter
// no need to run the simulation, we only check whether the meta-data is correct, no results are considered
//jobContainer.Execute();
//jobContainer.WaitFinished();
xmlReport.DoWriteReport();
(xmlReport as XMLDeclarationReport09).DoWriteReport();
var manufacturerReport = xmlReport.FullReport;
var manufacturerReport = (xmlReport as XMLDeclarationReport09).FullReport;
Assert.IsFalse(XmlConvert.ToBoolean(manufacturerReport.XPathSelectElement(XMLHelper.QueryLocalName(XMLNames.Vehicle_VocationalVehicle))?.Value ?? ""));
}
......
VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
+ 2
− 1
View file @ e5e83225
......@@ -257,7 +257,8 @@ namespace TUGraz.VectoCore.Tests.Reports
var jobfile = @"Testdata\XML\XMLReaderDeclaration\vecto_vehicle-sample.xml";
var dataProvider = xmlInputReader.CreateDeclaration(jobfile);
var writer = new FileOutputWriter(jobfile);
var xmlReport = new XMLDeclarationReport(writer);
//var xmlReport = new XMLDeclarationReport09(writer);
var xmlReport = _kernel.Get<IXMLDeclarationReportFactory>().CreateReport(dataProvider, writer);
var sumData = new SummaryDataContainer(writer);
var jobContainer = new JobContainer(sumData);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about