diff --git a/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb b/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
index 180a51db1db339ffecb6e270d00491a0d85b309a..5ebd431a0798029f68e3d89441ed1d74ff16761b 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 e4d2cfe0d9e845da3e15b0489b9e1267e86c05a4..c13004cbdb01ba71475f3685097f805567f29143 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 1054166f34705d7c1a06f43fde0fdc7ecaf4b330..be027357db4805f1d284f49249bbf563614e6a68 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 3bd1be89396bb7ef6ec21122ea5136c7afbd5c26..8b2fe74f735497034620518d4645610ca89cdfd3 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 98b8fb24c83c9a0b8d69f43fc58ff3e970a79ded..7cb81d51438b98db0f903341d31f98d80ab12006 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 26fed9f2fd78609553acaf27d8c5d0436a34b68a..af8377fc9c92ae0153e658b2e373b5578fd69b18 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 ccdf98bf450d774517442567a9f0c7f82b3499bb..8cffe6ccac68d43d9d2357a9dcb9275e3817ab3e 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 22d123936e9b86ddf6dee8ee6abb77ba33e7bf4d..d7a3fe769a85ac8a0ee8494d1beb46a7dfe27030 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 2e8b7950401ba9bb2d08744cb9f1e8d22c7082b4..60dacc78a7955db333aacd794fb698909dc63d47 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 c68f4a0fbe5a547fcc68a368c8248773d6839739..f90b846efc7d79d98e34513baaa82f8b1efa2ea0 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 327b3bca71a279554ffe4e79da73dcb6c00a4f26..ff82f3186877ce16072a10492589df86106292ba 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 eeb4d446ecdae22374cd92d5bcc9eaecfa543c74..ba6e2dd27541bbd499f862158ecfe36f8880f459 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 0119be8957be3539e1678d44fa60ad1c474c1d87..1f65c5efdf41cb9d942ea2c3f1bdc648b5327bd5 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 03fc4d7939e57fe0ef174564048d035a0d02e86c..df1223445914298426f89a6986024bcc25c9b1ab 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 a22ecf0f666fadf1dc1743e6948302c7558fb934..000dab5df40014ca7d69ac39b96deba013e5016f 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 cee72171c3b610f14089df4dfae7c48c6cce3c3e..e7e10954c7b8f01f01c9a927cbf1134eac1fcfa8 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 fbbf7adad56cb9e24e106ed441365cdf4da23123..d7744b6e422dbfc4f88a6c0980d1ec93fd7430d8 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 94a3e3700d697543579ffb068ed4d94389162164..495e54635d28f085041dec09344cef42ad994096 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 1f397fee6e5e4dd324f1c30d394cdc7248b34c33..e540b2002a1d6d8b18a5c29c800635857711da00 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 046f8f674670c68a0d40bca297eee6fd6944db2c..2bd0b3ff3221614571900566b21afe96997f4c27 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 559c7612575c91ef61080ac585bf9d661575324a..8c68ad96e3b5d8877a9d88728efd2ba50b016998 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 101ee543f917605eae26ac839be28ed44ed84a8f..3671ce1525238f2cb9f1eb313cd0827a939cd78a 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 d09e6f2f93b6df506ebb603eb0b39cd1a375c6e8..d0179250dff9e0e10bf29d0a329ef9c2bf09f6e5 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 d6172474c420439186b263badc3ac5f3a77774d5..1f584b94d8aceb8b337c072fa43d987583f76c7b 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 798263c5d76c0215eb77c43185d6b003c93a58a3..60fc60edfbb6b0d435170fc0d49e5318c18135a4 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 a53d079c11497e89287c6343dfe17c1ecf156361..50c3809ac969220f6868f7d2aada77cf40ea19bc 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 7e5d3ede154569a1550796d87dc564039f129f62..d93e314ff22800622eb54b921b2b5f76f05420fa 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 76fead15044d848d74a46c6f64c0a5de974a4281..f6eedbd9880ea085e46efd0bb790b35643a1eb36 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 471e95402fe7dd2b96e63723dbd34a009d778ff2..497cdf5a9dfeaac64442e08a4a8559548c270171 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 4f5c106eea8a0a03e60c298771eb39ef09a951d2..c4502de3fa9b98caa3a396951a1e54088a07a373 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 fab5a15657fb5200669d4be2ca99cbffe82715ba..25972824b5063d5e1a2e88d5c8d706033de909b5 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 6dad4560c01d0826c14fa59a0cdb624d1b1dc1cc..f513519e81eca1cdda7e7ae4e181e1f0bae4486f 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 13cc444bd1ca33f56551fe96cfcce23b32ad4093..9dc6dd493bc7ab24c39921b9a6a4c56acb9e1507 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 e1f0aadcba1796e5375eb2f2b36c32b33ce41e3b..84131872442406f33ea9c6a1521a35d5469f5b65 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 20b20e6b251392a64de84e2ac25a47e0690e59fa..1f613c71ce6ee9718544cc5792996949bc73b38b 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 bba3d958aa3c41b9bb38c932d5040b98d60f9428..cf0bc89d5485d445a651910f7a232d692379faf2 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 9486d76532dbeab9821289b2e26ca335e395ef26..c5623158a2a4ce1310c27b95376754fa296881a1 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 1495fe6ec4cfe6f533b91b3a633830d83fe5dd43..61114dcfc5c346be9b56ecc866635e9ce8a4ca7a 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 04fbadb8b45b419a19b9c4530721bcbf0f8a274d..087391907279fbdc4975a2a77b820091bc18dfcb 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 9132eb6f1f28cfce44bdf4dcc11618cbb4a640e6..f124929498c897cde5eb504633da7e9b2875430a 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")> _