diff --git a/Vecto3GUI2020Test/TestData/vecto_multistage_conventional_final_vif.VIF_Report_1.xml b/Vecto3GUI2020Test/TestData/vecto_multistage_conventional_final_vif.VIF_Report_1.xml index e119decdc66fbd93df11e57e3119448f8ea6191c..fbc939defb3e02f2f2940e0caec7272d2cd75ca3 100644 --- a/Vecto3GUI2020Test/TestData/vecto_multistage_conventional_final_vif.VIF_Report_1.xml +++ b/Vecto3GUI2020Test/TestData/vecto_multistage_conventional_final_vif.VIF_Report_1.xml @@ -610,6 +610,7 @@ <EntranceHeight>2000</EntranceHeight> <DoorDriveTechnology>electric</DoorDriveTechnology> <VehicleDeclarationType>final</VehicleDeclarationType> + <VehicleTypeApprovalNumber>123456</VehicleTypeApprovalNumber> <ADAS xsi:type="ADAS_Conventional_Type"> <EngineStopStart>true</EngineStopStart> <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop> diff --git a/Vecto3GUI2020Test/ViewModelTests/JobListViewModelTests.cs b/Vecto3GUI2020Test/ViewModelTests/JobListViewModelTests.cs index eb931b55f6728206c39a6e2908b359c5a60e0023..20cacdef6f2f62281d875eeaab608a6ef0a91be9 100644 --- a/Vecto3GUI2020Test/ViewModelTests/JobListViewModelTests.cs +++ b/Vecto3GUI2020Test/ViewModelTests/JobListViewModelTests.cs @@ -105,6 +105,8 @@ namespace Vecto3GUI2020Test.ViewModelTests //select vif for simulation Assert.AreNotEqual(0, _jobListViewModel.Jobs.Count); + + Assert.IsTrue(_jobListViewModel.Jobs[0].CanBeSimulated); _jobListViewModel.Jobs[0].Selected = true; diff --git a/Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs b/Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs index 8ddfb1ac3ed551a7e03ad46c7b4bfbb792dc5130..6c40cd3b09b38a9bd6e96d16e16ac09df710b6ee 100644 --- a/Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs +++ b/Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs @@ -315,6 +315,7 @@ namespace Vecto3GUI2020Test Assert.AreEqual(2, vehicleViewModel.EntranceHeight.Value()); Assert.AreEqual(ConsumerTechnology.Electrically, vehicleViewModel.DoorDriveTechnology); Assert.AreEqual(VehicleDeclarationType.interim, vehicleViewModel.VehicleDeclarationType); + Assert.AreEqual("1234567890", vehicleViewModel.VehicleTypeApprovalNumber); Assert.AreEqual(newMultistageJobViewModel.MultiStageJobViewModel.ManufacturingStageViewModel.Vehicle.DoorDriveTechnology, vehicleViewModel.DoorDriveTechnology); diff --git a/Vecto3GUI2020Test/ViewModelTests/VIFTests.cs b/Vecto3GUI2020Test/ViewModelTests/VIFTests.cs index 5ed9d9afb0fecc4f7d06f59ae62a278cd86b057b..a8602dd564cd01a96054ad61c4922e46176d90b4 100644 --- a/Vecto3GUI2020Test/ViewModelTests/VIFTests.cs +++ b/Vecto3GUI2020Test/ViewModelTests/VIFTests.cs @@ -140,7 +140,7 @@ namespace Vecto3GUI2020Test.ViewModelTests VehicleViewModel.Model = "asdf"; VehicleViewModel.AirdragModifiedEnum = loadAirdrag ? AIRDRAGMODIFIED.TRUE: AIRDRAGMODIFIED.FALSE; VehicleViewModel.VehicleDeclarationType = VehicleDeclarationType.final; - + VehicleViewModel.VehicleTypeApprovalNumber = "123456789"; //SETADAS VehicleViewModel.EngineStopStartNullable = true; VehicleViewModel.EcoRollTypeNullable = EcoRollType.WithEngineStop;