From ba0e74dfb5a26da89b56e34b8cd6966a09ce0377 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Tue, 18 Jan 2022 09:49:46 +0100
Subject: [PATCH] Updated 4 Testcases: TestSimulationExemptedVehicle
---
.../Declaration/ExemptedVehicleTest.cs | 16 +++-------------
.../vecto_vehicle-sample_exempted_v2_nonHEV.xml | 2 ++
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs b/VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs
index 29e112b6b0..5763e0c491 100644
--- a/VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs
@@ -124,24 +124,14 @@ namespace TUGraz.VectoCore.Tests.Integration
}
var inputData = xmlInputReader.CreateDeclaration(filename);
-
+
var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, writer) {
WriteModalResults = true,
ActualModalData = true
};
var jobContainer = new JobContainer(new MockSumWriter());
-
- List<IVectoRun> runs;
- Assert.That(() => runs = factory.SimulationRuns().ToList(),
- Throws.TypeOf<VectoException>()
- .And.Message.EqualTo("Node MaxNetPower1 not found in input data"));
- Assert.Inconclusive("Exempted Vehicle");
-
- //Assert.AreEqual(numRuns, runs.Count);
- //foreach (var run in runs) {
- // jobContainer.AddRun(run);
- //}
- //jobContainer.AddRuns(factory);
+ jobContainer.AddRuns(factory);
+ Assert.That(jobContainer.Runs.Count, Is.EqualTo(numRuns));
jobContainer.Execute();
jobContainer.WaitFinished();
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted_v2_nonHEV.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted_v2_nonHEV.xml
index d522c99a15..1bdb49d5bc 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted_v2_nonHEV.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/ExemptedVehicle/vecto_vehicle-sample_exempted_v2_nonHEV.xml
@@ -18,6 +18,8 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_quam
<CurbMassChassis>7100</CurbMassChassis>
<GrossVehicleMass>40000</GrossVehicleMass>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <MaxNetPower1>30000</MaxNetPower1>
+ <MaxNetPower2>20000</MaxNetPower2>
<HybridElectricHDV>false</HybridElectricHDV>
<DualFuelVehicle>true</DualFuelVehicle>
</v2.0:Vehicle>
--
GitLab