From ff8162fff42712945eee3c99aa4c70ab99c66430 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 23 Sep 2019 17:53:15 +0200
Subject: [PATCH] adapt testcases to use c# implementation
---
.../IntegrationTests/AuxDemandTest.vb | 2 ++
.../Mocks/AlternatorMapMock.vb | 2 +-
.../Mocks/CompressorMapMock.vb | 3 ++-
.../Mocks/ElectricalConsumerMock.vb | 2 +-
VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb | 3 ++-
VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb | 3 ++-
VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb | 3 ++-
VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb | 3 ++-
VECTOAux/VectoAuxiliariesTests/Mocks/M5_Mock.vb | 3 ++-
VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb | 3 ++-
VECTOAux/VectoAuxiliariesTests/Mocks/M7_Mock.vb | 3 ++-
.../UnitTests/AirCompressorTests.vb | 3 ++-
.../UnitTests/AlternatorMapTests.vb | 9 ++++++++-
.../AuxiliaryEnvironmentComparisonTests.vb | 1 +
.../AuxiliaryEnvironmentPersistanceTests.vb | 1 +
.../UnitTests/AveragePneumaticLoadDemandTests.vb | 2 +-
.../UnitTests/BusDatabaseTests.vb | 4 +++-
.../UnitTests/CombinedAlternatorTests.vb | 2 +-
.../UnitTests/CompressorMapTests.vb | 1 +
.../UnitTests/ElectricalConsumerListTests.vb | 4 +++-
.../UnitTests/ElectricalConsumerTests.vb | 4 +++-
.../UnitTests/FilePathUtilityTests.vb | 1 +
.../UnitTests/HVACSSMMapTests.vb | 4 +++-
.../M0_5_SmartAlternatorSetEfficiencyTests.vb | 16 ++++++++++++++--
.../M0_NonSmart_AlternatorsSetEfficiencyTests.vb | 8 +++++---
.../VectoAuxiliariesTests/UnitTests/M10Tests.vb | 4 ++--
.../VectoAuxiliariesTests/UnitTests/M11Tests.vb | 5 ++---
.../VectoAuxiliariesTests/UnitTests/M12Tests.vb | 3 ++-
.../VectoAuxiliariesTests/UnitTests/M13Tests.vb | 3 ++-
.../VectoAuxiliariesTests/UnitTests/M14Tests.vb | 7 +++++--
.../UnitTests/M1_AverageHVACLoadDemandTests.vb | 8 +++++---
.../UnitTests/M2_AverageElectricalLoadTests.vb | 9 ++++++---
.../M5_SmartAlternatorSetGenerationTests.vb | 7 +++++--
.../VectoAuxiliariesTests/UnitTests/M6Tests.vb | 3 ++-
.../VectoAuxiliariesTests/UnitTests/M7Tests.vb | 3 ++-
.../VectoAuxiliariesTests/UnitTests/M8Tests.vb | 4 ++--
.../VectoAuxiliariesTests/UnitTests/M9Tests.vb | 6 +++---
.../UnitTests/PneumaticActuationsMapTests.vb | 3 ++-
.../UnitTests/ResultCardTests.vb | 4 +++-
.../UnitTests/SSMTOOLTests.vb | 9 ++++++++-
40 files changed, 118 insertions(+), 50 deletions(-)
diff --git a/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb b/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
index 180a51db1d..5ebd431a07 100644
--- a/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
+++ b/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
@@ -1,7 +1,9 @@
Imports System.IO
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
+Imports TUGraz.VectoCore.BusAuxiliaries.Legacy
Imports VectoAuxiliaries
Namespace IntegrationTests
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb
index e4d2cfe0d9..c13004cbdb 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb
@@ -1,4 +1,4 @@
-Imports DownstreamModules.Electrics
+
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/CompressorMapMock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/CompressorMapMock.vb
index 1054166f34..be027357db 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/CompressorMapMock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/CompressorMapMock.vb
@@ -1,6 +1,7 @@
-Imports Pneumatics
+
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.PneumaticSystem
Namespace Mocks
Public Class CompressorMapMock
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb
index 3bd1be8939..8b2fe74f73 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb
@@ -1,7 +1,7 @@

Imports System.ComponentModel
-Imports DownstreamModules.Electrics
Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
Namespace Mocks
Public Class ElectricalConsumerMock
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb
index 98b8fb24c8..7cb81d5143 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb
@@ -1,6 +1,7 @@

-Imports Hvac
+
Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
Public Class M1_Mock
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb
index 26fed9f2fd..af8377fc9c 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb
@@ -1,5 +1,6 @@
-Imports Electrics
+
Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
Public Class M2_Mock
Implements IM2_AverageElectricalLoadDemand
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb
index ccdf98bf45..8cffe6ccac 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb
@@ -1,5 +1,6 @@
-Imports Pneumatics
+
Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
Public Class M3_Mock
Implements IM3_AveragePneumaticLoadDemand
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb
index 22d123936e..d7a3fe769a 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb
@@ -1,5 +1,6 @@
-Imports Pneumatics
+
Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
Public Class M4_Mock
Implements IM4_AirCompressor
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M5_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M5_Mock.vb
index 2e8b795040..60dacc78a7 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M5_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M5_Mock.vb
@@ -1,5 +1,6 @@
-Imports Electrics
+
Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
Public Class M5_Mock
Implements IM5_SmartAlternatorSetGeneration
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb
index c68f4a0fbe..f90b846efc 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb
@@ -1,6 +1,7 @@

