From 304740c68205df8142ad772d80c8183bb07526a6 Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Thu, 19 Sep 2019 14:30:58 +0200 Subject: [PATCH] updating imports in aux test project --- .../VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb | 1 + .../Mocks/ElectricalConsumerMock.vb | 1 + VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb | 5 +++++ VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb | 5 +++++ VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb | 12 ++++++++++++ VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb | 5 ++++- VECTOAux/VectoAuxiliariesTests/Mocks/M5_Mock.vb | 5 +++++ VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb | 5 +++++ VECTOAux/VectoAuxiliariesTests/Mocks/M7_Mock.vb | 5 +++++ .../VectoAuxiliariesTests.vbproj | 4 ++++ 10 files changed, 47 insertions(+), 1 deletion(-) diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb index 99df79b250..04e060039b 100644 --- a/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb +++ b/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb @@ -1,4 +1,5 @@ Imports TUGraz.VectoCommon.Utils +Imports VectoAuxiliaries.DownstreamModules.Electrics Imports VectoAuxiliaries.Electrics Namespace Mocks diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb index ac0e67d58b..19e6cae555 100644 --- a/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb +++ b/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb @@ -1,6 +1,7 @@ Imports VectoAuxiliaries.Electrics Imports System.ComponentModel Imports TUGraz.VectoCommon.Utils +Imports VectoAuxiliaries.DownstreamModules.Electrics Namespace Mocks Public Class ElectricalConsumerMock diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb index bf564858d1..a383992682 100644 --- a/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb +++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb @@ -1,5 +1,6 @@  Imports TUGraz.VectoCommon.Utils +Imports VectoAuxiliaries Imports VectoAuxiliaries.Electrics Imports VectoAuxiliaries.Pneumatics Imports VectoAuxiliaries.Hvac @@ -51,5 +52,9 @@ Public Class M1_Mock _HVACFuelingLitresPerHour = HVACFuelingLitresPerHour.SI(Unit.SI.Liter.Per.Hour).Cast(Of LiterPerSecond)() _ '(Of LiterPerHour)() End Sub + + Public Sub ResetCalculations() Implements IAbstractModule.ResetCalculations + Throw New NotImplementedException + End Sub End Class diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb index e555250bf3..842efa8fce 100644 --- a/VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb +++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb @@ -1,4 +1,5 @@ Imports TUGraz.VectoCommon.Utils +Imports VectoAuxiliaries Imports VectoAuxiliaries.Electrics Imports VectoAuxiliaries.Pneumatics Imports VectoAuxiliaries.Hvac @@ -32,5 +33,9 @@ Public Class M2_Mock _GetAveragePowerAtCrankFromElectrics = GetAveragePowerAtCrankFromElectrics.SI(Of Watt)() _GetAveragePowerDemandAtAlternator = GetAveragePowerDemandAtAlternator.SI(Of Watt)() End Sub + + Public Sub ResetCalculations() Implements IAbstractModule.ResetCalculations + Throw New NotImplementedException + End Sub End Class diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb index c7d3bd5e9f..0ac50f2286 100644 --- a/VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb +++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb @@ -1,4 +1,5 @@ Imports TUGraz.VectoCommon.Utils +Imports VectoAuxiliaries Imports VectoAuxiliaries.Electrics Imports VectoAuxiliaries.Pneumatics Imports VectoAuxiliaries.Hvac @@ -9,6 +10,7 @@ Public Class M3_Mock Public _GetAveragePowerDemandAtCrankFromPneumatics As Watt Public _TotalAirConsumedPerCycle As NormLiterPerSecond + Private _totalAirDemand As NormLiter Public Function GetAveragePowerDemandAtCrankFromPneumatics() As Watt _ @@ -16,6 +18,12 @@ Public Class M3_Mock Return _GetAveragePowerDemandAtCrankFromPneumatics End Function + Public ReadOnly Property TotalAirDemand As NormLiter Implements IM3_AveragePneumaticLoadDemand.TotalAirDemand + Get + Return _totalAirDemand + End Get + End Property + Public Function TotalAirConsumedPerCycle() As NormLiterPerSecond _ Implements IM3_AveragePneumaticLoadDemand.AverageAirConsumedPerSecondLitre Return _TotalAirConsumedPerCycle @@ -30,5 +38,9 @@ Public Class M3_Mock _GetAveragePowerDemandAtCrankFromPneumatics = GetAveragePowerDemandAtCrankFromPneumatics.SI(Of Watt)() _TotalAirConsumedPerCycle = TotalAirConsumedPerCycle.SI(Of NormLiterPerSecond)() End Sub + + Public Sub ResetCalculations() Implements IAbstractModule.ResetCalculations + Throw New NotImplementedException + End Sub End Class diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb index 7eb7e8e744..a2ec9ba03e 100644 --- a/VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb +++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb @@ -1,4 +1,5 @@ Imports TUGraz.VectoCommon.Utils +Imports VectoAuxiliaries Imports VectoAuxiliaries.Electrics Imports VectoAuxiliaries.Pneumatics Imports VectoAuxiliaries.Hvac @@ -63,6 +64,8 @@ Public Class M4_Mock Public Property PulleyGearRatio As Double Implements IM4_AirCompressor.PulleyGearRatio - + Public Sub ResetCalculations() Implements IAbstractModule.ResetCalculations + Throw New NotImplementedException + End Sub End Class diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M5_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M5_Mock.vb index 1b53fb739f..3655c69f8d 100644 --- a/VECTOAux/VectoAuxiliariesTests/Mocks/M5_Mock.vb +++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M5_Mock.vb @@ -1,4 +1,5 @@ Imports TUGraz.VectoCommon.Utils +Imports VectoAuxiliaries Imports VectoAuxiliaries.Electrics Imports VectoAuxiliaries.Pneumatics Imports VectoAuxiliaries.Hvac @@ -40,5 +41,9 @@ Public Class M5_Mock _AlternatorsGenerationPowerAtCrankOverrunWatts = AlternatorsGenerationPowerAtCrankOverrunWatts.SI(Of Watt)() _AlternatorsGenerationPowerAtCrankTractionOnWatts = AlternatorsGenerationPowerAtCrankTractionOnWatts.SI(Of Watt)() End Sub + + Public Sub ResetCalculations() Implements IAbstractModule.ResetCalculations + Throw New NotImplementedException + End Sub End Class diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb index 3ccbc11731..300b1d03b4 100644 --- a/VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb +++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb @@ -1,5 +1,6 @@  Imports TUGraz.VectoCommon.Utils +Imports VectoAuxiliaries Imports VectoAuxiliaries.Electrics Imports VectoAuxiliaries.Pneumatics Imports VectoAuxiliaries.Hvac @@ -105,5 +106,9 @@ Public Class M6_Mock _SmartPneumaticOnlyAirCompPowerGenAtCrank = SmartPneumaticOnlyAirCompPowerGenAtCrank.SI(Of Watt)() _SmartPneumaticsOnlyCompressorFlag = SmartPneumaticsOnlyCompressorFlag End Sub + + Public Sub ResetCalculations() Implements IAbstractModule.ResetCalculations + Throw New NotImplementedException + End Sub End Class diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M7_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M7_Mock.vb index 4bae966872..ae499990fa 100644 --- a/VECTOAux/VectoAuxiliariesTests/Mocks/M7_Mock.vb +++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M7_Mock.vb @@ -1,5 +1,6 @@  Imports TUGraz.VectoCommon.Utils +Imports VectoAuxiliaries Imports VectoAuxiliaries.Electrics Imports VectoAuxiliaries.Pneumatics Imports VectoAuxiliaries.Hvac @@ -57,4 +58,8 @@ Public Class M7_Mock _SmartElectricalOnlyAuxAltPowerGenAtCrank = SmartElectricalOnlyAuxAltPowerGenAtCrank _SmartPneumaticOnlyAuxAirCompPowerGenAtCrank = SmartPneumaticOnlyAuxAirCompPowerGenAtCrank End Sub + + Public Sub ResetCalculations() Implements IAbstractModule.ResetCalculations + Throw New NotImplementedException + End Sub End Class \ No newline at end of file diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj index 6867dba58e..ddb7c44130 100644 --- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj +++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj @@ -399,6 +399,10 @@ <Project>{79a066ad-69a9-4223-90f6-6ed5d2d084f4}</Project> <Name>VectoCommon</Name> </ProjectReference> + <ProjectReference Include="..\BusAuxiliaries\BusAuxiliaries.csproj"> + <Project>{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}</Project> + <Name>BusAuxiliaries</Name> + </ProjectReference> <ProjectReference Include="..\VectoAuxiliaries\VectoAuxiliaries.vbproj"> <Project>{fdeee460-0b8a-4ef6-8d9e-72f203a50f65}</Project> <Name>VectoAuxiliaries</Name> -- GitLab