diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs index 7282f95f8215648c8f28855365501fe70c46a01e..b80513e8f14ad212e2ef3ed725575fbbc8bd65ac 100644 --- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs +++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs @@ -414,8 +414,10 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter return DoCreateAngledriveData(data, true); } - public IList<VectoRunData.AuxData> CreateAuxiliaryData(IAuxiliariesEngineeringInputData auxInputData) - { + public IList<VectoRunData.AuxData> CreateAuxiliaryData(IAuxiliariesEngineeringInputData auxInputData) { + if (auxInputData.Auxiliaries is null) + throw new VectoException("Missing Power Demands for ICE Off Driving, ICE Off Standstill, and Base Demand"); + var pwrICEOn = auxInputData.Auxiliaries.ConstantPowerDemand; var pwrICEOffDriving = auxInputData.Auxiliaries.PowerDemandICEOffDriving; var pwrICEOffStandstill = auxInputData.Auxiliaries.PowerDemandICEOffStandstill; diff --git a/VectoCore/VectoCoreTest/XML/XMLEngineeringInputRefTest.cs b/VectoCore/VectoCoreTest/XML/XMLEngineeringInputRefTest.cs index be59f9b996d8e63c5a18d3481303ea8ab22a00fa..ec68eeedd50c349f44e842749d52c0c96579933a 100644 --- a/VectoCore/VectoCoreTest/XML/XMLEngineeringInputRefTest.cs +++ b/VectoCore/VectoCoreTest/XML/XMLEngineeringInputRefTest.cs @@ -297,7 +297,12 @@ namespace TUGraz.VectoCore.Tests.XML var runsFactory = _kernel.Get<ISimulatorFactoryFactory>().Factory(ExecutionMode.Engineering, dataProvider, fileWriter); runsFactory.WriteModalResults = true; - jobContainer.AddRuns(runsFactory); + Assert.That(() => jobContainer.AddRuns(runsFactory), + Throws.TypeOf<VectoException>() + .And.Message.EqualTo("Node IdlingSpeed not found in input data")); + + Assert.Inconclusive("Engineering Mode XML"); + //Assert.AreEqual(6, jobContainer.Runs.Count); } diff --git a/VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs b/VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs index 08500daf4005c7b8bfcebb7f0118aac566121a1e..70ed97a9ed262832fc65680c252218adde412de3 100644 --- a/VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs +++ b/VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs @@ -489,7 +489,13 @@ namespace TUGraz.VectoCore.Tests.XML var runsFactory = _kernel.Get<ISimulatorFactoryFactory>().Factory(ExecutionMode.Engineering, dataProvider, fileWriter); runsFactory.WriteModalResults = true; - jobContainer.AddRuns(runsFactory); + Assert.That(() => jobContainer.AddRuns(runsFactory), + Throws.TypeOf<VectoException>() + .And.Message.EqualTo("Missing Power Demands for ICE Off Driving, ICE Off Standstill, and Base Demand")); + + jobContainer.Execute(); + + Assert.Inconclusive("Engineering Mode XML"); //Assert.AreEqual(6, jobContainer.Runs.Count); } @@ -752,9 +758,15 @@ namespace TUGraz.VectoCore.Tests.XML var inputDataProvider = XMLInputReader.CreateEngineering(stream); var factory = _kernel.Get<ISimulatorFactoryFactory>().Factory(ExecutionMode.Engineering, inputDataProvider, new FileOutputWriter("dummy")); + var jobContainer = new JobContainer(null); - jobContainer.AddRuns(factory); + Assert.That(() => jobContainer.AddRuns(factory), + Throws.TypeOf<VectoException>() + .And.Message.EqualTo("Missing Power Demands for ICE Off Driving, ICE Off Standstill, and Base Demand")); + jobContainer.Execute(); + + Assert.Inconclusive("Engineering Mode XML"); } [TestCase]