diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs index 75d495f288d41927c7a0715de7138c1a106f1c14..232ac66901c97c98f95e948b3583dba45e074bb9 100644 --- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs +++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs @@ -131,6 +131,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl _segment.VehicleClass), InputDataHash = InputDataProvider.XMLHash }; + powertrainConfig.VehicleData.VehicleClass = _segment.VehicleClass; Report.InitializeReport(powertrainConfig); } @@ -205,4 +206,4 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl return DeclarationData.Segments.Lookup(category, axles, grossMassRating, curbWeight); } } -} \ No newline at end of file +} diff --git a/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs b/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs new file mode 100644 index 0000000000000000000000000000000000000000..3c1c38f3cec176266f12068808d12897ac515eb9 --- /dev/null +++ b/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs @@ -0,0 +1,52 @@ +using System.IO; +using System.Xml; +using System.Xml.XPath; +using NUnit.Framework; +using TUGraz.VectoCommon.Models; +using TUGraz.VectoCommon.Utils; +using TUGraz.VectoCore.InputData.FileIO.XML.Declaration; +using TUGraz.VectoCore.Models.Simulation.Impl; +using TUGraz.VectoCore.OutputData; +using TUGraz.VectoCore.OutputData.FileIO; +using TUGraz.VectoCore.OutputData.XML; + + +namespace TUGraz.VectoCore.Tests.Integration +{ + [TestFixture] + public class XMLReportTest + { + [OneTimeSetUp] + public void RunBeforeAnyTests() + { + Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory); + } + + [TestCase] + public void TestXMLReportMetaInformation() + { + var jobfile = @"Testdata\XML\XMLReaderDeclaration\vecto_vehicle-sample.xml"; + var dataProvider = new XMLDeclarationInputDataProvider(XmlReader.Create(jobfile), true); + var writer = new FileOutputWriter(jobfile); + var xmlReport = new XMLDeclarationReport(writer); + var sumData = new SummaryDataContainer(writer); + var jobContainer = new JobContainer(sumData); + + if (File.Exists(writer.SumFileName)) { + File.Delete(writer.SumFileName); + } + + var runsFactory = new SimulatorFactory(ExecutionMode.Declaration, dataProvider, writer, xmlReport) { + WriteModalResults = false, + Validate = false, + }; + jobContainer.AddRuns(runsFactory); + jobContainer.Execute(); + jobContainer.WaitFinished(); + + var manufacturerReport = xmlReport.FullReport; + + Assert.AreEqual(5, manufacturerReport.XPathSelectElement("//*[local-name()='VehicleGroup']").Value.ToInt()); + } + } +} diff --git a/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs b/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs index e9fece1934fa6467437e42f614403aa5a33ccb32..ab32be6c4e0e912c76aefd97dc27082781f3a83e 100644 --- a/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs +++ b/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs @@ -46,7 +46,7 @@ using NUnit.Framework; namespace TUGraz.VectoCore.Tests.Reports { - [TestFixture] + [TestFixture] public class SumWriterTest { [TestCase] @@ -162,7 +162,7 @@ namespace TUGraz.VectoCore.Tests.Reports public void TestSumDataMetaInformation() { var jobfile = @"Testdata\XML\XMLReaderDeclaration\vecto_vehicle-sample.xml"; - var dataProvider = new XMLDeclarationInputDataProvider(XmlTextReader.Create(jobfile), true); + var dataProvider = new XMLDeclarationInputDataProvider(XmlReader.Create(jobfile), true); var writer = new FileOutputWriter(jobfile); var xmlReport = new XMLDeclarationReport(writer); var sumData = new SummaryDataContainer(writer); diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj index 189d8317a5433025470dec368f568b3dd3471ed2..62814703740d5442c60e44f07c7df037e26d072c 100644 --- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj +++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj @@ -98,6 +98,7 @@ <Compile Include="Integration\ShiftStrategy\ShiftStrategyTest.cs" /> <Compile Include="Integration\TestVehicleIdlingSpeed.cs" /> <Compile Include="Integration\TorqueLimitsTest.cs" /> + <Compile Include="Integration\XMLReportTest.cs" /> <Compile Include="Models\Declaration\AirdragDefaultValuesTest.cs" /> <Compile Include="Models\Declaration\DataAdapter\DeclarationAdapterTestHelper.cs" /> <Compile Include="Models\Declaration\DataAdapter\DeclarationDataAdapterTest_Class5.cs" />