diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV_mediumLorry_AMT_Px_n_opt.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV_mediumLorry_AMT_Px_n_opt.xml index d98f5afcb099a764a2bdebddc1f78fd81831bbac..d21d3c757037d67e9251763d82a77f7062324881 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV_mediumLorry_AMT_Px_n_opt.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/WithoutOptionalEntries/HEV_mediumLorry_AMT_Px_n_opt.xml @@ -13,11 +13,13 @@ <TechnicalPermissibleMaximumLadenMass>12000</TechnicalPermissibleMaximumLadenMass> <IdlingSpeed>650</IdlingSpeed> <RetarderType>None</RetarderType> + <RetarderRatio>13.000</RetarderRatio> <AngledriveType>None</AngledriveType> <ZeroEmissionVehicle>false</ZeroEmissionVehicle> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>P2</ArchitectureID> - <OvcHev>false</OvcHev> + <OvcHev>true</OvcHev> + <MaxChargingPower>12</MaxChargingPower> <ADAS xsi:type="ADAS_HEV_Type"> <EngineStopStart>true</EngineStopStart> <PredictiveCruiseControl>1,2,3</PredictiveCruiseControl> diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210VehicleDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210VehicleDataTest.cs index f238ba950ca1872c477dc14ad30e3542c0ca11ef..03dfcd14386f331d12fbb1817393f3da35b29a4a 100644 --- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210VehicleDataTest.cs +++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210VehicleDataTest.cs @@ -12,12 +12,13 @@ namespace TUGraz.VectoCore.Tests.XML { [TestFixture] public class XMLDeclarationInputv210VehicleDataTest - { + { protected IXMLInputDataReader xmlInputReader; private IKernel _kernel; - private const string Optional_TESTS_DIR = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\WithoutOptionalEntries"; + private const string Optional_TESTS_DIR = + @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\WithoutOptionalEntries"; [OneTimeSetUp] public void RunBeforeAnyTests() @@ -59,12 +60,12 @@ namespace TUGraz.VectoCore.Tests.XML Assert.AreEqual(false, vehicle.SleeperCab); Assert.AreEqual("ASDF", vehicle.VehicleTypeApprovalNumber); } - + [TestCase(@"Conventional_mediumLorry_AMT_n_opt.xml", Optional_TESTS_DIR)] public void TestConventionalMediumLorryVehicleData(string jobfile, string testDir) { var vehicle = ReadVehicleData(jobfile, testDir); - + Assert.AreEqual(LegislativeClass.N2, vehicle.LegislativeClass); Assert.AreEqual(VehicleCategory.Tractor, vehicle.VehicleCategory); Assert.AreEqual(AxleConfiguration.AxleConfig_4x2, vehicle.AxleConfiguration); @@ -78,7 +79,7 @@ namespace TUGraz.VectoCore.Tests.XML Assert.IsNull(vehicle.TankSystem); Assert.AreEqual("ASDF", vehicle.VehicleTypeApprovalNumber); } - + [TestCase(@"Conventional_primaryBus_AMT_n_opt.xml", Optional_TESTS_DIR)] public void TestConventionalPrimaryBusVehicleData(string jobfile, string testDir) { @@ -96,7 +97,7 @@ namespace TUGraz.VectoCore.Tests.XML Assert.AreEqual(AngledriveType.None, vehicle.AngledriveType); Assert.AreEqual(false, vehicle.ZeroEmissionVehicle); } - + [TestCase(@"HEV_heavyLorry_AMT_Px_n_opt.xml", Optional_TESTS_DIR)] public void TestHEVHeavyLorryPxVehicleData(string jobfile, string testDir) @@ -123,5 +124,28 @@ namespace TUGraz.VectoCore.Tests.XML Assert.AreEqual(false, vehicle.OvcHev); Assert.AreEqual(11.SI<Watt>(), vehicle.MaxChargingPower); } + + + [TestCase(@"HEV_mediumLorry_AMT_Px_n_opt.xml", Optional_TESTS_DIR)] + public void TestHEVMediumLorryPxVehicleData(string jobfile, string testDir) + { + var vehicle = ReadVehicleData(jobfile, testDir); + + Assert.NotNull(vehicle); + Assert.AreEqual(LegislativeClass.N2, vehicle.LegislativeClass); + Assert.AreEqual(VehicleCategory.Van, vehicle.VehicleCategory); + Assert.AreEqual(AxleConfiguration.AxleConfig_4x2, vehicle.AxleConfiguration); + Assert.AreEqual(6000.SI<Kilogram>(), vehicle.CurbMassChassis); + Assert.AreEqual(12000.SI<Kilogram>(), vehicle.GrossVehicleMassRating); + Assert.AreEqual(650.00.RPMtoRad(), vehicle.EngineIdleSpeed); + Assert.AreEqual(RetarderType.None, vehicle.RetarderType); + Assert.AreEqual(13.000, vehicle.RetarderRatio); + Assert.AreEqual(AngledriveType.None, vehicle.AngledriveType); + Assert.AreEqual(false, vehicle.ZeroEmissionVehicle); + Assert.AreEqual("ASDF", vehicle.VehicleTypeApprovalNumber); + Assert.AreEqual(ArchitectureID.P2, vehicle.ArchitectureID); + Assert.AreEqual(true, vehicle.OvcHev); + Assert.AreEqual(12.SI<Watt>(), vehicle.MaxChargingPower); + } } }