added vehicle data test for HEV Primary Bus Px

VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs

@@ -1148,16 +1148,18 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 			{
 				var val = GetString(XMLNames.ChassisConfiguration);
 				return "Rigid Lorry".Equals(val, StringComparison.InvariantCultureIgnoreCase) 
-					? VehicleCategory.RigidTruck : val.ParseEnum<VehicleCategory>();
+					? VehicleCategory.RigidTruck : VehicleCategoryHelper.Parse(val);
 			}
 		}
 		
 		public override Kilogram CurbMassChassis => GetDouble(XMLNames.CorrectedActualMass).SI<Kilogram>();
 
 		public override Kilogram GrossVehicleMassRating => GetDouble(XMLNames.TPMLM).SI<Kilogram>();
+
+		public override bool Articulated => GetBool(XMLNames.Vehicle_Articulated);
 		
 		#endregion
-		
+
 		#region Overrides of XMLDeclarationVehicleDataProviderV20
 
 		public override bool SleeperCab => GetBool(XMLNames.Vehicle_SleeperCab);

VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs

@@ -291,7 +291,7 @@ namespace TUGraz.VectoCore.Tests.XML
 		[TestCase(@"HeavyLorry\HEV_heavyLorry_AMT_Px.xml", BASE_DIR)]
 		[TestCase(@"HEV_heavyLorry_AMT_Px_Capacitor.xml", ADDITONAL_TESTS_DIR)]
 		[TestCase(@"HEV_heavyLorry_AMT_Px_n_opt.xml", Optional_TESTS_DIR)]
-		public void TestHEVHeavyLorry(string jobfile, string testDir)
+		public void TestHEVHeavyLorryPx(string jobfile, string testDir)
 		{
 			var filename = Path.Combine(testDir, jobfile);
 			var dataProvider = xmlInputReader.CreateDeclaration(XmlReader.Create(filename));

VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210VehicleDataTest.cs

@@ -147,5 +147,28 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.AreEqual(true, vehicle.OvcHev);
 			Assert.AreEqual(12.SI<Watt>(), vehicle.MaxChargingPower);
 		}
+
+
+		[TestCase(@"HEV_primaryBus_AMT_Px_n_opt.xml", Optional_TESTS_DIR)]
+
+		public void TestHEVPrimaryBusPxVehicleData(string jobfile, string testDir)
+		{
+			var vehicle = ReadVehicleData(jobfile, testDir);
+
+			Assert.NotNull(vehicle);
+			Assert.AreEqual(LegislativeClass.M3, vehicle.LegislativeClass);
+			Assert.AreEqual(VehicleCategory.HeavyBusPrimaryVehicle, vehicle.VehicleCategory);
+			Assert.AreEqual(AxleConfiguration.AxleConfig_4x2, vehicle.AxleConfiguration);
+			Assert.AreEqual(true, vehicle.Articulated);
+			Assert.AreEqual(25000.SI<Kilogram>(), vehicle.GrossVehicleMassRating);
+			Assert.AreEqual(600.00.RPMtoRad(), vehicle.EngineIdleSpeed);
+			Assert.AreEqual(RetarderType.TransmissionOutputRetarder, vehicle.RetarderType);
+			Assert.AreEqual(1.000, vehicle.RetarderRatio);
+			Assert.AreEqual(AngledriveType.SeparateAngledrive, vehicle.AngledriveType);
+			Assert.AreEqual(false, vehicle.ZeroEmissionVehicle);
+			Assert.AreEqual(ArchitectureID.P2, vehicle.ArchitectureID);
+			Assert.AreEqual(true, vehicle.OvcHev);
+			Assert.AreEqual(5.SI<Watt>(), vehicle.MaxChargingPower);
+		}
 	}
 }