diff --git a/Vecto3GUI2020Test/ViewModelTests/ViewModelTestBase.cs b/Vecto3GUI2020Test/ViewModelTests/ViewModelTestBase.cs index b809717d78e15428000f42e6fda53fcab6301cab..a041a6339fcb9d3ccae57f0e3f6788417098fd34 100644 --- a/Vecto3GUI2020Test/ViewModelTests/ViewModelTestBase.cs +++ b/Vecto3GUI2020Test/ViewModelTests/ViewModelTestBase.cs @@ -156,23 +156,23 @@ namespace Vecto3GUI2020Test File.Delete(fileName); } - public virtual NewMultiStageJobViewModel loadFile(string fileName) + public virtual NewMultiStageJobViewModel LoadFileFromPath(string filePath) { - - var newMultistageJobViewModel = _kernel.Get<NewMultiStageJobViewModel>(); - var filePath = GetTestDataPath(fileName); + + WriteLine("Loading" + filePath); newMultistageJobViewModel.AddVifFile(filePath); - + Assert.NotNull(newMultistageJobViewModel.MultiStageJobViewModel); var manstageVehicleViewModel = newMultistageJobViewModel.MultiStageJobViewModel.ManufacturingStageViewModel.Vehicle as InterimStageBusVehicleViewModel_v2_8; Assert.NotNull(manstageVehicleViewModel); - Assert.AreEqual(GetTestDataPath(fileName), newMultistageJobViewModel.VifPath); + //Assert.AreEqual(GetTestDataPath(fileName), newMultistageJobViewModel.VifPath); - if (!manstageVehicleViewModel.ExemptedVehicle) { + if (!manstageVehicleViewModel.ExemptedVehicle) + { var auxiliariesViewModel = manstageVehicleViewModel.MultistageAuxiliariesViewModel; Assert.NotNull(auxiliariesViewModel); @@ -182,6 +182,13 @@ namespace Vecto3GUI2020Test return newMultistageJobViewModel; } + public virtual NewMultiStageJobViewModel LoadFileFromTestDirectory(string fileName) + { + var filePath = GetTestDataPath(fileName); + + return LoadFileFromPath(filePath); + } + protected virtual Mock<IDialogHelper> SetMockDialogHelper(string fileToLoad = null, string fileToSave = null) {