diff --git a/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs b/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs index efe613a3d1817aa2ed2c90204d96bc0c213a497b..c8c4ab8527c33b7d55bfbcafce5feb6c8ee2c343 100644 --- a/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs +++ b/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs @@ -186,11 +186,13 @@ namespace TUGraz.VectoCore.Tests.Integration var modFileName = "40t_Long_Haul_Truck_RegionalDeliveryFullLoading.vmod"; var modFileName1Hz = "40t_Long_Haul_Truck_RegionalDeliveryFullLoading_1Hz.vmod"; - if (File.Exists(modFileName)) + if (File.Exists(modFileName)) { File.Delete(modFileName); + } - if (File.Exists(modFileName1Hz)) + if (File.Exists(modFileName1Hz)) { File.Delete(modFileName1Hz); + } var inputData = JSONInputDataFactory.ReadJsonJob(LongHaulTruckDeclarationJob); var fileWriter = new FileOutputWriter("Truck40t_Mod1Hz_Test.vecto"); @@ -286,7 +288,7 @@ namespace TUGraz.VectoCore.Tests.Integration var jobContainer = new JobContainer(sumData); jobContainer.AddRuns(factory); - //var i = 7; + //var i = 2; //jobContainer.Runs[i].Run.Run(); //Assert.IsTrue(jobContainer.Runs[i].Run.FinishedWithoutErrors); @@ -299,7 +301,10 @@ namespace TUGraz.VectoCore.Tests.Integration jobContainer.Execute(); jobContainer.WaitFinished(); - Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat(jobContainer.Runs.Select(r => r.ExecException))); + Assert.IsTrue(jobContainer.Runs.All(r => r.Success), + string.Format("folowing runs failed: {0}\n{1}", + string.Concat(jobContainer.Runs.Where(r => !r.Success).Select(r => r.Run.RunName + " - " + r.Run.CycleName)), + string.Concat(jobContainer.Runs.Select(r => r.ExecException)))); } [TestMethod, TestCategory("LongRunning")] diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/12t Truck/Axle.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/12t Truck/Axle.vtlm index 43304b2042f5dc8327298a07fb4ae45c4b2786f9..47a86befe8b13daf315be18f09a466b00866224b 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/12t Truck/Axle.vtlm +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/12t Truck/Axle.vtlm @@ -152,3 +152,5 @@ Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm],Eff [-] 3200,4500,107.5 3200,5500,122.5 3200,6500,137.5 +0, -10000, 300 +3200,-10000, 175 \ No newline at end of file