-Imports DownstreamModules
+
Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
Public Class M6_Mock
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M7_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M7_Mock.vb
index 327b3bca71..ff82f31868 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M7_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M7_Mock.vb
@@ -1,6 +1,7 @@

-Imports DownstreamModules
+
Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
Public Class M7_Mock
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb
index eeb4d446ec..ba6e2dd275 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb
@@ -1,7 +1,8 @@
Imports NUnit.Framework
-Imports Pneumatics
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.PneumaticSystem
Imports VectoAuxiliariesTests.Mocks
Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
index 0119be8957..1f65c5efdf 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
@@ -1,7 +1,9 @@
-Imports DownstreamModules.Electrics
+Imports System.IO
Imports VectoAuxiliaries.Electrics
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
Namespace UnitTests
@@ -17,6 +19,11 @@ Namespace UnitTests
Private Const _ASYMETRICALCOMBINEDROWSMAP As String = "TestFiles\testAlternatorMapAsymetricalRowsCombined.aalt"
Private Const _ASYMETRICALCOMBINEDXYPAIRSMAP As String = "TestFiles\testAlternatorMapAsymetricalXYPairsCombined.aalt"
+ <OneTimeSetUp>
+ Sub RunBeforeAnyTests()
+ Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory)
+ end Sub
+
<Test()>
<TestCase(10, 1500, 0.615F)> _
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb
index 03fc4d7939..df12234459 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb
@@ -2,6 +2,7 @@
Imports NUnit.Framework
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
Imports VectoAuxiliaries
+Imports AuxiliaryConfig = TUGraz.VectoCore.BusAuxiliaries.AuxiliaryConfig
Namespace UnitTests
<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb
index a22ecf0f66..000dab5df4 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb
@@ -1,6 +1,7 @@

Imports NUnit.Framework
Imports VectoAuxiliaries
+Imports AuxiliaryConfig = TUGraz.VectoCore.BusAuxiliaries.AuxiliaryConfig
Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
index cee72171c3..e7e10954c7 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
@@ -2,9 +2,9 @@
Imports System.IO
Imports VectoAuxiliaries.Pneumatics
Imports NUnit.Framework
-Imports Pneumatics
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.PneumaticSystem
Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/BusDatabaseTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/BusDatabaseTests.vb
index fbbf7adad5..d7744b6e42 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/BusDatabaseTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/BusDatabaseTests.vb
@@ -1,4 +1,6 @@
-Imports NUnit.Framework
+
+Imports NUnit.Framework
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
Imports VectoAuxiliaries.Hvac
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
index 94a3e3700d..495e54635d 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
@@ -4,7 +4,7 @@ Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
Imports VectoAuxiliaries.Electrics
Imports System.IO
-Imports DownstreamModules.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
index 1f397fee6e..e540b2002a 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
@@ -1,6 +1,7 @@
Imports System.IO
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics
Imports VectoAuxiliaries.Pneumatics
Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerListTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerListTests.vb
index 046f8f6746..2bd0b3ff32 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerListTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerListTests.vb
@@ -1,5 +1,7 @@
-Imports NUnit.Framework
+
+Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
Imports VectoAuxiliaries.Electrics
<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb
index 559c761257..8c68ad96e3 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb
@@ -1,6 +1,8 @@
-Imports DownstreamModules.Electrics
+
Imports VectoAuxiliaries.Electrics
Imports NUnit.Framework
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
Namespace UnitTests
<TestFixture()>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/FilePathUtilityTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/FilePathUtilityTests.vb
index 101ee543f9..3671ce1525 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/FilePathUtilityTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/FilePathUtilityTests.vb
@@ -2,6 +2,7 @@
Imports NUnit.Framework
Imports VectoAuxiliaries
+Imports FilePathUtils = TUGraz.VectoCore.BusAuxiliaries.Util.FilePathUtils
Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/HVACSSMMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/HVACSSMMapTests.vb
index d09e6f2f93..d0179250df 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/HVACSSMMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/HVACSSMMapTests.vb
@@ -1,4 +1,6 @@
-Imports NUnit.Framework
+
+Imports NUnit.Framework
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
Imports VectoAuxiliaries.Hvac
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
index d6172474c4..1f584b94d8 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
@@ -1,15 +1,21 @@
-Imports Electrics
+Imports System.IO
Imports VectoAuxiliaries.Electrics
Imports VectoAuxiliaries.Hvac
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.HVAC
Namespace UnitTests
+
+
<TestFixture()>
Public Class M0_5_SmartAlternatorSetEfficiencyTests
Private target As IM0_5_SmartAlternatorSetEfficiency
@@ -17,9 +23,15 @@ Namespace UnitTests
Public Sub New()
- Initialise()
+
End Sub
+ <OneTimeSetUp>
+ Sub RunBeforeAnyTests()
+ Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory)
+
+ Initialise()
+ end Sub
Private Function GetSSM() As ISSMTOOL
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
index 798263c5d7..60fc60edfb 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
@@ -3,10 +3,12 @@ Imports TUGraz.VectoCommon.Utils
Imports VectoAuxiliaries.Electrics
Imports VectoAuxiliaries.Hvac
Imports System.IO
-Imports DownstreamModules.Electrics
-Imports DownstreamModules.HVAC
-Imports Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.HVAC
Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb
index a53d079c11..50c3809ac9 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb
@@ -1,9 +1,9 @@
-Imports DownstreamModules
+
Imports NUnit.Framework
Imports Moq
-Imports Pneumatics
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
index 7e5d3ede15..d93e314ff2 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
@@ -1,10 +1,9 @@
-Imports DownstreamModules
-Imports Hvac
+
Imports NUnit.Framework
Imports Moq
-Imports Pneumatics
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
index 76fead1504..f6eedbd988 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
@@ -1,8 +1,9 @@
-Imports DownstreamModules
+
Imports NUnit.Framework
Imports Moq
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
index 471e95402f..497cdf5a9d 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
@@ -1,9 +1,10 @@
-Imports DownstreamModules
+
Imports NUnit.Framework
Imports Moq
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
index 4f5c106eea..c4502de3fa 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
@@ -1,11 +1,14 @@

