From b6bdb3abf9b87c9a322a9a243e4ed1c626773e7c Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Wed, 20 Jul 2016 09:05:58 +0200
Subject: [PATCH] explicit naming of nunit testcases (to avoid warnings,
simpler names)
---
.../Integration/BusAuxiliaries/AAuxTests.cs | 42 +++++++----
.../DriverStrategy/SimpleCycles.cs | 73 +++++++++++--------
2 files changed, 69 insertions(+), 46 deletions(-)
diff --git a/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AAuxTests.cs b/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AAuxTests.cs
index 8c895ca1fa..4f17a888a4 100644
--- a/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AAuxTests.cs
+++ b/VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AAuxTests.cs
@@ -203,34 +203,48 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
[Category("ComparisonAAUX"),
TestCase(SimpleDrivingCycles.CycleDrive_80_Increasing_Slope,
- "Coach_AAux_Drive_80_slope_inc.vmod", "24t Coach_AAux_Cycle_Drive_80_Increasing_Slope.vmod"),
+ "Coach_AAux_Drive_80_slope_inc.vmod", "24t Coach_AAux_Cycle_Drive_80_Increasing_Slope.vmod",
+ TestName = "CoachBusAux CycleDrive_80_Increasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDrive_50_Increasing_Slope,
- "Coach_AAux_Drive_50_slope_inc.vmod", "24t Coach_AAux_Cycle_Drive_50_Increasing_Slope.vmod"),
+ "Coach_AAux_Drive_50_slope_inc.vmod", "24t Coach_AAux_Cycle_Drive_50_Increasing_Slope.vmod",
+ TestName = "CoachBusAux CycleDrive_50_Increasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDrive_30_Increasing_Slope,
- "Coach_AAux_Drive_30_slope_inc.vmod", "24t Coach_AAux_Cycle_Drive_30_Increasing_Slope.vmod"),
+ "Coach_AAux_Drive_30_slope_inc.vmod", "24t Coach_AAux_Cycle_Drive_30_Increasing_Slope.vmod",
+ TestName = "CoachBusAux CycleDrive_30_Increasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDrive_80_Decreasing_Slope,
- "Coach_AAux_Drive_80_slope_dec.vmod", "24t Coach_AAux_Cycle_Drive_80_Decreasing_Slope.vmod"),
+ "Coach_AAux_Drive_80_slope_dec.vmod", "24t Coach_AAux_Cycle_Drive_80_Decreasing_Slope.vmod",
+ TestName = "CoachBusAux CycleDrive_80_Decreasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDrive_50_Decreasing_Slope,
- "Coach_AAux_Drive_50_slope_dec.vmod", "24t Coach_AAux_Cycle_Drive_50_Decreasing_Slope.vmod"),
+ "Coach_AAux_Drive_50_slope_dec.vmod", "24t Coach_AAux_Cycle_Drive_50_Decreasing_Slope.vmod",
+ TestName = "CoachBusAux CycleDrive_50_Decreasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDrive_30_Decreasing_Slope,
- "Coach_AAux_Drive_30_slope_dec.vmod", "24t Coach_AAux_Cycle_Drive_30_Decreasing_Slope.vmod"),
+ "Coach_AAux_Drive_30_slope_dec.vmod", "24t Coach_AAux_Cycle_Drive_30_Decreasing_Slope.vmod",
+ TestName = "CoachBusAux CycleDrive_30_Decreasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDrive_80_Dec_Increasing_Slope,
- "Coach_AAux_Drive_80_slope_dec-inc.vmod", "24t Coach_AAux_Cycle_Drive_80_Dec_Increasing_Slope.vmod"),
+ "Coach_AAux_Drive_80_slope_dec-inc.vmod", "24t Coach_AAux_Cycle_Drive_80_Dec_Increasing_Slope.vmod",
+ TestName = "CoachBusAux CycleDrive_80_Dec_Increasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDrive_50_Dec_Increasing_Slope,
- "Coach_AAux_Drive_50_slope_dec-inc.vmod", "24t Coach_AAux_Cycle_Drive_50_Dec_Increasing_Slope.vmod"),
+ "Coach_AAux_Drive_50_slope_dec-inc.vmod", "24t Coach_AAux_Cycle_Drive_50_Dec_Increasing_Slope.vmod",
+ TestName = "CoachBusAux CycleDrive_50_Dec_Increasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDrive_30_Dec_Increasing_Slope,
- "Coach_AAux_Drive_30_slope_dec-inc.vmod", "24t Coach_AAux_Cycle_Drive_30_Dec_Increasing_Slope.vmod"),
+ "Coach_AAux_Drive_30_slope_dec-inc.vmod", "24t Coach_AAux_Cycle_Drive_30_Dec_Increasing_Slope.vmod",
+ TestName = "CoachBusAux CycleDrive_30_Dec_Increasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDecelerateWhileBrake_80_0_level,
- "Coach_AAux_DecelerateWhileBrake_80_0_level.vmod", "24t Coach_AAux_Cycle_DecelerateWhileBrake_80_0_level.vmod"),
+ "Coach_AAux_DecelerateWhileBrake_80_0_level.vmod", "24t Coach_AAux_Cycle_DecelerateWhileBrake_80_0_level.vmod",
+ TestName = "CoachBusAux CycleDecelerateWhileBrake_80_0_level"),
TestCase(SimpleDrivingCycles.CycleAccelerateWhileBrake_80_0_level,
- "Coach_AAux_AccelerateWhileBrake_80_0_level.vmod", "24t Coach_AAux_Cycle_AccelerateWhileBrake_80_0_level.vmod"),
+ "Coach_AAux_AccelerateWhileBrake_80_0_level.vmod", "24t Coach_AAux_Cycle_AccelerateWhileBrake_80_0_level.vmod",
+ TestName = "CoachBusAux CycleAccelerateWhileBrake_80_0_level"),
TestCase(SimpleDrivingCycles.CycleAccelerateAtBrake_80_0_level,
- "Coach_AAux_AccelerateAtBrake_80_0_level.vmod", "24t Coach_AAux_Cycle_AccelerateAtBrake_80_0_level.vmod"),
+ "Coach_AAux_AccelerateAtBrake_80_0_level.vmod", "24t Coach_AAux_Cycle_AccelerateAtBrake_80_0_level.vmod",
+ TestName = "CoachBusAux CycleAccelerateAtBrake_80_0_level"),
TestCase(SimpleDrivingCycles.CycleAccelerateBeforeBrake_80_0_level,
- "Coach_AAux_AccelerateBeforeBrake_80_0_level.vmod", "24t Coach_AAux_Cycle_AccelerateBeforeBrake_80_0_level.vmod"
+ "Coach_AAux_AccelerateBeforeBrake_80_0_level.vmod", "24t Coach_AAux_Cycle_AccelerateBeforeBrake_80_0_level.vmod",
+ TestName = "CoachBusAux CycleAccelerateBeforeBrake_80_0_level"
),
TestCase(SimpleDrivingCycles.CycleDrive_stop_85_stop_85_level,
- "Coach_AAux_Drive_stop_85_stop_85_level.vmod", "24t Coach_AAux_Cycle_Drive_stop_85_stop_85_level.vmod"),
+ "Coach_AAux_Drive_stop_85_stop_85_level.vmod", "24t Coach_AAux_Cycle_Drive_stop_85_stop_85_level.vmod",
+ TestName = "CoachBusAux CycleDrive_stop_85_stop_85_level"),
]
public void Coach_BusAuxiliaries(string cycleData, string modFileName, string compareFileName)
{
diff --git a/VectoCore/VectoCoreTest/Integration/DriverStrategy/SimpleCycles.cs b/VectoCore/VectoCoreTest/Integration/DriverStrategy/SimpleCycles.cs
index a69699dc77..a371b8a003 100644
--- a/VectoCore/VectoCoreTest/Integration/DriverStrategy/SimpleCycles.cs
+++ b/VectoCore/VectoCoreTest/Integration/DriverStrategy/SimpleCycles.cs
@@ -194,34 +194,37 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[Category("ComparisonV2"),
TestCase(SimpleDrivingCycles.CycleDrive_80_Increasing_Slope,
- "40t_Long_Haul_Truck_Cycle_Drive_80_Increasing_Slope.vmod", GearboxType.AMT),
+ "40t_Long_Haul_Truck_Cycle_Drive_80_Increasing_Slope.vmod", GearboxType.AMT, TestName = "TruckSpecial CycleDrive_80_Increasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDrive_50_Increasing_Slope,
- "40t_Long_Haul_Truck_Cycle_Drive_50_Increasing_Slope.vmod", GearboxType.AMT),
+ "40t_Long_Haul_Truck_Cycle_Drive_50_Increasing_Slope.vmod", GearboxType.AMT, TestName = "TruckSpecial CycleDrive_50_Increasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDrive_30_Increasing_Slope,
- "40t_Long_Haul_Truck_Cycle_Drive_30_Increasing_Slope.vmod", GearboxType.AMT),
+ "40t_Long_Haul_Truck_Cycle_Drive_30_Increasing_Slope.vmod", GearboxType.AMT, TestName = "TruckSpecial CycleDrive_30_Increasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDrive_80_Decreasing_Slope,
- "40t_Long_Haul_Truck_Cycle_Drive_80_Decreasing_Slope.vmod", GearboxType.AMT),
+ "40t_Long_Haul_Truck_Cycle_Drive_80_Decreasing_Slope.vmod", GearboxType.AMT, TestName = "TruckSpecial CycleDrive_80_Decreasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDrive_50_Decreasing_Slope,
- "40t_Long_Haul_Truck_Cycle_Drive_50_Decreasing_Slope.vmod", GearboxType.AMT),
+ "40t_Long_Haul_Truck_Cycle_Drive_50_Decreasing_Slope.vmod", GearboxType.AMT, TestName = "TruckSpecial CycleDrive_50_Decreasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDrive_30_Decreasing_Slope,
- "40t_Long_Haul_Truck_Cycle_Drive_30_Decreasing_Slope.vmod", GearboxType.AMT),
+ "40t_Long_Haul_Truck_Cycle_Drive_30_Decreasing_Slope.vmod", GearboxType.AMT, TestName = "TruckSpecial CycleDrive_30_Decreasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDrive_80_Dec_Increasing_Slope,
- "40t_Long_Haul_Truck_Cycle_Drive_80_Dec_Increasing_Slope.vmod", GearboxType.AMT),
+ "40t_Long_Haul_Truck_Cycle_Drive_80_Dec_Increasing_Slope.vmod", GearboxType.AMT, TestName = "TruckSpecial CycleDrive_80_Dec_Increasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDrive_50_Dec_Increasing_Slope,
- "40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope.vmod", GearboxType.AMT),
+ "40t_Long_Haul_Truck_Cycle_Drive_50_Dec_Increasing_Slope.vmod", GearboxType.AMT, TestName = "TruckSpecial CycleDrive_50_Dec_Increasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDrive_30_Dec_Increasing_Slope,
- "40t_Long_Haul_Truck_Cycle_Drive_30_Dec_Increasing_Slope.vmod", GearboxType.AMT),
+ "40t_Long_Haul_Truck_Cycle_Drive_30_Dec_Increasing_Slope.vmod", GearboxType.AMT, TestName = "TruckSpecial CycleDrive_30_Dec_Increasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDecelerateWhileBrake_80_0_level,
- "40t_Long_Haul_Truck_Cycle_DecelerateWhileBrake_80_0_level.vmod", GearboxType.AMT),
+ "40t_Long_Haul_Truck_Cycle_DecelerateWhileBrake_80_0_level.vmod", GearboxType.AMT, TestName = "TruckSpecial CycleDecelerateWhileBrake_80_0_level"),
TestCase(SimpleDrivingCycles.CycleAccelerateWhileBrake_80_0_level,
- "40t_Long_Haul_Truck_Cycle_AccelerateWhileBrake_80_0_level.vmod", GearboxType.AMT),
+ "40t_Long_Haul_Truck_Cycle_AccelerateWhileBrake_80_0_level.vmod", GearboxType.AMT, TestName = "TruckSpecial CycleAccelerateWhileBrake_80_0_level"),
TestCase(SimpleDrivingCycles.CycleAccelerateAtBrake_80_0_level,
- "40t_Long_Haul_Truck_Cycle_AccelerateAtBrake_80_0_level.vmod", GearboxType.AMT),
+ "40t_Long_Haul_Truck_Cycle_AccelerateAtBrake_80_0_level.vmod", GearboxType.AMT, TestName = "TruckSpecial CycleAccelerateAtBrake_80_0_level"),
TestCase(SimpleDrivingCycles.CycleAccelerateBeforeBrake_80_0_level,
- "40t_Long_Haul_Truck_Cycle_AccelerateBeforeBrake_80_0_level.vmod", GearboxType.AMT),
- TestCase(SimpleDrivingCycles.CycleDrive_stop_85_stop_85_level, "24t Truck_Cycle_Drive_stop_85_stop_85_level.vmod", GearboxType.AMT),
- TestCase(SimpleDrivingCycles.CycleDrive_SlopeChangeBeforeStop, "Truck_DriverStrategy_SlopeChangeBeforeStop.vmod", GearboxType.AMT),
- TestCase(SimpleDrivingCycles.CycleDriver_FrequentSlopChange, "Truck_DriverStrategy_SlopeChangeBeforeStop.vmod", GearboxType.AMT),
+ "40t_Long_Haul_Truck_Cycle_AccelerateBeforeBrake_80_0_level.vmod", GearboxType.AMT, TestName = "TruckSpecial CycleAccelerateBeforeBrake_80_0_level"),
+ TestCase(SimpleDrivingCycles.CycleDrive_stop_85_stop_85_level, "24t Truck_Cycle_Drive_stop_85_stop_85_level.vmod",
+ GearboxType.AMT, TestName = "TruckSpecial CycleDrive_stop_85_stop_85_level"),
+ TestCase(SimpleDrivingCycles.CycleDrive_SlopeChangeBeforeStop, "Truck_DriverStrategy_SlopeChangeBeforeStop.vmod",
+ GearboxType.AMT, TestName = "TruckSpecial CycleDrive_SlopeChangeBeforeStop"),
+ TestCase(SimpleDrivingCycles.CycleDriver_FrequentSlopChange, "Truck_DriverStrategy_SlopeChangeBeforeStop.vmod",
+ GearboxType.AMT, TestName = "TruckSpecial CycleDriver_FrequentSlopChange"),
]
public void Truck_Special(string cycleData, string modFileName, GearboxType gbxType = GearboxType.AMT)
{
@@ -353,34 +356,40 @@ namespace TUGraz.VectoCore.Tests.Integration.DriverStrategy
[Category("ComparisonV2"),
TestCase(SimpleDrivingCycles.CycleDrive_80_Increasing_Slope,
- "24t Coach_Cycle_Drive_80_Increasing_Slope.vmod"),
+ "24t Coach_Cycle_Drive_80_Increasing_Slope.vmod", TestName = "CoachSpecial CycleDrive_80_Increasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDrive_50_Increasing_Slope,
- "24t Coach_Cycle_Drive_50_Increasing_Slope.vmod"),
+ "24t Coach_Cycle_Drive_50_Increasing_Slope.vmod", TestName = "CoachSpecial CycleDrive_50_Increasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDrive_30_Increasing_Slope,
- "24t Coach_Cycle_Drive_30_Increasing_Slope.vmod"),
+ "24t Coach_Cycle_Drive_30_Increasing_Slope.vmod", TestName = "CoachSpecial CycleDrive_30_Increasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDrive_80_Decreasing_Slope,
- "24t Coach_Cycle_Drive_80_Decreasing_Slope.vmod"),
+ "24t Coach_Cycle_Drive_80_Decreasing_Slope.vmod", TestName = "CoachSpecial CycleDrive_80_Decreasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDrive_50_Decreasing_Slope,
- "24t Coach_Cycle_Drive_50_Decreasing_Slope.vmod"),
+ "24t Coach_Cycle_Drive_50_Decreasing_Slope.vmod", TestName = "CoachSpecial CycleDrive_50_Decreasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDrive_30_Decreasing_Slope,
- "24t Coach_Cycle_Drive_30_Decreasing_Slope.vmod"),
+ "24t Coach_Cycle_Drive_30_Decreasing_Slope.vmod", TestName = "CoachSpecial CycleDrive_30_Decreasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDrive_80_Dec_Increasing_Slope,
- "24t Coach_Cycle_Drive_80_Dec_Increasing_Slope.vmod"),
+ "24t Coach_Cycle_Drive_80_Dec_Increasing_Slope.vmod", TestName = "CoachSpecial CycleDrive_80_Dec_Increasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDrive_50_Dec_Increasing_Slope,
- "24t Coach_Cycle_Drive_50_Dec_Increasing_Slope.vmod"),
+ "24t Coach_Cycle_Drive_50_Dec_Increasing_Slope.vmod", TestName = "CoachSpecial CycleDrive_50_Dec_Increasing_Slope"),
TestCase(SimpleDrivingCycles.CycleDrive_30_Dec_Increasing_Slope,
- "24t Coach_Cycle_Drive_30_Dec_Increasing_Slope.vmod"),
+ "24t Coach_Cycle_Drive_30_Dec_Increasing_Slope.vmod", TestName = "CoachSpecialCycleDrive_30_Dec_Increasing_Slope "),
TestCase(SimpleDrivingCycles.CycleDecelerateWhileBrake_80_0_level,
- "24t Coach_Cycle_DecelerateWhileBrake_80_0_level.vmod"),
+ "24t Coach_Cycle_DecelerateWhileBrake_80_0_level.vmod",
+ TestName = "CoachSpecial CycleDecelerateWhileBrake_80_0_level"),
TestCase(SimpleDrivingCycles.CycleAccelerateWhileBrake_80_0_level,
- "24t Coach_Cycle_AccelerateWhileBrake_80_0_level.vmod"),
+ "24t Coach_Cycle_AccelerateWhileBrake_80_0_level.vmod",
+ TestName = "CoachSpecial CycleAccelerateWhileBrake_80_0_level"),
TestCase(SimpleDrivingCycles.CycleAccelerateAtBrake_80_0_level,
- "24t Coach_Cycle_AccelerateAtBrake_80_0_level.vmod"),
+ "24t Coach_Cycle_AccelerateAtBrake_80_0_level.vmod", TestName = "CoachSpecial CycleAccelerateAtBrake_80_0_level"),
TestCase(SimpleDrivingCycles.CycleAccelerateBeforeBrake_80_0_level,
- "24t Coach_Cycle_AccelerateBeforeBrake_80_0_level.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_stop_85_stop_85_level, "24t Coach_Cycle_Drive_stop_85_stop_85_level.vmod"),
- TestCase(SimpleDrivingCycles.CycleDrive_SlopeChangeBeforeStop, "24t Coach_DriverStrategy_SlopeChangeBeforeStop.vmod"),
- TestCase(SimpleDrivingCycles.CycleDriver_FrequentSlopChange, "24t Coach_DriverStrategy_SlopeChangeBeforeStop.vmod"),
+ "24t Coach_Cycle_AccelerateBeforeBrake_80_0_level.vmod",
+ TestName = "CoachSpecial CycleAccelerateBeforeBrake_80_0_level"),
+ TestCase(SimpleDrivingCycles.CycleDrive_stop_85_stop_85_level, "24t Coach_Cycle_Drive_stop_85_stop_85_level.vmod",
+ TestName = "CoachSpecial CycleDrive_stop_85_stop_85_level"),
+ TestCase(SimpleDrivingCycles.CycleDrive_SlopeChangeBeforeStop, "24t Coach_DriverStrategy_SlopeChangeBeforeStop.vmod",
+ TestName = "CoachSpecial CycleDrive_SlopeChangeBeforeStop"),
+ TestCase(SimpleDrivingCycles.CycleDriver_FrequentSlopChange, "24t Coach_DriverStrategy_SlopeChangeBeforeStop.vmod",
+ TestName = "CoachSpecial CycleDriver_FrequentSlopChange"),
]
public void Coach_Special(string cycleData, string modFileName)
{
--
GitLab