diff --git a/Vecto3GUI2020Test/ViewModelTests/AirdragTests.cs b/Vecto3GUI2020Test/ViewModelTests/AirdragTests.cs
index a53049065c0728849d9d7d99820feeda878133de..20841fe44531e4b6d3379b1d95e95c94209d02c7 100644
--- a/Vecto3GUI2020Test/ViewModelTests/AirdragTests.cs
+++ b/Vecto3GUI2020Test/ViewModelTests/AirdragTests.cs
@@ -19,7 +19,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
[Test]
public void AirdragModifiedInPreviousStages()
{
- var vm = loadFile(consolidated_multiple_stages_airdrag);
+ var vm = LoadFileFromTestDirectory(consolidated_multiple_stages_airdrag);
var vehicleVm = vm.MultiStageJobViewModel.ManufacturingStageViewModel.Vehicle as
InterimStageBusVehicleViewModel_v2_8;
@@ -35,7 +35,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
[Test]
public void AirdragNotModifiedInPreviousStages()
{
- var vm = loadFile(consolidated_multiple_stages);
+ var vm = LoadFileFromTestDirectory(consolidated_multiple_stages);
var vehicleVm =
vm.MultiStageJobViewModel.ManufacturingStageViewModel.Vehicle as
@@ -54,7 +54,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
{
///Load VIF without airdrag
- var vm = loadFile(primary_vehicle_only);
+ var vm = LoadFileFromTestDirectory(primary_vehicle_only);
var vehicleVm =
vm.MultiStageJobViewModel.ManufacturingStageViewModel.Vehicle as
InterimStageBusVehicleViewModel_v2_8;
@@ -84,7 +84,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
var resultFile = $"{outputName}.VIF_Report_2.xml";
Assert.IsTrue(checkFileNameExists(resultFile));
- var secondstageVm = loadFile(resultFile);
+ var secondstageVm = LoadFileFromPath(resultFile);
Assert.IsNotNull(secondstageVm);
var secondStageVehicleVm =
(secondstageVm.MultiStageJobViewModel.ManufacturingStageViewModel.VehicleViewModel) as
@@ -103,7 +103,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
[Test]
public void AirdragModifiedDisabled()
{
- var vm = loadFile(primary_vehicle_only);
+ var vm = LoadFileFromTestDirectory(primary_vehicle_only);
var vehicleVm =
vm.MultiStageJobViewModel.ManufacturingStageViewModel.Vehicle as
InterimStageBusVehicleViewModel_v2_8;
@@ -146,7 +146,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
[Test]
public void TemporarySaveAirdragComponent1()
{
- var vm = loadFile(consolidated_multiple_stages_airdrag);
+ var vm = LoadFileFromTestDirectory(consolidated_multiple_stages_airdrag);
var vehicleViewModel = vm.MultiStageJobViewModel.ManufacturingStageViewModel.VehicleViewModel as InterimStageBusVehicleViewModel_v2_8;
@@ -178,7 +178,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
[Test]
public void TemporarySaveAirdragComponent2()
{
- var vm = loadFile(consolidated_multiple_stages_airdrag);
+ var vm = LoadFileFromTestDirectory(consolidated_multiple_stages_airdrag);
var vehicleViewModel = vm.MultiStageJobViewModel.ManufacturingStageViewModel.VehicleViewModel as InterimStageBusVehicleViewModel_v2_8;
@@ -215,7 +215,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
[Test]
public void RemoveAirdragComponent()
{
- var vm = loadFile(consolidated_multiple_stages_airdrag);
+ var vm = LoadFileFromTestDirectory(consolidated_multiple_stages_airdrag);
var vehicleViewModel = vm.MultiStageJobViewModel.ManufacturingStageViewModel.VehicleViewModel as InterimStageBusVehicleViewModel_v2_8;
@@ -242,7 +242,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
[Test]
public void AirdragModifiedSetToTrueWhenComponentIsLoaded()
{
- var vm = loadFile(consolidated_multiple_stages_airdrag);
+ var vm = LoadFileFromTestDirectory(consolidated_multiple_stages_airdrag);
var vehicleViewModel = vm.MultiStageJobViewModel.ManufacturingStageViewModel.VehicleViewModel as InterimStageBusVehicleViewModel_v2_8;
diff --git a/Vecto3GUI2020Test/ViewModelTests/ExemptedTests.cs b/Vecto3GUI2020Test/ViewModelTests/ExemptedTests.cs
index 4a5e4b3c6de620e33bb83052314a1ff7ef0f25ef..a94f3f34a835adbff48d8161d3f2582fd619cb0e 100644
--- a/Vecto3GUI2020Test/ViewModelTests/ExemptedTests.cs
+++ b/Vecto3GUI2020Test/ViewModelTests/ExemptedTests.cs
@@ -24,7 +24,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
[Test]
public void LoadAndSaveExemptedPrimary()
{
- var newMultiStageJob = loadFile(exempted_primary_vif);
+ var newMultiStageJob = LoadFileFromTestDirectory(exempted_primary_vif);
Assert.IsTrue(newMultiStageJob.MultiStageJobViewModel.Exempted);
@@ -90,7 +90,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
[Test]
public async Task SaveAsNewVifAndSimulate()
{
- var newMultiStageJob = loadFile(exempted_primary_vif);
+ var newMultiStageJob = LoadFileFromTestDirectory(exempted_primary_vif);
Assert.IsTrue(newMultiStageJob.MultiStageJobViewModel.Exempted);
diff --git a/Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs b/Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs
index 484d43d35e6ea4d116b3df9ea704bb5ee9f0a888..66214471b3e8f303c04fc18392fc96fd39e895b6 100644
--- a/Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs
+++ b/Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs
@@ -34,7 +34,7 @@ namespace Vecto3GUI2020Test
[Test]
public void LoadInputFileMultipleStage()
{
- Assert.NotNull(loadFile(consolidated_multiple_stages));
+ Assert.NotNull(LoadFileFromTestDirectory(consolidated_multiple_stages));
}
@@ -43,7 +43,7 @@ namespace Vecto3GUI2020Test
public void LoadPrimaryAndSaveVehicleData()
{
//Load Primary Vehicle VIF
- var newMultiStageJob = loadFile(primary_vehicle_only);
+ var newMultiStageJob = LoadFileFromTestDirectory(primary_vehicle_only);
var vehicle = newMultiStageJob.MultiStageJobViewModel.ManufacturingStageViewModel.Vehicle as InterimStageBusVehicleViewModel_v2_8;
Assert.NotNull(vehicle);
vehicle.Manufacturer = "test1";
@@ -68,7 +68,7 @@ namespace Vecto3GUI2020Test
public void LoadPrimaryAndSaveAsVif()
{
//load file
- var newMultiStageJob = loadFile(primary_vehicle_only);
+ var newMultiStageJob = LoadFileFromTestDirectory(primary_vehicle_only);
var vehicle = newMultiStageJob.MultiStageJobViewModel.ManufacturingStageViewModel.Vehicle as InterimStageBusVehicleViewModel_v2_8;
}
@@ -78,7 +78,7 @@ namespace Vecto3GUI2020Test
[Test]
public void ReloadInputFile()
{
- var newMultistageJobViewModel = loadFile(consolidated_multiple_stages_airdrag) as NewMultiStageJobViewModel;
+ var newMultistageJobViewModel = LoadFileFromTestDirectory(consolidated_multiple_stages_airdrag) as NewMultiStageJobViewModel;
var vehicle = newMultistageJobViewModel.MultiStageJobViewModel.VehicleInputData as
InterimStageBusVehicleViewModel_v2_8;
@@ -99,14 +99,14 @@ namespace Vecto3GUI2020Test
[Test]
public void LoadInputFileMultipleStageAirdrag()
{
- loadFile(consolidated_multiple_stages_airdrag);
+ LoadFileFromTestDirectory(consolidated_multiple_stages_airdrag);
}
[Ignore("incomplete")]
[Test]
public void LoadAndSaveFullInputDataSample()
{
- var vm = loadFile(primary_vehicle_only);
+ var vm = LoadFileFromTestDirectory(primary_vehicle_only);
var multiStageJobViewModel = vm.MultiStageJobViewModel as MultiStageJobViewModel_v0_1;
@@ -143,13 +143,13 @@ namespace Vecto3GUI2020Test
[Test]
public void loadInputFileConsolidatedOneStage()
{
- loadFile(consolidated_one_stage);
+ LoadFileFromTestDirectory(consolidated_one_stage);
}
[Test]
public void loadInputFilePrimaryOnly()
{
- var vm = loadFile(primary_vehicle_only);
+ var vm = LoadFileFromTestDirectory(primary_vehicle_only);
Assert.AreEqual(2, vm.MultiStageJobViewModel.ManufacturingStageViewModel.StageCount);
var primaryVehicle = vm.MultiStageJobViewModel.PrimaryVehicle;
@@ -209,7 +209,7 @@ namespace Vecto3GUI2020Test
[TestCase(primary_vehicle_only, null, TestName= "LoadAirdragPrimaryVehicle")]
public void LoadAirdragComponentAndSaveVehicleData(string fileName, object expectedAirdragModifiedValue)
{
- var vm = loadFile(fileName);
+ var vm = LoadFileFromTestDirectory(fileName);
var vehicleVm =
vm.MultiStageJobViewModel.ManufacturingStageViewModel.VehicleViewModel as
@@ -260,7 +260,7 @@ namespace Vecto3GUI2020Test
TestContext.WriteLine($"Loading {consolidated_multiple_stages}");
//New Manufacturing Stage
- var newMultistageJobViewModel = loadFile(consolidated_multiple_stages);
+ var newMultistageJobViewModel = LoadFileFromTestDirectory(consolidated_multiple_stages);
Assert.NotNull(newMultistageJobViewModel.MultiStageJobViewModel);
var manstageVehicleViewModel = newMultistageJobViewModel.MultiStageJobViewModel.ManufacturingStageViewModel.Vehicle as IMultistageVehicleViewModel;
Assert.NotNull(manstageVehicleViewModel);
diff --git a/Vecto3GUI2020Test/ViewModelTests/VIFTests.cs b/Vecto3GUI2020Test/ViewModelTests/VIFTests.cs
index eec919596ef98c57e751b3596ddf6b17724f5299..55c41eca2308ba092b75b856aea78737a5226bad 100644
--- a/Vecto3GUI2020Test/ViewModelTests/VIFTests.cs
+++ b/Vecto3GUI2020Test/ViewModelTests/VIFTests.cs
@@ -7,6 +7,7 @@ using Moq;
using Ninject;
using NUnit.Framework;
using NUnit.Framework.Internal;
+using TUGraz.VectoCommon.BusAuxiliaries;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
@@ -29,7 +30,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
[Test]
public void loadPrimaryVehicleOnlyAndCreateNewVIF()
{
- var multistagevm = loadFile(primary_vehicle_only).MultiStageJobViewModel as MultiStageJobViewModel_v0_1;
+ var multistagevm = LoadFileFromTestDirectory(primary_vehicle_only).MultiStageJobViewModel as MultiStageJobViewModel_v0_1;
var stage = multistagevm.ManufacturingStageViewModel.StageCount;
Assert.AreEqual(2, stage);
@@ -60,22 +61,65 @@ namespace Vecto3GUI2020Test.ViewModelTests
[Values("manufacturer")] string manufacturer,
[Values(LegislativeClass.M3)] LegislativeClass legCategory)
{
- var multistagevm = loadFile(primary_vehicle_only).MultiStageJobViewModel as MultiStageJobViewModel_v0_1;
+ var multistagevm = LoadFileFromTestDirectory(primary_vehicle_only).MultiStageJobViewModel as MultiStageJobViewModel_v0_1;
var stage = multistagevm.ManufacturingStageViewModel.StageCount;
Assert.AreEqual(2, stage);
//Set Necessary Fields
- var vehicle =
+ var vehicleVm =
multistagevm.ManufacturingStageViewModel.Vehicle as InterimStageBusVehicleViewModel_v2_8;
-
- vehicle.ManufacturerAddress = "Address";
- vehicle.Manufacturer = "Manufacturer";
- vehicle.VIN = "VIN12345678";
- vehicle.Model = "Model";
+ vehicleVm.Manufacturer = "adsf";
+ vehicleVm.ManufacturerAddress = "asdf 123";
+ vehicleVm.VIN = "1234567890";
+ vehicleVm.Model = "Model";
+ vehicleVm.LegislativeClass = LegislativeClass.M3;
+ vehicleVm.CurbMassChassis = Kilogram.Create(20000);
+ vehicleVm.GrossVehicleMassRating = Kilogram.Create(20000);
+ vehicleVm.RegisteredClass = RegistrationClass.I_II;
+ vehicleVm.VehicleCode = VehicleCode.CC;
+ vehicleVm.LowEntry = true;
+ vehicleVm.Height = Meter.Create(2.6);
+ vehicleVm.NumberPassengerSeatsUpperDeck = 2;
+ vehicleVm.NumberPassengersStandingLowerDeck = 13;
+ vehicleVm.NumberPassengerSeatsLowerDeck = 10;
+ vehicleVm.NumberPassengersStandingUpperDeck = 12;
+
+ //SETADAS
+ vehicleVm.EngineStopStartNullable = true;
+ vehicleVm.EcoRollTypeNullable = EcoRollType.WithEngineStop;
+ vehicleVm.PredictiveCruiseControlNullable = PredictiveCruiseControlType.Option_1_2_3;
+ vehicleVm.ATEcoRollReleaseLockupClutch = false;
+
+
+
+ //SETAUxiliaries
+ var auxVm = vehicleVm.MultistageAuxiliariesViewModel as MultistageAuxiliariesViewModel;
+ auxVm.InteriorLightsLED = true;
+ auxVm.DayrunninglightsLED = false;
+ auxVm.PositionlightsLED = false;
+ auxVm.BrakelightsLED = true;
+ auxVm.HeadlightsLED = false;
+ auxVm.SystemConfiguration = BusHVACSystemConfiguration.Configuration2;
+ auxVm.HeatPumpTypeCoolingDriverCompartment = HeatPumpType.non_R_744_3_stage;
+ auxVm.HeatPumpTypeCoolingPassengerCompartment = HeatPumpType.non_R_744_4_stage;
+ auxVm.HeatPumpTypeHeatingDriverCompartment = HeatPumpType.non_R_744_2_stage;
+ auxVm.HeatPumpTypeHeatingPassengerCompartment = HeatPumpType.non_R_744_continuous;
+ auxVm.AuxHeaterPower = SIBase<Watt>.Create(50);
+ auxVm.DoubleGlazing = true;
+ auxVm.AdjustableAuxiliaryHeater = false;
+ auxVm.SeparateAirDistributionDucts = false;
+
+ var resultFile = multistagevm.SaveVif(GetFullPath(
+ "completed_final" + ".xml"));
+
+
+ var jobListVm = _kernel.Get<IJobListViewModel>();
+ Assert.That(() => jobListVm.Jobs.Count, Is.EqualTo(2));
+
}
[TestCase(true, 1, TestName="With Airdrag Component v1")]
@@ -86,7 +130,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
GetMockDialogHelper().Setup(dialogHelper => dialogHelper.ShowMessageBox(It.IsAny<string>(),
It.IsAny<string>(), MessageBoxButton.YesNo, It.IsAny<MessageBoxImage>())).Returns(MessageBoxResult.No);
- var multistagevm = loadFile(_finalVifReport4);
+ var multistagevm = LoadFileFromTestDirectory(_finalVifReport4);
var VehicleViewModel = multistagevm.MultiStageJobViewModel.ManufacturingStageViewModel.VehicleViewModel as InterimStageBusVehicleViewModel_v2_8;
@@ -122,7 +166,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
[Test]
public void CreateCompletedExemptedVif()
{
- var multistagevm = loadFile(exempted_primary_vif).MultiStageJobViewModel as MultiStageJobViewModel_v0_1;
+ var multistagevm = LoadFileFromTestDirectory(exempted_primary_vif).MultiStageJobViewModel as MultiStageJobViewModel_v0_1;
var jobListVm = _kernel.Get<IJobListViewModel>();
var vehicleVm =
@@ -163,7 +207,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
[Test]
public void CreateIncompletedExemptedVif()
{
- var multistagevm = loadFile(exempted_primary_vif).MultiStageJobViewModel as MultiStageJobViewModel_v0_1;
+ var multistagevm = LoadFileFromTestDirectory(exempted_primary_vif).MultiStageJobViewModel as MultiStageJobViewModel_v0_1;
var jobListVm = _kernel.Get<IJobListViewModel>();
var vehicleVm =
@@ -205,7 +249,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
[Test]
public void TestAirdragLoadAndSave()
{
- var newMultistageJobViewModel = loadFile(consolidated_multiple_stages);
+ var newMultistageJobViewModel = LoadFileFromTestDirectory(consolidated_multiple_stages);
Assert.NotNull(newMultistageJobViewModel.MultiStageJobViewModel);
var manstageVehicleViewModel = newMultistageJobViewModel.MultiStageJobViewModel.ManufacturingStageViewModel.Vehicle as IMultistageVehicleViewModel;
diff --git a/Vecto3GUI2020Test/ViewModelTests/VehicleViewModelTests.cs b/Vecto3GUI2020Test/ViewModelTests/VehicleViewModelTests.cs
index 66be2102c8b20c6458eeefc9bf07126481b9b6ab..4057c06dd49a6865e34d99eeaeecf033f0f179ef 100644
--- a/Vecto3GUI2020Test/ViewModelTests/VehicleViewModelTests.cs
+++ b/Vecto3GUI2020Test/ViewModelTests/VehicleViewModelTests.cs
@@ -22,7 +22,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
[Test]
public void restoreValuesWhenEditingAgain()
{
- var vm = loadFile(primary_vehicle_only);
+ var vm = LoadFileFromTestDirectory(primary_vehicle_only);
var vehicleVM =
vm.MultiStageJobViewModel.ManufacturingStageViewModel.Vehicle as
InterimStageBusVehicleViewModel_v2_8;
@@ -74,7 +74,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
public void SIDummyCreation()
{
- var vm = loadFile(primary_vehicle_only);
+ var vm = LoadFileFromTestDirectory(primary_vehicle_only);
var vehicleVM =
vm.MultiStageJobViewModel.ManufacturingStageViewModel.Vehicle as
InterimStageBusVehicleViewModel_v2_8;
@@ -94,7 +94,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
[Test]
public void NoErrorAfterDataLoading()
{
- var vm = loadFile(primary_vehicle_only);
+ var vm = LoadFileFromTestDirectory(primary_vehicle_only);
var vehicleVM =
vm.MultiStageJobViewModel.ManufacturingStageViewModel.Vehicle as
InterimStageBusVehicleViewModel_v2_8;
@@ -110,7 +110,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
[Test]
public void LoadPrimaryAndEdit()
{
- var vm = loadFile(primary_vehicle_only);
+ var vm = LoadFileFromTestDirectory(primary_vehicle_only);
Assert.NotNull(vm);
var vehicleViewModel =