diff --git a/VectoCore/VectoCoreTest/Models/Simulation/LossMapRangeValidationTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/LossMapRangeValidationTest.cs index a278b6463c47b33994abe838be907e86c28e72e2..38f859b658ba3abd0302b10ca4bff15a5b219dbe 100644 --- a/VectoCore/VectoCoreTest/Models/Simulation/LossMapRangeValidationTest.cs +++ b/VectoCore/VectoCoreTest/Models/Simulation/LossMapRangeValidationTest.cs @@ -31,6 +31,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using System; +using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; using TUGraz.VectoCommon.Exceptions; @@ -38,6 +39,7 @@ using TUGraz.VectoCommon.Models; using TUGraz.VectoCommon.Utils; using TUGraz.VectoCore.InputData.FileIO.JSON; using TUGraz.VectoCore.InputData.Reader; +using TUGraz.VectoCore.Models.Declaration; using TUGraz.VectoCore.Models.Simulation.Data; using TUGraz.VectoCore.Models.Simulation.Impl; using TUGraz.VectoCore.Models.SimulationComponent.Data; @@ -69,8 +71,27 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation var gearboxData = CreateGearboxData(GearboxDirectLoss, GearboxIndirectLoss); var engineData = MockSimulationDataFactory.CreateEngineDataFromFile(EngineFile); var axleGearData = CreateAxleGearData(AxleGearLossMap); + var vehicleData = new VehicleData { + DynamicTyreRadius = 0.85.SI<Meter>(), + Loading = 0.SI<Kilogram>(), + CurbWeight = 2000.SI<Kilogram>(), + AxleData = + new List<Axle> { + new Axle { + TwinTyres = false, + AxleWeightShare = 1, + TyreTestLoad = 50000.SI<Newton>(), + Inertia = 10.SI<KilogramSquareMeter>() + } + } + }; - var runData = new VectoRunData { GearboxData = gearboxData, EngineData = engineData, AxleGearData = axleGearData }; + var runData = new VectoRunData { + GearboxData = gearboxData, + EngineData = engineData, + AxleGearData = axleGearData, + VehicleData = vehicleData + }; var result = VectoRunData.ValidateRunData(runData, new ValidationContext(runData)); Assert.IsTrue(ValidationResult.Success == result); @@ -113,7 +134,20 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation { var gearboxData = CreateGearboxData(GearboxDirectLoss, GearboxIndirectLoss); var engineData = MockSimulationDataFactory.CreateEngineDataFromFile(EngineFile); - var vehicleData = new VehicleData { DynamicTyreRadius = 0.85.SI<Meter>() }; + var vehicleData = new VehicleData { + DynamicTyreRadius = 0.85.SI<Meter>(), + Loading = 0.SI<Kilogram>(), + CurbWeight = 2000.SI<Kilogram>(), + AxleData = + new List<Axle> { + new Axle { + TwinTyres = false, + AxleWeightShare = 1, + TyreTestLoad = 50000.SI<Newton>(), + Inertia = 10.SI<KilogramSquareMeter>() + } + } + }; var runData = new VectoRunData { GearboxData = gearboxData, EngineData = engineData, VehicleData = vehicleData }; var result = VectoRunData.ValidateRunData(runData, new ValidationContext(runData)); Assert.IsTrue(ValidationResult.Success == result);