From 2067a441e8d50cad3edf74216585c47f30b1d79d Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 20 Apr 2020 09:10:37 +0200
Subject: [PATCH] update expeted values in testcase: lookahead coasting
disabled, use enums instead of strings
---
.../CompletedBus/CompletedBusFactorMethodTest.cs | 2 +-
.../XML/XMLPrimaryVehicleReportBusReaderTest.cs | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
index 6721219de6..414b5ed20b 100644
--- a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
@@ -877,7 +877,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
Assert.IsNotNull(specificDriver.AccelerationCurve);
Assert.AreEqual(genericDriver.AccelerationCurve, specificDriver.AccelerationCurve);
- Assert.AreEqual(DeclarationData.Driver.LookAhead.Enabled, genericDriver.LookAheadCoasting.Enabled);
+ Assert.AreEqual(false, genericDriver.LookAheadCoasting.Enabled);
Assert.AreEqual(DeclarationData.Driver.LookAhead.MinimumSpeed, genericDriver.LookAheadCoasting.MinSpeed);
Assert.IsNotNull(genericDriver.LookAheadCoasting.LookAheadDecisionFactor);
Assert.AreEqual(DeclarationData.Driver.LookAhead.LookAheadDistanceFactor,
diff --git a/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs b/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs
index c3a2209bd0..597856f542 100644
--- a/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLPrimaryVehicleReportBusReaderTest.cs
@@ -312,29 +312,29 @@ namespace TUGraz.VectoCore.Tests.XML
var result = resultsInputData.Results[0];
Assert.AreEqual("success", result.ResultStatus);
- Assert.AreEqual("P31SD", result.VehicleGroup);
- Assert.AreEqual("Regional Delivery", result.Mission);
+ Assert.AreEqual(VehicleClass.ClassP31SD, result.VehicleGroup);
+ Assert.AreEqual(MissionType.RegionalDelivery, result.Mission);
TestSimulationParameter(8810, 920, 20, "single fuel mode", result.SimulationParameter);
result = resultsInputData.Results[1];
Assert.AreEqual("success", result.ResultStatus);
- Assert.AreEqual("P31SD", result.VehicleGroup);
- Assert.AreEqual("Regional Delivery", result.Mission);
+ Assert.AreEqual(VehicleClass.ClassP31SD, result.VehicleGroup);
+ Assert.AreEqual(MissionType.RegionalDelivery, result.Mission);
TestSimulationParameter(12490, 4600, 80, "single fuel mode", result.SimulationParameter);
result = resultsInputData.Results[2];
Assert.AreEqual("success", result.ResultStatus);
- Assert.AreEqual("P31DD", result.VehicleGroup);
- Assert.AreEqual("Urban Delivery", result.Mission);
+ Assert.AreEqual(VehicleClass.ClassP31DD, result.VehicleGroup);
+ Assert.AreEqual(MissionType.UrbanDelivery, result.Mission);
TestSimulationParameter(8810, 920, 20, "single fuel mode", result.SimulationParameter);
result = resultsInputData.Results[3];
Assert.AreEqual("success", result.ResultStatus);
- Assert.AreEqual("P31DD", result.VehicleGroup);
- Assert.AreEqual("Urban Delivery", result.Mission);
+ Assert.AreEqual(VehicleClass.ClassP31DD, result.VehicleGroup);
+ Assert.AreEqual(MissionType.UrbanDelivery, result.Mission);
TestSimulationParameter(12490, 4600, 80, "single fuel mode", result.SimulationParameter);
}
--
GitLab