From 4413a250e37d427083397f33c614dc4aa19f9d38 Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Thu, 22 Jul 2021 18:10:43 +0200 Subject: [PATCH] fixing testcases for completed/single bus --- .../Integration/Multistage/MultistageVehicleTest.cs | 2 +- .../FactorMethod/vecto_vehicle-completed_heavyBus_42.xml | 6 ++++-- .../Integration/Buses/vecto_vehicle-completed_heavyBus.xml | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs b/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs index def6f4ae4f..7197eca49c 100644 --- a/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs +++ b/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs @@ -240,7 +240,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage Assert.AreEqual("Some Manufacturer", data.Vehicle.Manufacturer); Assert.AreEqual("Some Manufacturer Address", data.Vehicle.ManufacturerAddress); Assert.AreEqual("VEH-1234567890", data.Vehicle.VIN); - Assert.AreEqual(DateTime.Parse("2020-01-09T11:00:00Z").ToUniversalTime(), data.Vehicle.Date); + Assert.AreEqual(DateTime.Parse("2021-06-30T22:00:00Z").ToUniversalTime(), data.Vehicle.Date); Assert.AreEqual("Sample Bus Model", data.Vehicle.Model); Assert.AreEqual(LegislativeClass.M3, data.Vehicle.LegislativeClass); Assert.AreEqual(500, data.Vehicle.CurbMassChassis.Value()); diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml index 102d148e65..6fbd95682f 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml +++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml @@ -18,8 +18,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor <TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass> <AirdragModifiedMultistage>false</AirdragModifiedMultistage> <ClassBus>I+II</ClassBus> - <NumberPassengersLowerDeck>30</NumberPassengersLowerDeck> - <NumberPassengersUpperDeck>0</NumberPassengersUpperDeck> + <NumberPassengerSeatsLowerDeck>30</NumberPassengerSeatsLowerDeck> + <NumberPassengersStandingLowerDeck>0</NumberPassengersStandingLowerDeck> + <NumberPassengerSeatsUpperDeck>0</NumberPassengerSeatsUpperDeck> + <NumberPassengersStandingUpperDeck>0</NumberPassengersStandingUpperDeck> <BodyworkCode>CE</BodyworkCode> <LowEntry>true</LowEntry> <HeightIntegratedBody>3000</HeightIntegratedBody> diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml index f00a8112fe..1218ea9e6c 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml +++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml @@ -18,8 +18,10 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor <TechnicalPermissibleMaximumLadenMass>15400</TechnicalPermissibleMaximumLadenMass> <AirdragModifiedMultistage>true</AirdragModifiedMultistage> <ClassBus>II+III</ClassBus> - <NumberPassengersLowerDeck>50</NumberPassengersLowerDeck> - <NumberPassengersUpperDeck>0</NumberPassengersUpperDeck> + <NumberPassengerSeatsLowerDeck>50</NumberPassengerSeatsLowerDeck> + <NumberPassengersStandingLowerDeck>0</NumberPassengersStandingLowerDeck> + <NumberPassengerSeatsUpperDeck>0</NumberPassengerSeatsUpperDeck> + <NumberPassengersStandingUpperDeck>0</NumberPassengersStandingUpperDeck> <BodyworkCode>CA</BodyworkCode> <LowEntry>true</LowEntry> <HeightIntegratedBody>2700</HeightIntegratedBody> -- GitLab