Merge branch...

Merge branch 'hm/feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/hm_vecto-dev into feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev

VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs

@@ -78,7 +78,8 @@ namespace TUGraz.VectoCore.Tests.Integration
 		[TestCase(ExemptedVehicle, 1),
 		TestCase(ExemptedVehicleNoHEV, 1),
 		TestCase(ExemptedVehicleV2, 1),
-		TestCase(ExemptedVehicleV2NoHEV, 1)
+		TestCase(ExemptedVehicleV2NoHEV, 1),
+			Ignore("ExemptedVehicles XML Version 1.0/2.0 no longer supported")
 		]
 		public void TestSimulationExemptedVehicle(string filename, int numRuns)
 		{
@@ -127,7 +128,9 @@ namespace TUGraz.VectoCore.Tests.Integration
 
 		[TestCase(ExemptedVehicle, true, true, true, "Invalid input: ZE-HDV and DualFuelVehicle are mutually exclusive!"),
 			TestCase(ExemptedVehicle, true, false, true, "Invalid input: ZE-HDV and DualFuelVehicle are mutually exclusive!"),
-			TestCase(ExemptedVehicle, false, false, false, "Invalid input: at least one option of ZE-HDV, He-HDV, and DualFuelVehicle has to be set for an exempted vehicle!")]
+			TestCase(ExemptedVehicle, false, false, false, "Invalid input: at least one option of ZE-HDV, He-HDV, and DualFuelVehicle has to be set for an exempted vehicle!"),
+		 Ignore("ExemptedVehicles XML Version 1.0 no longer supported")
+		]
 		public void TestInvalidExemptedCombination(string filename, bool zeroEmission, bool hybrid, bool dualFuel, string exMsg)
 		{
 			var writer = new FileOutputWriter(InputDataHelper.GetRandomFilename(filename));
@@ -179,7 +182,8 @@ namespace TUGraz.VectoCore.Tests.Integration
 
 		[TestCase(ExemptedVehicle, null, 10000),
 		TestCase(ExemptedVehicle, 100000, null),
-		TestCase(ExemptedVehicle, null, null)]
+		TestCase(ExemptedVehicle, null, null),
+		Ignore("ExemptedVehicles XML Version 1.0 no longer supported")]
 		public void TestHybridExemptedRequiresMaxNetPower(string filename, double? maxNetPower1, double? maxNetPower2)
 		{
 			var writer = new FileOutputWriter(InputDataHelper.GetRandomFilename(filename));

VectoCore/VectoCoreTest/Integration/XMLReportTest.cs

@@ -164,7 +164,8 @@ namespace TUGraz.VectoCore.Tests.Integration
 		}
 
 		[TestCase(@"Testdata\XML\XMLReaderDeclaration\vecto_vehicle-sample.xml"),
-		 TestCase(@"TestData\Integration\DeclarationMode\ExemptedVehicle\vecto_vehicle-sample_exempted.xml")]
+		 //TestCase(@"TestData\Integration\DeclarationMode\ExemptedVehicle\vecto_vehicle-sample_exempted.xml") // ExemptedVehicles XML Version 1.0 no longer supported
+		]
 		public void TestValidationXMLReports(string jobfile)
 		{
 			var dataProvider = xmlInputReader.CreateDeclaration(jobfile);

VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/GenericEMotor_140kW_900Nm.vemp

@@ -72,3 +72,4 @@ n [rpm] , T_drive [Nm] , T_drag [Nm]
 4355.555556,306.945,-306.945
 4400,303.84,-303.84
 4444.444444,300.8025,-300.8025
+4844.444444,300.8025,-300.8025
\ No newline at end of file

VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/GenericMap_140kW_936Nm.vemo

@@ -2014,3 +2014,69 @@ n [rpm] , T [Nm] , P_el [kW]
 4268.632479,877.5,419.46
 4268.632479,906.75,433.24
 4268.632479,936,447.04
+4868.632479,-936,-391.42
+4868.632479,-906.75,-379.03
+4868.632479,-877.5,-366.61
+4868.632479,-848.25,-354.19
+4868.632479,-819,-341.74
+4868.632479,-789.75,-329.28
+4868.632479,-760.5,-316.8
+4868.632479,-731.25,-304.3
+4868.632479,-702,-291.79
+4868.632479,-672.75,-279.26
+4868.632479,-643.5,-266.72
+4868.632479,-614.25,-254.15
+4868.632479,-585,-241.57
+4868.632479,-555.75,-228.98
+4868.632479,-526.5,-216.36
+4868.632479,-497.25,-203.73
+4868.632479,-468,-191.09
+4868.632479,-438.75,-178.42
+4868.632479,-409.5,-165.74
+4868.632479,-380.25,-153.04
+4868.632479,-351,-140.33
+4868.632479,-321.75,-127.6
+4868.632479,-292.5,-114.85
+4868.632479,-263.25,-102.09
+4868.632479,-234,-89.306
+4868.632479,-204.75,-76.508
+4868.632479,-175.5,-63.693
+4868.632479,-146.25,-50.861
+4868.632479,-117,-38.012
+4868.632479,-87.75,-25.147
+4868.632479,-58.5,-12.264
+4868.632479,-29.25,0.65077
+4868.632479,0,13.903
+4868.632479,29.25,27.173
+4868.632479,58.5,40.46
+4868.632479,87.75,53.764
+4868.632479,117,67.086
+4868.632479,146.25,80.424
+4868.632479,175.5,93.78
+4868.632479,204.75,107.15
+4868.632479,234,120.54
+4868.632479,263.25,133.95
+4868.632479,292.5,147.37
+4868.632479,321.75,160.81
+4868.632479,351,174.27
+4868.632479,380.25,187.75
+4868.632479,409.5,201.24
+4868.632479,438.75,214.75
+4868.632479,468,228.28
+4868.632479,497.25,241.82
+4868.632479,526.5,255.38
+4868.632479,555.75,268.96
+4868.632479,585,282.56
+4868.632479,614.25,296.17
+4868.632479,643.5,309.8
+4868.632479,672.75,323.45
+4868.632479,702,337.11
+4868.632479,731.25,350.79
+4868.632479,760.5,364.49
+4868.632479,789.75,378.21
+4868.632479,819,391.94
+4868.632479,848.25,405.69
+4868.632479,877.5,419.46
+4868.632479,906.75,433.24
+4868.632479,936,447.04
+

VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs

@@ -85,7 +85,8 @@ namespace TUGraz.VectoCore.Tests.XML
 			ReadDeclarationJob(jobFile);
 		}
 
-		[TestCase(@"SchemaVersion2.1\vecto_vehicle-exempted-sample.xml")]
+		[TestCase(@"SchemaVersion2.1\vecto_vehicle-exempted-sample.xml"),
+		Ignore("ExemptedVehicles XML Version 1.0 no longer supported")]
 		public void TestReadingJobVersion_V21_Exempted(string jobFile)
 		{
 			ReadDeclarationJob(jobFile);