diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs b/VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs index 7d18e4f1948f64c47a08f266b6d01f95d83a59db..7327c277ac65187c5ea8a1846e968f0c4d248679 100644 --- a/VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs +++ b/VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs @@ -76,7 +76,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl { return Runs.Select( - r => new CycleTypeDescription { Name = r.Run.CycleName, CycleType = r.Run.GetContainer().RunData.Cycle.CycleType }) + r => new CycleTypeDescription { Name = r.Run.CycleName, CycleType = r.Run.GetContainer().RunData.Cycle.CycleType }) .Distinct(); } @@ -210,7 +210,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl ExecException = ex; } stopWatch.Stop(); - Success = Run.FinishedWithoutErrors; + Success = Run.FinishedWithoutErrors && ExecException == null; Done = true; ExecTime = stopWatch.Elapsed.TotalMilliseconds; JobContainer.JobCompleted(); diff --git a/VectoCore/VectoCoreTest/Integration/SimulationRuns/TestSimulationRuns.cs b/VectoCore/VectoCoreTest/Integration/SimulationRuns/TestSimulationRuns.cs index 09f7316ea70bc5255bb1ebf044d6ef685b6bf8f6..765ffee5277dcfbb95e7ec299c53e9d59f5284bc 100644 --- a/VectoCore/VectoCoreTest/Integration/SimulationRuns/TestSimulationRuns.cs +++ b/VectoCore/VectoCoreTest/Integration/SimulationRuns/TestSimulationRuns.cs @@ -3,7 +3,9 @@ using NUnit.Framework; using TUGraz.VectoCommon.Models; using TUGraz.VectoCore.InputData.FileIO.JSON; using TUGraz.VectoCore.Models.Simulation.Impl; +using TUGraz.VectoCore.OutputData.FileIO; using TUGraz.VectoCore.Tests.Models.Simulation; +using TUGraz.VectoCore.Tests.Utils; namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns { @@ -16,8 +18,9 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns TestCase("Silberholz-20161121")] public static void RunJob_Eng(string jobName) { + var writer = new FileOutputWriter(jobName); var inputData = JSONInputDataFactory.ReadJsonJob("TestData\\Bugs\\" + jobName + "\\job.vecto"); - var factory = new SimulatorFactory(ExecutionMode.Engineering, inputData, null); + var factory = new SimulatorFactory(ExecutionMode.Engineering, inputData, writer); var jobContainer = new JobContainer(new MockSumWriter()); jobContainer.AddRuns(factory); jobContainer.Execute();