diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs b/VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs index 29e112b6b0f74efecf60269afcffa3a88a82bcc9..5763e0c49127c4563a516cd2b63e20ed3249fc0e 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 d522c99a1543035841a922fec1ff24f47b037e9a..1bdb49d5bce6f211251e633c61340538dbe4429b 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>