diff --git a/VECTO3GUI2020/Ninject/Factories/MultiStageViewModelFactory.cs b/VECTO3GUI2020/Ninject/Factories/MultiStageViewModelFactory.cs
index 2940a013e0b9d2d3816ebccc76b813deff2dfcde..5bd18960b5c422c9658e3fa267ce4a29bb21da6c 100644
--- a/VECTO3GUI2020/Ninject/Factories/MultiStageViewModelFactory.cs
+++ b/VECTO3GUI2020/Ninject/Factories/MultiStageViewModelFactory.cs
@@ -56,7 +56,7 @@ namespace VECTO3GUI2020.Ninject.Factories
return _documentViewModelFactory.CreateDocumentViewModel(inputData) as IMultiStageJobViewModel;
}
- public IMultistageVehicleViewModel GetInterimStageVehicleViewModel(StageInputViewModel.CompletedBusArchitecture arch)
+ public IMultistageVehicleViewModel GetInterimStageVehicleViewModel(CompletedBusArchitecture arch)
{
if (_vehicleViewModelFactory.CreateNewVehicleViewModel(arch) is IMultistageVehicleViewModel veh) {
@@ -92,13 +92,13 @@ namespace VECTO3GUI2020.Ninject.Factories
}
public IMultistageAuxiliariesViewModel GetAuxiliariesViewModel(
- StageInputViewModel.CompletedBusArchitecture arch)
+ CompletedBusArchitecture arch)
{
return _multistepComponentViewModelFactory.CreateNewMultistepBusAuxViewModel(arch);
}
public IMultistageAuxiliariesViewModel
- GetAuxiliariesViewModel(StageInputViewModel.CompletedBusArchitecture arch,
+ GetAuxiliariesViewModel(CompletedBusArchitecture arch,
IBusAuxiliariesDeclarationData consolidatedAuxiliariesInputData)
{
return _multistepComponentViewModelFactory.CreateNewMultistepBusAuxViewModel(arch);
diff --git a/VECTO3GUI2020/Ninject/Factories/MultistageViewModelModule.cs b/VECTO3GUI2020/Ninject/Factories/MultistageViewModelModule.cs
index 7c6465ad72217188e4a7aa8da12af936c151b32e..130ab03579e06507cde0b35d3e2978e86a4e49d9 100644
--- a/VECTO3GUI2020/Ninject/Factories/MultistageViewModelModule.cs
+++ b/VECTO3GUI2020/Ninject/Factories/MultistageViewModelModule.cs
@@ -20,8 +20,8 @@ namespace VECTO3GUI2020.Ninject.Factories
{
public interface IMultistepComponentViewModelFactory
{
- IMultistageAuxiliariesViewModel CreateMultistepBusAuxViewModel(StageInputViewModel.CompletedBusArchitecture arch, IBusAuxiliariesDeclarationData consolidatedInputData);
- IMultistageAuxiliariesViewModel CreateNewMultistepBusAuxViewModel(StageInputViewModel.CompletedBusArchitecture arch);
+ IMultistageAuxiliariesViewModel CreateMultistepBusAuxViewModel(CompletedBusArchitecture arch, IBusAuxiliariesDeclarationData consolidatedInputData);
+ IMultistageAuxiliariesViewModel CreateNewMultistepBusAuxViewModel(CompletedBusArchitecture arch);
}
@@ -39,30 +39,30 @@ namespace VECTO3GUI2020.Ninject.Factories
typeof(IMultistepComponentViewModelFactory).GetMethod(nameof(IMultistepComponentViewModelFactory.CreateMultistepBusAuxViewModel))
},
combineToNameDelegate = (args) => {
- if (args.Length >= 1 && args[0] is StageInputViewModel.CompletedBusArchitecture arch) {
+ if (args.Length >= 1 && args[0] is CompletedBusArchitecture arch) {
return arch.ToString();
}
- throw new ArgumentException($"arg[0] must be {nameof(StageInputViewModel.CompletedBusArchitecture)}");
+ throw new ArgumentException($"arg[0] must be {nameof(CompletedBusArchitecture)}");
},
skipArguments = 1,
takeArguments = 1
}
})).Named(scopeName);
- AddBinding<IMultistageAuxiliariesViewModel, MultistageAuxiliariesViewModel_Conventional>(StageInputViewModel.CompletedBusArchitecture.Conventional);
- AddBinding<IMultistageAuxiliariesViewModel, MultistageAuxiliariesViewModel_xEV>(StageInputViewModel.CompletedBusArchitecture.HEV);
- AddBinding<IMultistageAuxiliariesViewModel, MultistageAuxiliariesViewModel_xEV>(StageInputViewModel.CompletedBusArchitecture.PEV);
- AddBinding<IMultistageAuxiliariesViewModel, MultistageAuxiliariesViewModel_xEV>(StageInputViewModel.CompletedBusArchitecture.IEPC);
+ AddBinding<IMultistageAuxiliariesViewModel, MultistageAuxiliariesViewModel_Conventional>(CompletedBusArchitecture.Conventional);
+ AddBinding<IMultistageAuxiliariesViewModel, MultistageAuxiliariesViewModel_xEV>(CompletedBusArchitecture.HEV);
+ AddBinding<IMultistageAuxiliariesViewModel, MultistageAuxiliariesViewModel_xEV>(CompletedBusArchitecture.PEV);
+ AddBinding<IMultistageAuxiliariesViewModel, MultistageAuxiliariesViewModel_xEV>(CompletedBusArchitecture.IEPC);
}
[DebuggerStepThrough]
- public string GetName(StageInputViewModel.CompletedBusArchitecture arch)
+ public string GetName(CompletedBusArchitecture arch)
{
return arch.ToString();
}
#endregion
- public void AddBinding<TInterface, TConcrete>(StageInputViewModel.CompletedBusArchitecture arch)
+ public void AddBinding<TInterface, TConcrete>(CompletedBusArchitecture arch)
where TConcrete : class, TInterface
{
Bind<TInterface>().To<TConcrete>().WhenParentNamed(scopeName).Named(GetName(arch));
diff --git a/VECTO3GUI2020/Ninject/Factories/VehicleViewModelFactory.cs b/VECTO3GUI2020/Ninject/Factories/VehicleViewModelFactory.cs
index f088d8dececf9673e60184159ba63a7caa0ce209..d1599b8d199796fbd76ecb32ed155a895f55c4b9 100644
--- a/VECTO3GUI2020/Ninject/Factories/VehicleViewModelFactory.cs
+++ b/VECTO3GUI2020/Ninject/Factories/VehicleViewModelFactory.cs
@@ -26,7 +26,7 @@ namespace VECTO3GUI2020.Ninject.Factories
/// <returns></returns>
IVehicleViewModel CreateVehicleViewModel(IVehicleDeclarationInputData consolidatedVehicleData, IVehicleDeclarationInputData vehicleInput);
- IVehicleViewModel CreateNewVehicleViewModel(StageInputViewModel.CompletedBusArchitecture arch);
+ IVehicleViewModel CreateNewVehicleViewModel(CompletedBusArchitecture arch);
}
public class VehicleViewModelFactoryModule : AbstractNinjectModule
@@ -60,10 +60,10 @@ namespace VECTO3GUI2020.Ninject.Factories
new CombineArgumentsToNameInstanceProvider.MethodSettings() {
methods = new[]{typeof(IVehicleViewModelFactory).GetMethod(nameof(IVehicleViewModelFactory.CreateNewVehicleViewModel))},
combineToNameDelegate = (args) => {
- if (args.Length >= 1 && args[0] is StageInputViewModel.CompletedBusArchitecture arch) {
+ if (args.Length >= 1 && args[0] is CompletedBusArchitecture arch) {
return arch.ToString();
}
- throw new ArgumentException($"arg[0] must be {nameof(StageInputViewModel.CompletedBusArchitecture)}");
+ throw new ArgumentException($"arg[0] must be {nameof(CompletedBusArchitecture)}");
},
skipArguments = 1,
takeArguments = 1
@@ -106,23 +106,23 @@ namespace VECTO3GUI2020.Ninject.Factories
}
- public static StageInputViewModel.CompletedBusArchitecture ArchName(VectoSimulationJobType jobType, bool exempted = false)
+ public static CompletedBusArchitecture ArchName(VectoSimulationJobType jobType, bool exempted = false)
{
if (exempted) {
- return StageInputViewModel.CompletedBusArchitecture.Exempted;
+ return CompletedBusArchitecture.Exempted;
}
switch(jobType){
case VectoSimulationJobType.ConventionalVehicle:
- return StageInputViewModel.CompletedBusArchitecture.Conventional;
+ return CompletedBusArchitecture.Conventional;
case VectoSimulationJobType.ParallelHybridVehicle:
case VectoSimulationJobType.SerialHybridVehicle:
case VectoSimulationJobType.IHPC:
- return StageInputViewModel.CompletedBusArchitecture.HEV;
+ return CompletedBusArchitecture.HEV;
case VectoSimulationJobType.BatteryElectricVehicle:
- return StageInputViewModel.CompletedBusArchitecture.PEV;
+ return CompletedBusArchitecture.PEV;
case VectoSimulationJobType.IEPC_E:
case VectoSimulationJobType.IEPC_S:
- return StageInputViewModel.CompletedBusArchitecture.IEPC;
+ return CompletedBusArchitecture.IEPC;
default:
throw new ArgumentOutOfRangeException(nameof(jobType), jobType, null);
}
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel.cs
index b45d4c152f99810f6d4caa6fd78a1d47389f36bc..20e1b61dda00f0bee48333e4a952fae62874e5a0 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel.cs
@@ -70,7 +70,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
public static string VERSION = INPUTPROVIDERTYPE.ToString();
public static string VERSION_EXEMPTED = INPUTPROVIDERTYPEEXEMPTED.ToString();
- public abstract StageInputViewModel.CompletedBusArchitecture Architecture { get; }
+ public abstract CompletedBusArchitecture Architecture { get; }
private readonly IMultiStageViewModelFactory _multiStageViewModelFactory;
@@ -1274,8 +1274,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
#region Overrides of InterimStageBusVehicleViewModel
- public override StageInputViewModel.CompletedBusArchitecture Architecture =>
- StageInputViewModel.CompletedBusArchitecture.Conventional;
+ public override CompletedBusArchitecture Architecture =>
+ CompletedBusArchitecture.Conventional;
public override string XMLType => XMLTypes.Vehicle_Conventional_CompletedBusDeclarationType;
@@ -1299,8 +1299,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
#region Overrides of InterimStageBusVehicleViewModel
- public override StageInputViewModel.CompletedBusArchitecture Architecture =>
- StageInputViewModel.CompletedBusArchitecture.Exempted;
+ public override CompletedBusArchitecture Architecture =>
+ CompletedBusArchitecture.Exempted;
#endregion
}
@@ -1316,9 +1316,9 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
public InterimStageHevBusVehicleViewModel(IMultiStageViewModelFactory multiStageViewModelFactory) : base(multiStageViewModelFactory) { }
- public override StageInputViewModel.CompletedBusArchitecture Architecture
+ public override CompletedBusArchitecture Architecture
{
- get => StageInputViewModel.CompletedBusArchitecture.HEV;
+ get => CompletedBusArchitecture.HEV;
}
public override string XMLType => XMLTypes.Vehicle_Hev_CompletedBusDeclarationType;
@@ -1336,9 +1336,9 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
#region Overrides of InterimStageBusVehicleViewModel
- public override StageInputViewModel.CompletedBusArchitecture Architecture
+ public override CompletedBusArchitecture Architecture
{
- get { return StageInputViewModel.CompletedBusArchitecture.PEV; }
+ get { return CompletedBusArchitecture.PEV; }
}
public override string XMLType => XMLTypes.Vehicle_Pev_CompletedBusDeclarationType;
#endregion
@@ -1356,8 +1356,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
#region Overrides of InterimStageBusVehicleViewModel
- public override StageInputViewModel.CompletedBusArchitecture Architecture =>
- StageInputViewModel.CompletedBusArchitecture.IEPC;
+ public override CompletedBusArchitecture Architecture =>
+ CompletedBusArchitecture.IEPC;
public override string XMLType => XMLTypes.Vehicle_Iepc_CompletedBusDeclarationType;
#endregion
}
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/ManufacturingStageViewModel_v0_1.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/ManufacturingStageViewModel_v0_1.cs
index 7d5cff1b9bb94df0bf5e4441517f227bff763894..41da9c0701b14b5550aed1eb08f15ebcfbfb7b1b 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/ManufacturingStageViewModel_v0_1.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/ManufacturingStageViewModel_v0_1.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections;
+using System.Collections.ObjectModel;
using System.Linq;
using System.Net.Mime;
using System.Security.RightsManagement;
@@ -52,13 +53,33 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
OnPropertyChanged(nameof(CurrentView));
}
+ private ObservableCollection<CompletedBusArchitecture> _architectureItems =
+ new ObservableCollection<CompletedBusArchitecture>(Enum.GetValues(typeof(CompletedBusArchitecture)).Cast<CompletedBusArchitecture>());
+
+ public ObservableCollection<CompletedBusArchitecture> ArchitectureItems
+ {
+ get => _architectureItems;
+ set => SetProperty(ref _architectureItems, value);
+ }
+
+ public CompletedBusArchitecture Architecture
+ {
+ get => _architecture;
+ set
+ {
+ SetProperty(ref _architecture, value);
+ _architectureItems = new ObservableCollection<CompletedBusArchitecture>() { Architecture };
+ }
+ }
public ManufacturingStageViewModel_v0_1(IManufacturingStageInputData consolidatedManufacturingStageInputData, bool exempted,
IMultiStageViewModelFactory viewModelFactory) : base(viewModelFactory)
{
Title = "Edit Manufacturing Stage";
-
+ Architecture =
+ consolidatedManufacturingStageInputData.Vehicle.VehicleType.GetCompletedBusArchitecture(
+ consolidatedManufacturingStageInputData.Vehicle.ExemptedVehicle);
_stepCount = consolidatedManufacturingStageInputData?.StepCount + 1 ?? 2;
@@ -79,6 +100,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
private int _stepCount;
private DigestData _hashPreviousStep;
private IManufacturingStageInputData _consolidatedManufacturingStageInputData;
+ private CompletedBusArchitecture _architecture;
private class ApplicationInformationMultistage : IApplicationInformation
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageInputViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageInputViewModel.cs
index aed04bc9a615eaab96bc90fbd13de6de8bf9c332..e9829c0665fd1e333bb7f29852a8142589a1fd62 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageInputViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageInputViewModel.cs
@@ -17,16 +17,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
{
public class StageInputViewModel : StageViewModelBase, IDocumentViewModel, IJobEditViewModel
{
- public enum CompletedBusArchitecture
- {
- Conventional,
- HEV,
- PEV,
- IEPC,
- Exempted
- }
-
- private bool _canBeEdited;
+ private bool _canBeEdited;
private DataSource _dataSource;
private readonly XmlDocumentType _documentType;
private string _documentName;
@@ -209,4 +200,41 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
#endregion
}
+
+ public enum CompletedBusArchitecture
+ {
+ Conventional,
+ HEV,
+ PEV,
+ IEPC,
+ Exempted
+ }
+
+ public static class CompleteBusArchitectureHelper
+ {
+ public static CompletedBusArchitecture GetCompletedBusArchitecture(this VectoSimulationJobType jobType,
+ bool exempted = false)
+ {
+ if (exempted)
+ {
+ return CompletedBusArchitecture.Exempted;
+ }
+ switch (jobType)
+ {
+ case VectoSimulationJobType.ConventionalVehicle:
+ return CompletedBusArchitecture.Conventional;
+ case VectoSimulationJobType.ParallelHybridVehicle:
+ case VectoSimulationJobType.SerialHybridVehicle:
+ case VectoSimulationJobType.IHPC:
+ return CompletedBusArchitecture.HEV;
+ case VectoSimulationJobType.BatteryElectricVehicle:
+ return CompletedBusArchitecture.PEV;
+ case VectoSimulationJobType.IEPC_E:
+ case VectoSimulationJobType.IEPC_S:
+ return CompletedBusArchitecture.IEPC;
+ default:
+ throw new ArgumentOutOfRangeException(nameof(jobType), jobType, null);
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Interfaces/IMultiStageViewModelFactory.cs b/VECTO3GUI2020/ViewModel/MultiStage/Interfaces/IMultiStageViewModelFactory.cs
index b93c2ce500415e99472ca37103f8410aa12f90c3..f3a34b60782b0189317de43cc2b6cfd2fdc890d7 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Interfaces/IMultiStageViewModelFactory.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Interfaces/IMultiStageViewModelFactory.cs
@@ -21,7 +21,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Interfaces
IMultistageViewModelFactoryFirstParameterAsNameInstanceProvider
{
//IVehicleViewModel GetInterimStageVehicleViewModel(StageInputViewModel.CompletedBusArchitecture arch);
- IMultistageVehicleViewModel GetInterimStageVehicleViewModel(StageInputViewModel.CompletedBusArchitecture arch);
+ IMultistageVehicleViewModel GetInterimStageVehicleViewModel(CompletedBusArchitecture arch);
IMultistageVehicleViewModel GetInterimStageVehicleViewModel(IVehicleDeclarationInputData inputData);
}
@@ -48,8 +48,8 @@ IMultistageViewModelFactoryFirstParameterAsNameInstanceProvider
IMultistageAirdragViewModel GetMultistageAirdragViewModel(
IAirdragDeclarationInputData consolidatedAirdragInputData);
- IMultistageAuxiliariesViewModel GetAuxiliariesViewModel(StageInputViewModel.CompletedBusArchitecture arch);
- IMultistageAuxiliariesViewModel GetAuxiliariesViewModel(StageInputViewModel.CompletedBusArchitecture arch,
+ IMultistageAuxiliariesViewModel GetAuxiliariesViewModel(CompletedBusArchitecture arch);
+ IMultistageAuxiliariesViewModel GetAuxiliariesViewModel(CompletedBusArchitecture arch,
IBusAuxiliariesDeclarationData consolidatedAuxiliariesInputData);
}
}
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Interfaces/IMultistageVehicleViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Interfaces/IMultistageVehicleViewModel.cs
index 01cbeefad06fb61014e98dbb61d1a7cec5610fba..c342ed941f09b19971222f1c1a29896b8e14983a 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Interfaces/IMultistageVehicleViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Interfaces/IMultistageVehicleViewModel.cs
@@ -14,7 +14,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Interfaces
IMultistageAuxiliariesViewModel MultistageAuxiliariesViewModel { get; set; }
bool PrimaryVehicleHybridElectric { get; set; }
bool ShowConsolidatedData { get; set; }
- StageInputViewModel.CompletedBusArchitecture Architecture { get; }
+ CompletedBusArchitecture Architecture { get; }
void SetVehicleInputData(IVehicleDeclarationInputData vehicleInputData, bool checkExempted);
}
}
diff --git a/Vecto3GUI2020Test/ViewModelTests/FactoryTests/ComponentViewModelFactoryTest.cs b/Vecto3GUI2020Test/ViewModelTests/FactoryTests/ComponentViewModelFactoryTest.cs
index 5763f060b3390515f9ab96398d7f7a1c6b046c50..61c31e53d79ddb9659f3445bdaff9a8072b67fa2 100644
--- a/Vecto3GUI2020Test/ViewModelTests/FactoryTests/ComponentViewModelFactoryTest.cs
+++ b/Vecto3GUI2020Test/ViewModelTests/FactoryTests/ComponentViewModelFactoryTest.cs
@@ -62,9 +62,9 @@ public class ComponentViewModelFactoryTest
}
[Test]
- public void CreateMultistepAuxiliaryViewModel([Values] StageInputViewModel.CompletedBusArchitecture arch)
+ public void CreateMultistepAuxiliaryViewModel([Values] CompletedBusArchitecture arch)
{
- if (arch == StageInputViewModel.CompletedBusArchitecture.Exempted) {
+ if (arch == CompletedBusArchitecture.Exempted) {
return;
}
var multistepComponentFactory = _kernel.Get<IMultistepComponentViewModelFactory>();
diff --git a/Vecto3GUI2020Test/ViewModelTests/FactoryTests/DocumentViewModelFactoryTest.cs b/Vecto3GUI2020Test/ViewModelTests/FactoryTests/DocumentViewModelFactoryTest.cs
index a13ac69973c1f33e4d6858661ccc3b4c589bf1b2..40d370702ae0b248f4b34e51826cd2a11a58f510 100644
--- a/Vecto3GUI2020Test/ViewModelTests/FactoryTests/DocumentViewModelFactoryTest.cs
+++ b/Vecto3GUI2020Test/ViewModelTests/FactoryTests/DocumentViewModelFactoryTest.cs
@@ -50,26 +50,26 @@ namespace Vecto3GUI2020Test.ViewModelTests.FactoryTests
var arch = stepInputViewModel.Architecture;
if (type == XMLDeclarationConventionalCompletedBusDataProviderV24.XSD_TYPE) {
- Assert.AreEqual(arch, StageInputViewModel.CompletedBusArchitecture.Conventional);
+ Assert.AreEqual(arch, CompletedBusArchitecture.Conventional);
}
if (type == XMLDeclarationPEVCompletedBusDataProviderV24.XSD_TYPE) {
- Assert.AreEqual(arch, StageInputViewModel.CompletedBusArchitecture.PEV);
+ Assert.AreEqual(arch, CompletedBusArchitecture.PEV);
}
if (type == XMLDeclarationHevCompletedBusDataProviderV24.XSD_TYPE)
{
- Assert.AreEqual(arch, StageInputViewModel.CompletedBusArchitecture.HEV);
+ Assert.AreEqual(arch, CompletedBusArchitecture.HEV);
}
if (type == XMLDeclarationIepcCompletedBusDataProviderV24.XSD_TYPE)
{
- Assert.AreEqual(arch, StageInputViewModel.CompletedBusArchitecture.IEPC);
+ Assert.AreEqual(arch, CompletedBusArchitecture.IEPC);
}
if (type == XMLDeclarationExemptedCompletedBusDataProviderV24.XSD_TYPE)
{
- Assert.AreEqual(arch, StageInputViewModel.CompletedBusArchitecture.Exempted);
+ Assert.AreEqual(arch, CompletedBusArchitecture.Exempted);
}
Assert.NotNull(stepInputViewModel);
diff --git a/Vecto3GUI2020Test/ViewModelTests/MultistageAuxiliariesViewModelTests.cs b/Vecto3GUI2020Test/ViewModelTests/MultistageAuxiliariesViewModelTests.cs
index 757b42a486621b97b7bf8e32f64f35b2c8667c34..b528a61fcf01acad829ebe944fdc20493060da87 100644
--- a/Vecto3GUI2020Test/ViewModelTests/MultistageAuxiliariesViewModelTests.cs
+++ b/Vecto3GUI2020Test/ViewModelTests/MultistageAuxiliariesViewModelTests.cs
@@ -22,9 +22,9 @@ namespace Vecto3GUI2020Test.ViewModelTests
_kernel = TestHelper.GetKernel();
_viewModelFactory = _kernel.Get<IMultiStageViewModelFactory>();
}
- [TestCase(StageInputViewModel.CompletedBusArchitecture.Conventional)]
- [TestCase(StageInputViewModel.CompletedBusArchitecture.HEV)]
- public void TestAllowedValuesHeatPumpTypeDriver(StageInputViewModel.CompletedBusArchitecture arch)
+ [TestCase(CompletedBusArchitecture.Conventional)]
+ [TestCase(CompletedBusArchitecture.HEV)]
+ public void TestAllowedValuesHeatPumpTypeDriver(CompletedBusArchitecture arch)
{
var auxVm = _viewModelFactory.GetAuxiliariesViewModel(
arch) as MultistageAuxiliariesViewModel;
@@ -45,9 +45,9 @@ namespace Vecto3GUI2020Test.ViewModelTests
}
- [TestCase(StageInputViewModel.CompletedBusArchitecture.Conventional)]
- [TestCase(StageInputViewModel.CompletedBusArchitecture.HEV)]
- public void TestEnumParameters(StageInputViewModel.CompletedBusArchitecture arch)
+ [TestCase(CompletedBusArchitecture.Conventional)]
+ [TestCase(CompletedBusArchitecture.HEV)]
+ public void TestEnumParameters(CompletedBusArchitecture arch)
{
var auxVm = _viewModelFactory.GetAuxiliariesViewModel(
arch) as MultistageAuxiliariesViewModel;
diff --git a/Vecto3GUI2020Test/ViewModelTests/StepViewModelTests.cs b/Vecto3GUI2020Test/ViewModelTests/StepViewModelTests.cs
index 2d4896862e1671991bc80dd7c99dc60bd2232181..e55898a8bdde83801bcb6a0a9271a589366c76b7 100644
--- a/Vecto3GUI2020Test/ViewModelTests/StepViewModelTests.cs
+++ b/Vecto3GUI2020Test/ViewModelTests/StepViewModelTests.cs
@@ -139,11 +139,11 @@ namespace Vecto3GUI2020Test.ViewModelTests
Assert.NotNull(stepInput.VehicleViewModel);
Assert.NotNull(stepInput.VehicleViewModel.MultistageAirdragViewModel);
Assert.NotNull(stepInput.VehicleViewModel.MultistageAuxiliariesViewModel);
- Assert.NotNull(stepInput.Architecture == StageInputViewModel.CompletedBusArchitecture.Conventional);
+ Assert.NotNull(stepInput.Architecture == CompletedBusArchitecture.Conventional);
}
[Test]
- public void CreateStepInputForAllArchitectures([Values] StageInputViewModel.CompletedBusArchitecture arch)
+ public void CreateStepInputForAllArchitectures([Values] CompletedBusArchitecture arch)
{
var stepInput = _viewModelFactory.GetCreateNewStepInputViewModel(false) as StageInputViewModel;
@@ -160,8 +160,8 @@ namespace Vecto3GUI2020Test.ViewModelTests
}
[Test]
- public void SwitchArchitectures([Values] StageInputViewModel.CompletedBusArchitecture from,
- [Values] StageInputViewModel.CompletedBusArchitecture to)
+ public void SwitchArchitectures([Values] CompletedBusArchitecture from,
+ [Values] CompletedBusArchitecture to)
{
if (from == to) {
@@ -184,7 +184,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
[Test]
- public void CreateAndSaveMinimalInput([Values] StageInputViewModel.CompletedBusArchitecture arch, [Values] bool addAuxInput, [Values] bool loadAirdrag)
+ public void CreateAndSaveMinimalInput([Values] CompletedBusArchitecture arch, [Values] bool addAuxInput, [Values] bool loadAirdrag, [Values(TestData.airdragLoadTestFile, TestData.airdragLoadTestFilev2)] string airdragFile)
{
var stepInput = _viewModelFactory.GetCreateNewStepInputViewModel(false) as StageInputViewModel;
Assert.NotNull(stepInput.VehicleViewModel);
@@ -199,14 +199,15 @@ namespace Vecto3GUI2020Test.ViewModelTests
vehicleVm.Manufacturer = $"A {arch}_manufacturer";
- if (addAuxInput && arch != StageInputViewModel.CompletedBusArchitecture.Exempted) {
+ if (addAuxInput && arch != CompletedBusArchitecture.Exempted) {
var auxVm = vehicleVm.MultistageAuxiliariesViewModel as MultistageAuxiliariesViewModel;
auxVm.BrakelightsLED = true;
}
- if (loadAirdrag && arch != StageInputViewModel.CompletedBusArchitecture.Exempted) {
- Assert.Ignore();
- Assert.Fail();
+ if (loadAirdrag && arch != CompletedBusArchitecture.Exempted) {
+ var airdragVm = vehicleVm.MultistageAirdragViewModel as MultistageAirdragViewModel;
+ airdragVm.LoadAirdragFile(Path.GetFullPath(airdragFile));
+
}
stepInput.SaveInputDataExecute($"{arch}_step_input.xml");