diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs index dfa575304fc3de210ef6f9e3409274d7a05dfe69..d5e3943ff152bf9e236752dd2ddc436f2d6d62ec 100644 --- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs +++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/ValidationTest.cs @@ -173,7 +173,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData [TestMethod] public void ValidationModeVehicleDataTest() { - var vehicleData = new VehicleData() { + var vehicleData = new VehicleData { AxleConfiguration = AxleConfiguration.AxleConfig_4x2, Creator = "Mr. Test", CrossWindCorrectionMode = CrossWindCorrectionMode.NoCorrection, @@ -184,29 +184,29 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData DynamicTyreRadius = 0.5.SI<Meter>(), //CurbWeigthExtra = 0.SI<Kilogram>(), Loading = 12000.SI<Kilogram>(), - GrossVehicleWeight = 16000.SI<Kilogram>() - }; - vehicleData.AxleData = new List<Axle>() { - new Axle() { - AxleType = AxleType.VehicleNonDriven, - AxleWeightShare = 0.4, - Inertia = 0.5.SI<KilogramSquareMeter>(), - RollResistanceCoefficient = 0.00555, - TyreTestLoad = 33000.SI<Newton>() - }, - new Axle() { - AxleType = AxleType.VehicleNonDriven, - AxleWeightShare = 0.6, - Inertia = 0.5.SI<KilogramSquareMeter>(), - RollResistanceCoefficient = 0.00555, - TyreTestLoad = 33000.SI<Newton>() - }, + GrossVehicleWeight = 16000.SI<Kilogram>(), + AxleData = new List<Axle> { + new Axle { + AxleType = AxleType.VehicleNonDriven, + AxleWeightShare = 0.4, + Inertia = 0.5.SI<KilogramSquareMeter>(), + RollResistanceCoefficient = 0.00555, + TyreTestLoad = 33000.SI<Newton>() + }, + new Axle { + AxleType = AxleType.VehicleNonDriven, + AxleWeightShare = 0.6, + Inertia = 0.5.SI<KilogramSquareMeter>(), + RollResistanceCoefficient = 0.00555, + TyreTestLoad = 33000.SI<Newton>() + }, + } }; var result = vehicleData.Validate(ExecutionMode.Engineering); - Assert.IsTrue(!result.Any()); + Assert.IsTrue(!result.Any(), "validation should have succeded but failed." + string.Concat(result)); result = vehicleData.Validate(ExecutionMode.Declaration); - Assert.IsTrue(result.Any(), "validation should have failed, but succeeded"); + Assert.IsTrue(result.Any(), "validation should have failed, but succeeded."); } /// <summary> @@ -234,7 +234,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData LossMap = TransmissionLossMapReader.ReadFromFile(@"TestData\Components\limited.vtlm", 1, "1"), } }; - var vehicleData = new VehicleData() { + var vehicleData = new VehicleData { AxleConfiguration = AxleConfiguration.AxleConfig_4x2, Creator = "Mr. Test", CrossWindCorrectionMode = CrossWindCorrectionMode.NoCorrection, @@ -245,23 +245,23 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData DynamicTyreRadius = 0.5.SI<Meter>(), //CurbWeigthExtra = 0.SI<Kilogram>(), Loading = 12000.SI<Kilogram>(), - GrossVehicleWeight = 16000.SI<Kilogram>() - }; - vehicleData.AxleData = new List<Axle>() { - new Axle() { - AxleType = AxleType.VehicleNonDriven, - AxleWeightShare = 0.4, - Inertia = 0.5.SI<KilogramSquareMeter>(), - RollResistanceCoefficient = 0.00555, - TyreTestLoad = 33000.SI<Newton>() - }, - new Axle() { - AxleType = AxleType.VehicleNonDriven, - AxleWeightShare = 0.6, - Inertia = 0.5.SI<KilogramSquareMeter>(), - RollResistanceCoefficient = 0.00555, - TyreTestLoad = 33000.SI<Newton>() - }, + GrossVehicleWeight = 16000.SI<Kilogram>(), + AxleData = new List<Axle> { + new Axle { + AxleType = AxleType.VehicleNonDriven, + AxleWeightShare = 0.4, + Inertia = 0.5.SI<KilogramSquareMeter>(), + RollResistanceCoefficient = 0.00555, + TyreTestLoad = 33000.SI<Newton>() + }, + new Axle { + AxleType = AxleType.VehicleNonDriven, + AxleWeightShare = 0.6, + Inertia = 0.5.SI<KilogramSquareMeter>(), + RollResistanceCoefficient = 0.00555, + TyreTestLoad = 33000.SI<Newton>() + }, + } }; container.RunData = new VectoRunData { @@ -294,13 +294,13 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData var gearboxData = new GearboxData(); gearboxData.Gears[1] = new GearData { LossMap = TransmissionLossMapReader.ReadFromFile(@"TestData\Components\Direct Gear.vtlm", 1, "1"), - Ratio = 1 + Ratio = 1, }; var axleGearData = new AxleGearData { AxleGear = new GearData { - Ratio = 1, LossMap = TransmissionLossMapReader.ReadFromFile(@"TestData\Components\limited.vtlm", 1, "1"), + Ratio = 1, } };