-Imports DownstreamModules
-Imports DownstreamModules.HVAC
+
Imports VectoAuxiliaries.Hvac
Imports NUnit.Framework
Imports Moq
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.HVAC
Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
index fab5a15657..25972824b5 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
@@ -1,10 +1,12 @@
-Imports DownstreamModules.Electrics
-Imports Electrics
-Imports Hvac
+
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.HVAC
Imports VectoAuxiliaries.Electrics
Imports VectoAuxiliaries.Hvac
Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
index 6dad4560c0..f513519e81 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
@@ -1,11 +1,14 @@
-Imports DownstreamModules.Electrics
-Imports DownstreamModules.HVAC
-Imports Electrics
+
Imports VectoAuxiliaries.Electrics
Imports VectoAuxiliaries.Hvac
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.HVAC
Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
index 13cc444bd1..9dc6dd493b 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
@@ -1,9 +1,12 @@
-Imports DownstreamModules.HVAC
-Imports Electrics
+
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.HVAC
Imports VectoAuxiliaries.Electrics
Imports VectoAuxiliaries.Hvac
Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
index e1f0aadcba..8413187244 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
@@ -1,7 +1,8 @@
-Imports DownstreamModules
+
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M7Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M7Tests.vb
index 20b20e6b25..1f613c71ce 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M7Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M7Tests.vb
@@ -1,7 +1,8 @@
-Imports DownstreamModules
+
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
Imports Signals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.Signals
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M8Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M8Tests.vb
index bba3d958aa..cf0bc89d54 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M8Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M8Tests.vb
@@ -1,9 +1,9 @@
-Imports DownstreamModules
-Imports Hvac
+
Imports NUnit.Framework
Imports Moq
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
Namespace UnitTests
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
index 9486d76532..c5623158a2 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
@@ -1,10 +1,10 @@
-Imports DownstreamModules
-Imports Hvac
+
Imports NUnit.Framework
Imports Moq
-Imports Pneumatics
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.PneumaticSystem
Imports IFuelConsumptionMap = TUGraz.VectoCore.BusAuxiliaries.Interfaces.IFuelConsumptionMap
Imports ISignals = TUGraz.VectoCore.BusAuxiliaries.Interfaces.ISignals
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb
index 1495fe6ec4..61114dcfc5 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb
@@ -2,7 +2,8 @@
Imports VectoAuxiliaries.Pneumatics
Imports NUnit.Framework
Imports System.IO
-Imports Pneumatics
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Pneumatics
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.PneumaticSystem
Namespace Pneumatics
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/ResultCardTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/ResultCardTests.vb
index 04fbadb8b4..0873919072 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/ResultCardTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/ResultCardTests.vb
@@ -1,5 +1,7 @@
-Imports NUnit.Framework
+
+Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.Electrics
Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.Electrics
Imports VectoAuxiliaries.Electrics
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
index 9132eb6f1f..f124929498 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
@@ -1,5 +1,7 @@
-Imports DownstreamModules.HVAC
+Imports System.IO
Imports NUnit.Framework
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl.HVAC
+Imports TUGraz.VectoCore.BusAuxiliaries.Interfaces.DownstreamModules.HVAC
Imports VectoAuxiliaries.Hvac
Namespace UnitTests
@@ -45,6 +47,11 @@ Namespace UnitTests
Assert.IsTrue(src.TechList.Add(newItem, feedback))
End Sub
+ <OneTimeSetUp>
+ Sub RunBeforeAnyTests()
+ Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory)
+ end Sub
+
'SSMGenInputTests
<Test()> _
<TestCase("BusParameterisation")> _
--
GitLab