diff --git a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs index 892272536915fc1d490d0a2b8096622e120c72ca..a663236ca2b94cf190a9237b60f15db68093d1e5 100644 --- a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs +++ b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs @@ -15,6 +15,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS [Parallelizable(ParallelScope.All)] public class ADASTestsHEV { + const string Group5NoPCC = @"TestData\Integration\ADAS-HEV\Group5PCCEng\Class5_Tractor_ENG.vecto"; const string Group5PCC12 = @"TestData\Integration\ADAS-HEV\Group5PCCEng\Class5_Tractor_ENG_PCC12.vecto"; const string Group5PCC123 = @"TestData\Integration\ADAS-HEV\Group5PCCEng\Class5_Tractor_ENG_PCC123.vecto"; const string Group5PCC123EcoSS = @"TestData\Integration\ADAS-HEV\Group5PCCEng\Class5_Tractor_ENG_PCC123EcoSS.vecto"; @@ -164,7 +165,19 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS GetGraphWriter().Write(modFilename); } - [ + [TestCase(Group5NoPCC, 0, TestName = "G5Eng NoPCC CrestCoast 1"), + TestCase(Group5NoPCC, 1, TestName = "G5Eng NoPCC CrestCoast 2"), + TestCase(Group5NoPCC, 2, TestName = "G5Eng NoPCC Case A"), // Case A + TestCase(Group5NoPCC, 3, TestName = "G5Eng NoPCC Case B"), // Case B + TestCase(Group5NoPCC, 4, TestName = "G5Eng NoPCC Case C"), // Case C + TestCase(Group5NoPCC, 5, TestName = "G5Eng NoPCC Case D"), // Case D + TestCase(Group5NoPCC, 6, TestName = "G5Eng NoPCC Case E"), // Case E + TestCase(Group5NoPCC, 7, TestName = "G5Eng NoPCC Case F"), // Case F + TestCase(Group5NoPCC, 8, TestName = "G5Eng NoPCC Case G"), // Case G + TestCase(Group5NoPCC, 9, TestName = "G5Eng NoPCC Case H"), // Case H + TestCase(Group5NoPCC, 10, TestName = "G5Eng NoPCC Case I"), // Case I + TestCase(Group5NoPCC, 11, TestName = "G5Eng NoPCC Case J"), // Case J + TestCase(Group5PCC12, 0, TestName = "G5Eng PCC12 CrestCoast 1"), TestCase(Group5PCC12, 1, TestName = "G5Eng PCC12 CrestCoast 2"), TestCase(Group5PCC12, 2, TestName = "G5Eng PCC12 Case A"), // Case A @@ -178,6 +191,8 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS TestCase(Group5PCC12, 10, TestName = "G5Eng PCC12 Case I"), // Case I TestCase(Group5PCC12, 11, TestName = "G5Eng PCC12 Case J"), // Case J + TestCase(Group5PCC123, 0, TestName = "G5Eng PCC123 CrestCoast 1"), + TestCase(Group5PCC123, 1, TestName = "G5Eng PCC123 CrestCoast 2"), TestCase(Group5PCC123, 2, TestName = "G5Eng PCC123 Case A"), // Case A TestCase(Group5PCC123, 3, TestName = "G5Eng PCC123 Case B"), // Case B TestCase(Group5PCC123, 4, TestName = "G5Eng PCC123 Case C"), // Case C @@ -189,6 +204,8 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS TestCase(Group5PCC123, 10, TestName = "G5Eng PCC123 Case I"), // Case I TestCase(Group5PCC123, 11, TestName = "G5Eng PCC123 Case J"), // Case J + TestCase(Group5PCC123EcoSS, 0, TestName = "G5Eng PCC123-EcoSS CrestCoast 1"), + TestCase(Group5PCC123EcoSS, 1, TestName = "G5Eng PCC123-EcoSS CrestCoast 2"), TestCase(Group5PCC123EcoSS, 2, TestName = "G5Eng PCC123-EcoSS Case A"), // Case A TestCase(Group5PCC123EcoSS, 3, TestName = "G5Eng PCC123-EcoSS Case B"), // Case B TestCase(Group5PCC123EcoSS, 4, TestName = "G5Eng PCC123-EcoSS Case C"), // Case C diff --git a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsPEV.cs b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsPEV.cs index 4c4ac2b007a3dfc35d3203e4a6c9b23668019abb..80d09b370505a9873ea23acda83f7465ab3afd43 100644 --- a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsPEV.cs +++ b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsPEV.cs @@ -15,6 +15,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS [Parallelizable(ParallelScope.All)] public class ADASTestsPEV { + const string Group5NoPCC = @"TestData\Integration\ADAS-PEV\Group5PCCEng\Class5_Tractor_ENG.vecto"; const string Group5PCC12 = @"TestData\Integration\ADAS-PEV\Group5PCCEng\Class5_Tractor_ENG_PCC12.vecto"; const string Group5PCC123 = @"TestData\Integration\ADAS-PEV\Group5PCCEng\Class5_Tractor_ENG_PCC123.vecto"; const string Group5PCC123EcoSS = @"TestData\Integration\ADAS-PEV\Group5PCCEng\Class5_Tractor_ENG_PCC123EcoSS.vecto"; @@ -40,8 +41,22 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS graphWriter.PlotIgnitionState = true; return graphWriter; } - - [TestCase(Group5PCC12, 0, TestName = "G5Eng PCC12 CrestCoast 1"), + + [ + TestCase(Group5NoPCC, 0, TestName = "G5Eng NoPCC CrestCoast 1"), + TestCase(Group5NoPCC, 1, TestName = "G5Eng NoPCC CrestCoast 2"), + TestCase(Group5NoPCC, 2, TestName = "G5Eng NoPCC Case A"), // Case A: Tests Use-Case 1: Creast Coasting (allowing slower speed before a crest) + TestCase(Group5NoPCC, 3, TestName = "G5Eng NoPCC Case B"), // Case B: + TestCase(Group5NoPCC, 4, TestName = "G5Eng NoPCC Case C"), // Case C + TestCase(Group5NoPCC, 5, TestName = "G5Eng NoPCC Case D"), // Case D: Test two crests after each other + TestCase(Group5NoPCC, 6, TestName = "G5Eng NoPCC Case E"), // Case E + TestCase(Group5NoPCC, 7, TestName = "G5Eng NoPCC Case F"), // Case F + TestCase(Group5NoPCC, 8, TestName = "G5Eng NoPCC Case G"), // Case G: PCC Use Case 1 even if there is a small dip inbetween (at the crest) + TestCase(Group5NoPCC, 9, TestName = "G5Eng NoPCC Case H"), // Case H + TestCase(Group5NoPCC, 10, TestName = "G5Eng NoPCC Case I"), // Case I + TestCase(Group5NoPCC, 11, TestName = "G5Eng NoPCC Case J"), // Case J + + TestCase(Group5PCC12, 0, TestName = "G5Eng PCC12 CrestCoast 1"), TestCase(Group5PCC12, 1, TestName = "G5Eng PCC12 CrestCoast 2"), TestCase(Group5PCC12, 2, TestName = "G5Eng PCC12 Case A"), // Case A: Tests Use-Case 1: Creast Coasting (allowing slower speed before a crest) TestCase(Group5PCC12, 3, TestName = "G5Eng PCC12 Case B"), // Case B: