From 9a7a4dae775961eeddf2e1d47bb7e16244024f3a Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Tue, 28 Apr 2020 08:26:44 +0200
Subject: [PATCH] adapt expected values in testcases. all but 2 testcases
green.
---
.../Integration/CompletedBus/CompletedBusFactorMethodTest.cs | 4 ++--
VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs | 3 ++-
.../VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
index 0f347c269e..0ecd3f996b 100644
--- a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
@@ -1049,8 +1049,8 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
Assert.IsTrue(jobContainer.Runs.All(r => r.Success), String.Concat<Exception>(jobContainer.Runs.Select(r => r.ExecException)));
}
- [TestCase(@"TestData\Integration\Buses\vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml", 13, TestName = "RunBusSimulation electric STP/Fan ESS IU/RL"),
- TestCase(@"TestData\Integration\Buses\vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml", 17, TestName = "RunBusSimulation electric STP/Fan ESS CO/RL"),
+ [TestCase(@"TestData\Integration\Buses\FactorMethod\vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml", 13, TestName = "RunBusSimulation electric STP/Fan ESS IU/RL"),
+ TestCase(@"TestData\Integration\Buses\FactorMethod\vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml", 17, TestName = "RunBusSimulation electric STP/Fan ESS CO/RL"),
TestCase(@"E:\QUAM\tmp\ESS_Tests\primary_heavyBus group 42_ConvAux_ESS_SmartPS.xml", 10, TestName = "RunBusSimulation ESS P33DD SU/LL ConvAux SmartPS"),
TestCase(@"E:\QUAM\tmp\ESS_Tests\primary_heavyBus group 42_ESS_SmartPS.xml", 10, TestName = "RunBusSimulation ESS P33DD SU/LL ES Aux SmartPS"),
diff --git a/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs b/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
index 5d8b6424ce..19e039fcf7 100644
--- a/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
@@ -55,7 +55,8 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsTrue(vehicle.VehicleCode == VehicleCode.CD);
Assert.AreEqual(8300, vehicle.CurbMassChassis.Value());
Assert.AreEqual(15400, vehicle.GrossVehicleMassRating.Value());//TechnicalPermissibleMaximumLadenMass ?!?
- Assert.That(() => vehicle.TankSystem, Throws.InstanceOf<VectoException>());
+ //Assert.That(() => vehicle.TankSystem, Throws.InstanceOf<VectoException>());
+ Assert.IsNull(vehicle.TankSystem);
Assert.AreEqual(50, vehicle.NumberOfPassengersLowerDeck);
Assert.AreEqual(0, vehicle.NumberOfPassengersUpperDeck);
Assert.AreEqual(FloorType.LowFloor, vehicle.FloorType);
diff --git a/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs b/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs
index 983f262dac..7c4ff2cbdb 100644
--- a/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs
@@ -60,7 +60,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsTrue(AxleConfiguration.AxleConfig_4x2 == vehicle.AxleConfiguration);
Assert.AreEqual(false, vehicle.Articulated);
Assert.AreEqual(25000, vehicle.GrossVehicleMassRating.Value());
- Assert.AreEqual(600, vehicle.EngineIdleSpeed.Value());
+ Assert.AreEqual(600, vehicle.EngineIdleSpeed.AsRPM);
Assert.AreEqual("Transmission Output Retarder", vehicle.Components.RetarderInputData.Type.ToXMLFormat());
Assert.AreEqual(1.000, vehicle.Components.RetarderInputData.Ratio);
Assert.AreEqual("None", vehicle.Components.AngledriveInputData.Type.ToXMLFormat());
--
GitLab