Merge pull request #504 in VECTO/vecto-sim from...

Merge pull request #504 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:bugfix/VECTO-564-vehiclegroup-xml-output to develop

* commit 'b6e1a1c3':
  fix: set vehicle group before initializing report
  remove comments, correct assertion
  adding testcase to reporduce bug

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

VectoCore/VectoCoreTest/Integration/XMLReportTest.cs

+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());
+		}
+	}
+}

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);

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" />