diff --git a/VectoCore/VectoCoreTest/Integration/Auxiliaries.cs b/VectoCore/VectoCoreTest/Integration/Auxiliaries.cs index 5184cfa73e0b859173377d02894648df8ad88380..f054ce869ffee3288f13c166d2f84832df71ee00 100644 --- a/VectoCore/VectoCoreTest/Integration/Auxiliaries.cs +++ b/VectoCore/VectoCoreTest/Integration/Auxiliaries.cs @@ -111,13 +111,13 @@ namespace TUGraz.VectoCore.Tests.Integration [Category("Integration")] [ - TestCase(HYBRID_P2_Group_5, TestName = "GenericVehicle Group5 P2 Padd_hv"), - TestCase(HYBRID_SerialHybrid_S2, TestName = "GenericVehicle S2 Job Padd_hv"), - TestCase(HYBRID_SerialHybrid_S4, TestName = "GenericVehicle S4 Job Padd_hv"), - TestCase(HYBRID_IEPC_S_GBX3, TestName = "IEPC-S 3 Speed Gearbox Padd_hv"), - TestCase(HYBRID_IHPC_G5_12SPEED, TestName = "IHPC Group 5 12 Speed Gearbox Padd_hv"), + TestCase(HYBRID_P2_Group_5, TestName = "GenericVehicle Group5 P2 Padd_hv"), + TestCase(HYBRID_SerialHybrid_S2, TestName = "GenericVehicle S2 Job Padd_hv"), + TestCase(HYBRID_SerialHybrid_S4, TestName = "GenericVehicle S4 Job Padd_hv"), + TestCase(HYBRID_IEPC_S_GBX3, TestName = "IEPC-S 3 Speed Gearbox Padd_hv"), + TestCase(HYBRID_IHPC_G5_12SPEED, TestName = "IHPC Group 5 12 Speed Gearbox Padd_hv"), ] - public void HighVoltageAuxiliaries_IncreaseConsumption_ForHybrid(String jobFile) + public void HighVoltageAuxiliaries_IncreaseConsumption_ForHybrid(string jobFile) { // Arrange. var fileWriter = new FileOutputWriter(jobFile); @@ -154,9 +154,9 @@ namespace TUGraz.VectoCore.Tests.Integration string pWheelCycle = "PWheel"; AssertHVElectricAxuliariesForHybrids(summaryData, pWheelCycle); - } + } - private void AssertHVElectricAxuliaries(Dictionary<object, DataRow> summaryData, string drivingCycle) + private void AssertHVElectricAxuliaries(Dictionary<object, DataRow> summaryData, string drivingCycle) { string extendedSuffix = "Extended"; string cycle = $"{drivingCycle}.vdri"; @@ -167,7 +167,7 @@ namespace TUGraz.VectoCore.Tests.Integration return; } - TestContext.WriteLine($"Testing cycle: {cycle}"); + TestContext.WriteLine($"Tested cycle: {cycle}"); var absoluteTime = (ConvertedSI)summaryData[extendedCycle][SumDataFields.TIME]; @@ -192,7 +192,7 @@ namespace TUGraz.VectoCore.Tests.Integration return; } - TestContext.WriteLine($"Testing cycle: {cycle}"); + TestContext.WriteLine($"Tested cycle: {cycle}"); var absoluteTime = (ConvertedSI)summaryData[extendedCycle][SumDataFields.TIME]; diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Auxiliaries/GenericIHPC/12SpeedGbx/GenericMap_140kW_936Nm.vemo b/VectoCore/VectoCoreTest/TestData/Integration/Auxiliaries/GenericIHPC/12SpeedGbx/GenericMap_140kW_936Nm.vemo index 029526d8db403203cd7e51d32ffd6479b754cf4f..b520ba77b65f9fe1948b130d494b5f925ad8ee0d 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/Auxiliaries/GenericIHPC/12SpeedGbx/GenericMap_140kW_936Nm.vemo +++ b/VectoCore/VectoCoreTest/TestData/Integration/Auxiliaries/GenericIHPC/12SpeedGbx/GenericMap_140kW_936Nm.vemo @@ -44,7 +44,6 @@ n [rpm] , T [Nm] , P_el [kW] 0.00,855.00,6.413 0.00,900.00,6.894 0.00,0.00,6.413 -0.00,0.00,5.946 29.70,-990.00,0.000 29.70,-945.00,0.000 29.70,-900.00,0.000 diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Auxiliaries/GenericVehicle_Group5_P2/GenericMap_140kW_936Nm.vemo b/VectoCore/VectoCoreTest/TestData/Integration/Auxiliaries/GenericVehicle_Group5_P2/GenericMap_140kW_936Nm.vemo index ddf2e473ded06d9aa797ec842ca3d2885a88e17d..5e3d00ec31f7ede02c1d30269bdcaeaaccd787a7 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/Auxiliaries/GenericVehicle_Group5_P2/GenericMap_140kW_936Nm.vemo +++ b/VectoCore/VectoCoreTest/TestData/Integration/Auxiliaries/GenericVehicle_Group5_P2/GenericMap_140kW_936Nm.vemo @@ -44,7 +44,6 @@ n [rpm] , T [Nm] , P_el [kW] 0.00,855.00,6.392 0.00,900.00,6.871 0.00,0.00,6.392 -0.00,0.00,5.926 29.60,-990.00,0.000 29.60,-945.00,0.000 29.60,-900.00,0.000