diff --git a/VectoCore/VectoCoreTest/Integration/Multistage/MultistageMultipleRunsTest.cs b/VectoCore/VectoCoreTest/Integration/Multistage/MultistageMultipleRunsTest.cs
index 88e1d37ba5ee742437a9e49058851ce37534a025..82bd16737465fe493eab7b7fe77a50e78dcbb28e 100644
--- a/VectoCore/VectoCoreTest/Integration/Multistage/MultistageMultipleRunsTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Multistage/MultistageMultipleRunsTest.cs
@@ -5,11 +5,13 @@ using System.IO;
using System.ServiceModel.Syndication;
using System.Threading;
using System.Threading.Tasks;
+using Ninject;
using NUnit.Framework;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCore.InputData.FileIO.JSON;
using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider;
+using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory;
using TUGraz.VectoCore.OutputData;
@@ -18,6 +20,7 @@ using TUGraz.VectoCore.OutputData.FileIO;
namespace TUGraz.VectoCore.Tests.Integration.Multistage
{
[TestFixture]
+ [NonParallelizable]
public class MultistageMultipleRunsTest
{
private const string TestDataDir = "TestData\\Integration\\Multistage\\";
@@ -39,18 +42,21 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
private SummaryDataContainer _sumContainer;
private JobContainer _jobContainer;
- private FileOutputWriter _fileoutputWriter;
- private TempFileOutputWriter _tempFileOutputWriter;
private ExecutionMode _mode = ExecutionMode.Declaration;
private string _outputDirectory;
private Stopwatch _stopWatch;
+ private IKernel _kernel;
+ private ISimulatorFactoryFactory _simFactoryFactory;
+
+
[OneTimeSetUp]
public void OneTimeSetUp()
{
Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
+
}
[SetUp]
@@ -62,6 +68,8 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
_sumFileWriter = new FileOutputWriter(_outputDirectory);
_sumContainer = new SummaryDataContainer(_sumFileWriter);
_jobContainer = new JobContainer(_sumContainer);
+ _kernel = new StandardKernel(new VectoNinjectModule());
+ _simFactoryFactory = _kernel.Get<ISimulatorFactoryFactory>();
}
[TearDown]
@@ -74,45 +82,49 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
[Test]//, Timeout(3000)]
public void ExemptedPrimaryAndCompletedTest()
{
+ var fileOutputWriter = new FileOutputWriter(_outputDirectory);
+ var tempFileOutputWriter = new TempFileOutputWriter(fileOutputWriter);
+ StartSimulation(CompletedExempted, tempFileOutputWriter, fileOutputWriter);
- StartSimulation(CompletedExempted);
-
- var writtenFiles = GetWrittenFiles();
+ var writtenFiles = GetWrittenFiles();
ShowWrittenFiles(writtenFiles);
- Assert.IsTrue(writtenFiles.Contains(_tempFileOutputWriter.XMLFullReportName));
- Assert.IsTrue(writtenFiles.Contains(_fileoutputWriter.XMLFullReportName));
- Assert.IsTrue(writtenFiles.Contains(_fileoutputWriter.XMLCustomerReportName));
- Assert.IsTrue(writtenFiles.Contains(_fileoutputWriter.XMLMultistageReportFileName));
+ Assert.IsTrue(writtenFiles.Contains(tempFileOutputWriter.XMLFullReportName));
+ Assert.IsTrue(writtenFiles.Contains(fileOutputWriter.XMLFullReportName));
+ Assert.IsTrue(writtenFiles.Contains(fileOutputWriter.XMLCustomerReportName));
+ Assert.IsTrue(writtenFiles.Contains(fileOutputWriter.XMLMultistageReportFileName));
}
[Test]
public void ExemptedPrimaryAndCompletedWithoutTPMLMTest()
{
-
- StartSimulation(CompletedExemptedWithoutTPMLM);
+ var fileOutputWriter = new FileOutputWriter(_outputDirectory);
+ var tempFileOutputWriter = new TempFileOutputWriter(fileOutputWriter);
+ StartSimulation(CompletedExemptedWithoutTPMLM, tempFileOutputWriter, fileOutputWriter);
var writtenFiles = GetWrittenFiles();
ShowWrittenFiles(writtenFiles);
- Assert.IsTrue(writtenFiles.Contains(_tempFileOutputWriter.XMLFullReportName));
- Assert.IsTrue(writtenFiles.Contains(_fileoutputWriter.XMLFullReportName));
- Assert.IsTrue(writtenFiles.Contains(_fileoutputWriter.XMLCustomerReportName));
- Assert.IsTrue(writtenFiles.Contains(_fileoutputWriter.XMLMultistageReportFileName));
+ Assert.IsTrue(writtenFiles.Contains(tempFileOutputWriter.XMLFullReportName));
+ Assert.IsTrue(writtenFiles.Contains(fileOutputWriter.XMLFullReportName));
+ Assert.IsTrue(writtenFiles.Contains(fileOutputWriter.XMLCustomerReportName));
+ Assert.IsTrue(writtenFiles.Contains(fileOutputWriter.XMLMultistageReportFileName));
}
[Test]//, Timeout(3000)]
public void ExemptedPrimaryAndInterimTest()
{
- StartSimulation(InterimExempted);
+ var fileOutputWriter = new FileOutputWriter(_outputDirectory);
+ var tempFileOutputWriter = new TempFileOutputWriter(fileOutputWriter);
+ StartSimulation(InterimExempted, tempFileOutputWriter, fileOutputWriter);
var writtenFiles = GetWrittenFiles();
ShowWrittenFiles(writtenFiles);
- Assert.IsTrue(writtenFiles.Contains(_tempFileOutputWriter.XMLFullReportName));
- Assert.IsFalse(writtenFiles.Contains(_fileoutputWriter.XMLFullReportName));
- Assert.IsFalse(writtenFiles.Contains(_fileoutputWriter.XMLCustomerReportName));
- Assert.IsTrue(writtenFiles.Contains(_fileoutputWriter.XMLMultistageReportFileName));
+ Assert.IsTrue(writtenFiles.Contains(tempFileOutputWriter.XMLFullReportName));
+ Assert.IsFalse(writtenFiles.Contains(fileOutputWriter.XMLFullReportName));
+ Assert.IsFalse(writtenFiles.Contains(fileOutputWriter.XMLCustomerReportName));
+ Assert.IsTrue(writtenFiles.Contains(fileOutputWriter.XMLMultistageReportFileName));
}
@@ -132,15 +144,17 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
[NonParallelizable]
public void PrimaryAndCompletedTest()
{
- StartSimulation(CompletedDiesel, false);
+ var fileOutputWriter = new FileOutputWriter(_outputDirectory);
+ var tempFileOutputWriter = new TempFileOutputWriter(fileOutputWriter);
+ StartSimulation(CompletedDiesel, tempFileOutputWriter, fileOutputWriter);
var writtenFiles = GetWrittenFiles();
ShowWrittenFiles(writtenFiles);
- Assert.IsTrue(writtenFiles.Contains(_tempFileOutputWriter.XMLFullReportName));
- Assert.IsTrue(writtenFiles.Contains(_fileoutputWriter.XMLFullReportName));
- Assert.IsTrue(writtenFiles.Contains(_fileoutputWriter.XMLCustomerReportName));
- Assert.IsTrue(writtenFiles.Contains(_fileoutputWriter.XMLMultistageReportFileName));
+ Assert.IsTrue(writtenFiles.Contains(tempFileOutputWriter.XMLFullReportName));
+ Assert.IsTrue(writtenFiles.Contains(fileOutputWriter.XMLFullReportName));
+ Assert.IsTrue(writtenFiles.Contains(fileOutputWriter.XMLCustomerReportName));
+ Assert.IsTrue(writtenFiles.Contains(fileOutputWriter.XMLMultistageReportFileName));
}
@@ -148,15 +162,17 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
[Test]
public void PrimaryAndCompletedWithoutADASAndTPMLM()
{
- StartSimulation(CompletedWithoutADAS);
+ var fileOutputWriter = new FileOutputWriter(_outputDirectory);
+ var tempFileOutputWriter = new TempFileOutputWriter(fileOutputWriter);
+ StartSimulation(CompletedWithoutADAS, tempFileOutputWriter, fileOutputWriter);
- var writtenFiles = GetWrittenFiles();
+ var writtenFiles = GetWrittenFiles();
ShowWrittenFiles(writtenFiles);
- Assert.IsTrue(writtenFiles.Contains(_tempFileOutputWriter.XMLFullReportName));
- Assert.IsTrue(writtenFiles.Contains(_fileoutputWriter.XMLFullReportName));
- Assert.IsTrue(writtenFiles.Contains(_fileoutputWriter.XMLCustomerReportName));
- Assert.IsTrue(writtenFiles.Contains(_fileoutputWriter.XMLMultistageReportFileName));
+ Assert.IsTrue(writtenFiles.Contains(tempFileOutputWriter.XMLFullReportName));
+ Assert.IsTrue(writtenFiles.Contains(fileOutputWriter.XMLFullReportName));
+ Assert.IsTrue(writtenFiles.Contains(fileOutputWriter.XMLCustomerReportName));
+ Assert.IsTrue(writtenFiles.Contains(fileOutputWriter.XMLMultistageReportFileName));
}
@@ -164,34 +180,38 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
[Test]//, Timeout(1000 * 10 * 60)]
public void PrimaryAndInterimTest()
{
- StartSimulation(InterimDiesel);
+
+ var fileOutputWriter = new FileOutputWriter(_outputDirectory);
+ var tempFileOutputWriter = new TempFileOutputWriter(fileOutputWriter);
+ StartSimulation(InterimDiesel, tempFileOutputWriter, fileOutputWriter);
var writtenFiles = GetWrittenFiles();
ShowWrittenFiles(writtenFiles);
- Assert.IsTrue(writtenFiles.Contains(_tempFileOutputWriter.XMLFullReportName));
- Assert.IsFalse(writtenFiles.Contains(_fileoutputWriter.XMLFullReportName));
- Assert.IsFalse(writtenFiles.Contains(_fileoutputWriter.XMLCustomerReportName));
- Assert.IsTrue(writtenFiles.Contains(_fileoutputWriter.XMLMultistageReportFileName));
+ Assert.IsTrue(writtenFiles.Contains(tempFileOutputWriter.XMLFullReportName));
+ Assert.IsFalse(writtenFiles.Contains(fileOutputWriter.XMLFullReportName));
+ Assert.IsFalse(writtenFiles.Contains(fileOutputWriter.XMLCustomerReportName));
+ Assert.IsTrue(writtenFiles.Contains(fileOutputWriter.XMLMultistageReportFileName));
}
- private void StartSimulation(string path, bool multithreaded = true)
+ private void StartSimulation(string path, TempFileOutputWriter tempFileOutputWriter, FileOutputWriter fileOutputWriter, bool multithreaded = true)
{
var inputFile = Path.GetFullPath(path);
var input = JSONInputDataFactory.ReadJsonJob(inputFile);
- StartSimulation(input);
+ StartSimulation(input, tempFileOutputWriter, fileOutputWriter, multithreaded:multithreaded);
_jobContainer.WaitFinished();
}
- private void StartSimulation(IInputDataProvider input, bool multithreaded = true)
+ private void StartSimulation(IInputDataProvider input, TempFileOutputWriter tempFileOutputWriter, FileOutputWriter fileOutputWriter, bool multithreaded = true)
{
- _fileoutputWriter = new FileOutputWriter(_outputDirectory);
- _tempFileOutputWriter = new TempFileOutputWriter(_fileoutputWriter);
- var runsFactory = SimulatorFactory.CreateSimulatorFactory(_mode, input, _fileoutputWriter);
+
+ //var runsFactory = SimulatorFactory.CreateSimulatorFactory(_mode, input, _fileoutputWriter);
+ var runsFactory =
+ _simFactoryFactory.Factory(ExecutionMode.Declaration, input, fileOutputWriter, null, null, true);
runsFactory.WriteModalResults = true;
runsFactory.ModalResults1Hz = true;
runsFactory.Validate = true;
diff --git a/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs b/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs
index b838571b733cce9626a5221b24c602d32b8c7833..8c410938eba4b08829322af4171ea3afcc2ce4f5 100644
--- a/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs
@@ -16,6 +16,7 @@ using TUGraz.VectoCore.InputData.FileIO.XML;
using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider;
using TUGraz.VectoCore.InputData.Impl;
using TUGraz.VectoCore.Models.Declaration;
+using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory;
using TUGraz.VectoCore.OutputData;
@@ -57,11 +58,12 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
const string PrimaryBusAdasV23 = PrimaryInputDirPath + "vecto_vehicle-primary_heavyBusSmartES_invalid_testdata.xml";
- protected IXMLInputDataReader xmlInputReader;
- protected IXMLInputDataReader xmlVIFInputReader;
+ protected IXMLInputDataReader _xmlInputReader;
+ protected IXMLInputDataReader _xmlVIFInputReader;
private IKernel _kernel;
private string _generatedVIFFilepath;
+ private ISimulatorFactoryFactory _simFactoryFactory;
[OneTimeSetUp]
public void RunBeforeAnyTests()
@@ -69,28 +71,29 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
_kernel = new StandardKernel(new VectoNinjectModule());
- xmlInputReader = _kernel.Get<IXMLInputDataReader>();
- xmlVIFInputReader = _kernel.Get<IXMLInputDataReader>();
+ _xmlInputReader = _kernel.Get<IXMLInputDataReader>();
+ _xmlVIFInputReader = _kernel.Get<IXMLInputDataReader>();
+ _simFactoryFactory = _kernel.Get<ISimulatorFactoryFactory>();
}
[TestCase(VIFInputFile, InputFilePath, 1)]
- public void TestSimulationMultistageVehicle(string vifFilename, string inputFilename, int numRuns)
+ public void TestSimulationMultistageVehicle(string vifFilename, string stepInput, int numRuns)
{
//Input files
- var inputReader = XmlReader.Create(inputFilename);
- var inputDataProvider = xmlInputReader.CreateDeclaration(inputReader);
- var vehicle = inputDataProvider.JobInputData.Vehicle;
+ var _stepInputData = _xmlInputReader.CreateDeclaration(stepInput);
+ var vehicle = _stepInputData.JobInputData.Vehicle;
var vifReader = XmlReader.Create(vifFilename);
- var vifDataProvider = xmlInputReader.Create(vifReader) as IMultistepBusInputDataProvider;
+ var vifDataProvider = _xmlInputReader.Create(vifReader) as IMultistepBusInputDataProvider;
var numberOfManufacturingStages = vifDataProvider?.JobInputData.ManufacturingStages?.Count ?? 0;
var writer = new FileOutputVIFWriter(vifResult, numberOfManufacturingStages);
_generatedVIFFilepath = writer.XMLMultistageReportFileName;
var inputData = new XMLDeclarationVIFInputData(vifDataProvider, vehicle);
- var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, inputData, writer);
-
+ //var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, inputData, writer);
+ var factory =
+ _simFactoryFactory.Factory(ExecutionMode.Declaration, inputData, writer, null, null, true);
var jobContainer = new JobContainer(new MockSumWriter());
var runs = factory.SimulationRuns().ToList();
@@ -118,11 +121,11 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
{
//Input files
var inputReader = XmlReader.Create(inputFilename);
- var inputDataProvider = xmlInputReader.CreateDeclaration(inputReader);
+ var inputDataProvider = _xmlInputReader.CreateDeclaration(inputReader);
var vehicle = inputDataProvider.JobInputData.Vehicle;
var vifReader = XmlReader.Create(vifFilename);
- var vifDataProvider = xmlInputReader.Create(vifReader) as IMultistepBusInputDataProvider;
+ var vifDataProvider = _xmlInputReader.Create(vifReader) as IMultistepBusInputDataProvider;
var numberOfManufacturingStages = vifDataProvider?.JobInputData.ManufacturingStages?.Count ?? 0;
var writer = new FileOutputVIFWriter(vifResult, numberOfManufacturingStages);
@@ -158,7 +161,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
private void TestNewVifData(string filePath)
{
var vifReader = XmlReader.Create(filePath);
- var vifDataProvider = xmlInputReader.Create(vifReader) as IMultistepBusInputDataProvider;
+ var vifDataProvider = _xmlInputReader.Create(vifReader) as IMultistepBusInputDataProvider;
Assert.AreEqual(3, vifDataProvider.JobInputData.ManufacturingStages.Count());
TestVifStage2Data(vifDataProvider.JobInputData.ManufacturingStages[0]);
@@ -326,7 +329,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
TestSimulationMultistageVehicle(VIFInputFileGroup41, InputFilePathGroup41, 1);
var vifReader = XmlReader.Create(_generatedVIFFilepath);
- var vifDataProvider = xmlInputReader.Create(vifReader) as IMultistepBusInputDataProvider;
+ var vifDataProvider = _xmlInputReader.Create(vifReader) as IMultistepBusInputDataProvider;
var inputData = new XMLDeclarationVIFInputData(vifDataProvider, null);
var writer = new MockDeclarationWriter("vif_vehicle-sample_test.xml");
@@ -352,7 +355,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
TestSimulationMultistageVehicle(VIFExemptedPrimaryBus, ExepmtedCompletedBusInput, 1);
var vifReader = XmlReader.Create(_generatedVIFFilepath);
- var vifDataProvider = xmlInputReader.Create(vifReader) as IMultistepBusInputDataProvider;
+ var vifDataProvider = _xmlInputReader.Create(vifReader) as IMultistepBusInputDataProvider;
var inputData = new XMLDeclarationVIFInputData(vifDataProvider, null);
var writer = new FileOutputWriter("vif_vehicle-sample_test.xml");
@@ -378,20 +381,20 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
TestCase(PrimaryBus_SmartES, TestName = "Multistage Write VIF Primary SmartES")]
public void TestMultistageWritingVif(string primaryFile)
{
- var inputData = xmlInputReader.Create(primaryFile);
+ var inputData = _xmlInputReader.Create(primaryFile);
var writer = new MockDeclarationWriter("vif_writing_test.xml");
//var xmlreport = new XMLDeclarationReportMultistageBusVehicle(writer);
- var xmlreport = new XMLDeclarationReportPrimaryVehicle(writer);
- var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, inputData, writer, xmlreport);
+ //var xmlreport = new XMLDeclarationReportPrimaryVehicle(writer);
+ var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, inputData, writer, null, null, true);
factory.WriteModalResults = true; //ActualModalData = true,
factory.Validate = false;
var jobContainer = new JobContainer(new SummaryDataContainer(writer));
jobContainer.AddRuns(factory);
- xmlreport.DoWriteReport();
+ //xmlreport.DoWriteReport();
}
@@ -399,7 +402,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
TestCase(PrimaryBus_SmartES, "vif_primary_bus_smart_writing_test.xml", TestName = "Multistage Write VIF Primary SmartES With Simulation")]
public void TestMultistageWritingVifWithSimulation(string primaryFile, string outputFile)
{
- var inputData = xmlInputReader.Create(primaryFile);
+ var inputData = _xmlInputReader.Create(primaryFile);
var writer = new MockDeclarationWriter(outputFile);
var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, inputData, writer);
@@ -420,7 +423,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
[TestCase(PrimaryBusAdasV23, "vif_primary_bus_writing_test_adasv2.3.xml", TestName = "Multistage Write VIF Primary With ADAS v 2.3")]
public void TestPrimaryWritingVIF(string primaryFile, string outputFile)
{
- var inputData = xmlInputReader.Create(primaryFile);
+ var inputData = _xmlInputReader.Create(primaryFile);
var writer = new FileOutputWriter(outputFile);
@@ -451,7 +454,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
private void ValidateVIFData(string vifFilePath)
{
var vifReader = XmlReader.Create(vifFilePath);
- var vifDataProvider = xmlInputReader.Create(vifReader) as IMultistepBusInputDataProvider;
+ var vifDataProvider = _xmlInputReader.Create(vifReader) as IMultistepBusInputDataProvider;
var res = vifDataProvider.JobInputData.PrimaryVehicle;
TestVehicleData(res.Vehicle);
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifCompletedConventional.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifCompletedConventional.vecto
index ea14bcf1913a98eae7327493a4b600d41d4963ca..7d11c94cf606e0289f93183ec9501405a3a15cd2 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifCompletedConventional.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifCompletedConventional.vecto
@@ -8,6 +8,7 @@
"Body": {
"PrimaryVehicle": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.4\\vecto_vehicle-primary_heavyBus-sample.xml",
"InterimStep": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.4\\vecto_vehicle-stage_input_full-sample-final.xml",
- "Completed": false
+ "Completed": true,
+ "RunSimulation": true
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExempted-noTPMLM.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExempted-noTPMLM.vecto
index a4cb37573f22ab2c77b8479775159010da5a6137..d7c5bb7dfc46ecf1efc8fdf0a0d919484f5c6bb4 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExempted-noTPMLM.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExempted-noTPMLM.vecto
@@ -8,6 +8,7 @@
"Body": {
"PrimaryVehicle": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.4\\exempted_primary_heavyBus.xml",
"InterimStep": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.4\\vecto_vehicle-exempted_input_completewithoutTMPLM.xml",
- "Completed": false
+ "Completed": false,
+ "RunSimulation": true
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExempted.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExempted.vecto
index 9decd02ecd28e387f35df396ab55297fa60a322e..ea7d160b3fe6c37336a458b351fc62788be0c4dc 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExempted.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExempted.vecto
@@ -8,6 +8,7 @@
"Body": {
"PrimaryVehicle": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.4\\exempted_primary_heavyBus.xml",
"InterimStep": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.4\\vecto_vehicle-exempted_input_full-sample.xml",
- "Completed": false
+ "Completed": false,
+ "RunSimulation": true
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExemptedIncomplete.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExemptedIncomplete.vecto
index 815d40babfe59c35a0b26bbb1c6a3af3eb55163c..d4ca29ab4b50283e47076599434b93b63e7a5fda 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExemptedIncomplete.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifExemptedIncomplete.vecto
@@ -8,6 +8,7 @@
"Body": {
"PrimaryVehicle": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.4\\exempted_primary_heavyBus.xml",
"InterimStep": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.4\\vecto_vehicle-exempted_input_interim-sample.xml",
- "Completed": false
+ "Completed": false,
+ "RunSimulation": true
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifInterimDiesel.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifInterimDiesel.vecto
index 8c711483841600928f41c4c07854380b23e2dfb7..8707551e872ff93b1506a204572937050a1d1ec9 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifInterimDiesel.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Multistage/newVifInterimDiesel.vecto
@@ -8,6 +8,7 @@
"Body": {
"PrimaryVehicle": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.4\\vecto_vehicle-primary_heavyBus-sample.xml",
"InterimStep": "..\\..\\XML\\XMLReaderDeclaration\\SchemaVersion2.4\\vecto_vehicle-stage_input_full-sample.xml",
- "Completed": false
+ "Completed": false,
+ "RunSimulation": true
}
}
\ No newline at end of file