From fd78a3e87b46bd9491260e0b0f1688a11f3d01e9 Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Thu, 25 Mar 2021 18:40:57 +0100 Subject: [PATCH] more testcases for APT and P3/P4 hybrid --- .../Integration/Hybrid/ParallelHybridTest.cs | 27 +++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs b/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs index 131706eca5..b536cf3919 100644 --- a/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs +++ b/VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs @@ -950,10 +950,33 @@ namespace TUGraz.VectoCore.Tests.Integration.Hybrid graphWriter.Write(modFilename); } - public const string Group5_APT = @"TestData\Hybrids\GenericVehicle_Group5_P3_APT\P3 APT Group 5.vecto"; + public const string Group5_P3_APT = @"TestData\Hybrids\GenericVehicle_Group5_P3_APT\P3 APT Group 5.vecto"; + public const string Group5_P4_APT = @"TestData\Hybrids\GenericVehicle_Group5_P4_APT\P4 APT Group 5.vecto"; - [TestCase(Group5_APT, 9, TestName = "P3 APT Hybrid Group 5 Vehicle Prop TorqueLimit DriveCycle UrbanDelivery"), + [ + TestCase(Group5_P3_APT, 0, TestName = "P3 APT Hybrid Group 5 DriveCycle LongHaul"), + TestCase(Group5_P3_APT, 1, TestName = "P3 APT Hybrid Group 5 DriveCycle Coach"), + TestCase(Group5_P3_APT, 2, TestName = "P3 APT Hybrid Group 5 DriveCycle Construction"), + TestCase(Group5_P3_APT, 3, TestName = "P3 APT Hybrid Group 5 DriveCycle HeavyUrban"), + TestCase(Group5_P3_APT, 4, TestName = "P3 APT Hybrid Group 5 DriveCycle Interurban"), + TestCase(Group5_P3_APT, 5, TestName = "P3 APT Hybrid Group 5 DriveCycle MunicipalUtility"), + TestCase(Group5_P3_APT, 6, TestName = "P3 APT Hybrid Group 5 DriveCycle RegionalDelivery"), + TestCase(Group5_P3_APT, 7, TestName = "P3 APT Hybrid Group 5 DriveCycle Suburban"), + TestCase(Group5_P3_APT, 8, TestName = "P3 APT Hybrid Group 5 DriveCycle Urban"), + TestCase(Group5_P3_APT, 9, TestName = "P3 APT Hybrid Group 5 DriveCycle UrbanDelivery"), + + TestCase(Group5_P4_APT, 0, TestName = "P4 APT Hybrid Group 5 DriveCycle LongHaul"), + TestCase(Group5_P4_APT, 1, TestName = "P4 APT Hybrid Group 5 DriveCycle Coach"), + TestCase(Group5_P4_APT, 2, TestName = "P4 APT Hybrid Group 5 DriveCycle Construction"), + TestCase(Group5_P4_APT, 3, TestName = "P4 APT Hybrid Group 5 DriveCycle HeavyUrban"), + TestCase(Group5_P4_APT, 4, TestName = "P4 APT Hybrid Group 5 DriveCycle Interurban"), + TestCase(Group5_P4_APT, 5, TestName = "P4 APT Hybrid Group 5 DriveCycle MunicipalUtility"), + TestCase(Group5_P4_APT, 6, TestName = "P4 APT Hybrid Group 5 DriveCycle RegionalDelivery"), + TestCase(Group5_P4_APT, 7, TestName = "P4 APT Hybrid Group 5 DriveCycle Suburban"), + TestCase(Group5_P4_APT, 8, TestName = "P4 APT Hybrid Group 5 DriveCycle Urban"), + TestCase(Group5_P4_APT, 9, TestName = "P4 APT Hybrid Group 5 DriveCycle UrbanDelivery"), + ] public void P3APTHybridGroup5DriveCycle(string jobFile, int cycleIdx) { -- GitLab