diff --git a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTests.cs b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTests.cs index c462bf45956102e805acdf29104d5e19d3034c3b..9a5981be2d8504706b782ed7dd9e59b086e28d64 100644 --- a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTests.cs +++ b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTests.cs @@ -111,7 +111,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS jobContainer.WaitFinished(); var progress = jobContainer.GetProgress(); - Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat<Exception>(progress.Select(r => r.Value.Error))); + Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat(progress.Select(r => r.Value.Error))); var modFilename = writer.GetModDataFileName(run.RunName, run.CycleName, run.RunSuffix); GetGraphWriter().Write(modFilename); } @@ -152,7 +152,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS jobContainer.WaitFinished(); var progress = jobContainer.GetProgress(); - Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat<Exception>(progress.Select(r => r.Value.Error))); + Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat(progress.Select(r => r.Value.Error))); var modFilename = writer.GetModDataFileName(run.RunName, run.CycleName, run.RunSuffix); GetGraphWriter().Write(modFilename); } @@ -193,7 +193,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS jobContainer.WaitFinished(); var progress = jobContainer.GetProgress(); - Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat<Exception>(progress.Select(r => r.Value.Error))); + Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat(progress.Select(r => r.Value.Error))); var modFilename = writer.GetModDataFileName(run.RunName, run.CycleName, run.RunSuffix); GetGraphWriter().Write(modFilename); } @@ -287,7 +287,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS jobContainer.WaitFinished(); var progress = jobContainer.GetProgress(); - Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat<Exception>(progress.Select(r => r.Value.Error))); + Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat(progress.Select(r => r.Value.Error))); var modFilename = writer.GetModDataFileName(run.RunName, run.CycleName, run.RunSuffix); GetGraphWriter().Write(modFilename); } @@ -315,7 +315,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS jobContainer.WaitFinished(); var progress = jobContainer.GetProgress(); - Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat<Exception>(progress.Select(r => r.Value.Error))); + Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat(progress.Select(r => r.Value.Error))); return jobContainer; } @@ -346,7 +346,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS jobContainer.WaitFinished(); var progress = jobContainer.GetProgress(); - Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat<Exception>(progress.Select(r => r.Value.Error))); + Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat(progress.Select(r => r.Value.Error))); //var run = jobContainer.Runs[runIdx].Run; //run.Run(); diff --git a/VectoCore/VectoCoreTest/Integration/AMTShiftStrategyTests.cs b/VectoCore/VectoCoreTest/Integration/AMTShiftStrategyTests.cs index f0ff60e0e64bbea753132bc3c85f03b9898e6d47..73d27a4a754efa732b8ab124d30c565bb522631a 100644 --- a/VectoCore/VectoCoreTest/Integration/AMTShiftStrategyTests.cs +++ b/VectoCore/VectoCoreTest/Integration/AMTShiftStrategyTests.cs @@ -78,8 +78,8 @@ namespace TUGraz.VectoCore.Tests.Integration jobContainer.Execute(); jobContainer.WaitFinished(); var progress = jobContainer.GetProgress(); - Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat<Exception>(progress.Select(r => r.Value.Error))); - Assert.IsTrue(jobContainer.Runs.All(r => r.Success), String.Concat<Exception>(jobContainer.Runs.Select(r => r.ExecException))); + Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat(progress.Select(r => r.Value.Error))); + Assert.IsTrue(jobContainer.Runs.All(r => r.Success), String.Concat(jobContainer.Runs.Select(r => r.ExecException))); } } diff --git a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs index 3fef96fd45fa2bf81309f37eb8080a1f91b1f136..52884da0ee1b4a13163a621dff94d11a1cb5e533 100644 --- a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs +++ b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs @@ -1085,8 +1085,8 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus jobContainer.Execute(); jobContainer.WaitFinished(); var progress = jobContainer.GetProgress(); - Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat<Exception>(progress.Select(r => r.Value.Error))); - Assert.IsTrue(jobContainer.Runs.All(r => r.Success), String.Concat<Exception>(jobContainer.Runs.Select(r => r.ExecException))); + Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat(progress.Select(r => r.Value.Error))); + Assert.IsTrue(jobContainer.Runs.All(r => r.Success), String.Concat(jobContainer.Runs.Select(r => r.ExecException))); } [TestCase(@"TestData\Integration\Buses\FactorMethod\vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.xml", 13, TestName = "RunBusSimulation electric STP/Fan ESS IU/RL"), diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs b/VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs index 4be58cff7d127124e6c66da1ed51a13de0c68ccc..f487abd323e5431443375014ac40dbf5f458387b 100644 --- a/VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs +++ b/VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs @@ -106,7 +106,7 @@ namespace TUGraz.VectoCore.Tests.Integration jobContainer.Execute(); jobContainer.WaitFinished(); var progress = jobContainer.GetProgress(); - Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat<Exception>(progress.Select(r => r.Value.Error))); + Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat(progress.Select(r => r.Value.Error))); Assert.IsTrue(File.Exists(manufactuerFile)); Assert.IsTrue(File.Exists(customerFile)); diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/VocationalVehicleTest.cs b/VectoCore/VectoCoreTest/Integration/Declaration/VocationalVehicleTest.cs index 8705ce467f1be8ab8195dec9d32c72883d73aa51..05b72fc4ec65f1f4d9761d58ebedf402ee8fef5f 100644 --- a/VectoCore/VectoCoreTest/Integration/Declaration/VocationalVehicleTest.cs +++ b/VectoCore/VectoCoreTest/Integration/Declaration/VocationalVehicleTest.cs @@ -85,7 +85,7 @@ namespace TUGraz.VectoCore.Tests.Integration jobContainer.Execute(); jobContainer.WaitFinished(); var progress = jobContainer.GetProgress(); - Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat<Exception>(progress.Select(r => r.Value.Error))); + Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat(progress.Select(r => r.Value.Error))); } } } diff --git a/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs b/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs index ed000eb7d38711d7a9c60e0cdecf0debe6f78020..30eff5400243d28de14e78fa728cacdc65041640 100644 --- a/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs +++ b/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs @@ -97,7 +97,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage jobContainer.Execute(); jobContainer.WaitFinished(); var progress = jobContainer.GetProgress(); - Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat<Exception>(progress.Select(r => r.Value.Error))); + Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat(progress.Select(r => r.Value.Error))); using (var xmlReader = XmlReader.Create(writer.XMLMultistageReportFileName)) { var validator = new XMLValidator(xmlReader); @@ -135,7 +135,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage jobContainer.Execute(); jobContainer.WaitFinished(); var progress = jobContainer.GetProgress(); - Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat<Exception>(progress.Select(r => r.Value.Error))); + Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat(progress.Select(r => r.Value.Error))); using (var xmlReader = XmlReader.Create(writer.XMLMultistageReportFileName)) { @@ -343,8 +343,8 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage jobContainer.Execute(); jobContainer.WaitFinished(); var progress = jobContainer.GetProgress(); - Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat<Exception>(progress.Select(r => r.Value.Error))); - Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat<Exception>(jobContainer.Runs.Select(r => r.ExecException))); + Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat(progress.Select(r => r.Value.Error))); + Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat(jobContainer.Runs.Select(r => r.ExecException))); } [NonParallelizable] @@ -391,8 +391,8 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage jobContainer.WaitFinished(); var progress = jobContainer.GetProgress(); - Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat<Exception>(progress.Select(r => r.Value.Error))); - Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat<Exception>(jobContainer.Runs.Select(r => r.ExecException))); + Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat(progress.Select(r => r.Value.Error))); + Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat(jobContainer.Runs.Select(r => r.ExecException))); } diff --git a/VectoCore/VectoCoreTest/Integration/RoadSweepers/RoadSweeperTests.cs b/VectoCore/VectoCoreTest/Integration/RoadSweepers/RoadSweeperTests.cs index e39ceeb87b508f2e21a3b47987f8e3d7156c55db..309efab926658ed494f85bc8e0a80a90bb5f0743 100644 --- a/VectoCore/VectoCoreTest/Integration/RoadSweepers/RoadSweeperTests.cs +++ b/VectoCore/VectoCoreTest/Integration/RoadSweepers/RoadSweeperTests.cs @@ -214,7 +214,7 @@ namespace TUGraz.VectoCore.Tests.Integration.RoadSweepers jobContainer.WaitFinished(); var progress = jobContainer.GetProgress(); - Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat<Exception>(progress.Select(r => r.Value.Error))); + Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat(progress.Select(r => r.Value.Error))); } @@ -253,7 +253,7 @@ namespace TUGraz.VectoCore.Tests.Integration.RoadSweepers jobContainer.WaitFinished(); var progress = jobContainer.GetProgress(); - Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat<Exception>(progress.Select(r => r.Value.Error))); + Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat(progress.Select(r => r.Value.Error))); } public class EngineeringJobInputData : IEngineeringInputDataProvider, IEngineeringJobInputData diff --git a/VectoCore/VectoCoreTest/Models/Simulation/ShiftStrategyV2Test.cs b/VectoCore/VectoCoreTest/Models/Simulation/ShiftStrategyV2Test.cs index 80cf1d33da17ad8a791309a910b32d2d0c77ff36..6cce70c95eff8275ab29dffea6752f7866d6989a 100644 --- a/VectoCore/VectoCoreTest/Models/Simulation/ShiftStrategyV2Test.cs +++ b/VectoCore/VectoCoreTest/Models/Simulation/ShiftStrategyV2Test.cs @@ -325,8 +325,8 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation jobContainer.Execute(); jobContainer.WaitFinished(); var progress = jobContainer.GetProgress(); - Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat<Exception>(progress.Select(r => r.Value.Error))); - Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat<Exception>(jobContainer.Runs.Select(r => r.ExecException))); + Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat(progress.Select(r => r.Value.Error))); + Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat(jobContainer.Runs.Select(r => r.ExecException))); } @@ -366,8 +366,8 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation jobContainer.Execute(); jobContainer.WaitFinished(); var progress = jobContainer.GetProgress(); - Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat<Exception>(progress.Select(r => r.Value.Error))); - Assert.IsTrue(jobContainer.Runs.All(r => r.Success), String.Concat<Exception>(jobContainer.Runs.Select(r => r.ExecException))); + Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat(progress.Select(r => r.Value.Error))); + Assert.IsTrue(jobContainer.Runs.All(r => r.Success), String.Concat(jobContainer.Runs.Select(r => r.ExecException))); } }