From 8f72435a90c53a7ef20c6b09488e92581e99f0a1 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Thu, 14 Sep 2017 15:34:03 +0200
Subject: [PATCH] Made Auxiliary tests compileable
---
VECTO/Input Files/Vehicle.vb | 8 ++++----
.../IntegrationTests/AuxDemandTest.vb | 6 +++---
VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb | 6 +++---
VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb | 6 +++---
VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb | 10 +++++-----
VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb | 6 +++---
VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb | 8 ++++----
VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb | 6 +++---
8 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb
index eeff657adc..7ece6703f6 100644
--- a/VECTO/Input Files/Vehicle.vb
+++ b/VECTO/Input Files/Vehicle.vb
@@ -340,8 +340,8 @@ Public Class Vehicle
Public ReadOnly Property GrossVehicleMassRating As Kilogram _
Implements IVehicleDeclarationInputData.GrossVehicleMassRating
Get
- Return MassMax.SI().Ton.Cast(Of Kilogram)()
- End Get
+ Return MassMax.SI(Unit.SI.Ton).Cast(Of Kilogram)()
+ End Get
End Property
Public ReadOnly Property TorqueLimits As IList(Of ITorqueLimitInputData) _
@@ -413,8 +413,8 @@ Public Class Vehicle
Public ReadOnly Property IVehicleEngineeringInputData_DynamicTyreRadius As Meter _
Implements IVehicleEngineeringInputData.DynamicTyreRadius
Get
- Return DynamicTyreRadius.SI().Milli.Meter.Cast(Of Meter)()
- End Get
+ Return DynamicTyreRadius.SI(Unit.SI.Milli.Meter).Cast(Of Meter)()
+ End Get
End Property
Public ReadOnly Property IVehicleEngineeringInputData_Loading As Kilogram _
diff --git a/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb b/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
index 740024f1c1..5e3d01204a 100644
--- a/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
+++ b/VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
@@ -105,7 +105,7 @@ Namespace IntegrationTests
Debug.Print("{0}", aux.AA_TotalCycleFC_Grams)
Next
- Assert.AreEqual(79.303.SI().Gramm.Value(), aux.AA_TotalCycleFC_Grams().Value(), 0.0001)
+ Assert.AreEqual(79.303.SI(Unit.SI.Gramm).Value(), aux.AA_TotalCycleFC_Grams().Value(), 0.0001)
aux.Signals.EngineDrivelinePower = (-15 * 1000).SI(Of Watt)()
aux.Signals.EngineDrivelineTorque = aux.Signals.EngineDrivelinePower / (1256.RPMtoRad())
@@ -117,7 +117,7 @@ Namespace IntegrationTests
Debug.Print("{0}", aux.AA_TotalCycleFC_Grams)
Next
- Assert.AreEqual(82.5783.SI().Gramm.Value(), aux.AA_TotalCycleFC_Grams().Value(), 0.0001)
+ Assert.AreEqual(82.5783.SI(Unit.SI.Gramm).Value(), aux.AA_TotalCycleFC_Grams().Value(), 0.0001)
aux.Signals.EngineDrivelinePower = (driveLinePower * 1000).SI(Of Watt)()
aux.Signals.EngineDrivelineTorque = aux.Signals.EngineDrivelinePower / (1256.RPMtoRad())
@@ -128,7 +128,7 @@ Namespace IntegrationTests
aux.CycleStep(1.SI(Of Second), msg)
Next
- Assert.AreEqual(162.4655.SI().Gramm.Value(), aux.AA_TotalCycleFC_Grams().Value(), 0.0001)
+ Assert.AreEqual(162.4655.SI(Unit.SI.Gramm).Value(), aux.AA_TotalCycleFC_Grams().Value(), 0.0001)
End Sub
End Class
End Namespace
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb
index c5e3815812..52868f6e28 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb
@@ -48,8 +48,8 @@ Public Class M1_Mock
AveragePowerDemandAtAlternatorFromHVACElectricsWatts.SI(Of Watt)()
_AveragePowerDemandAtCrankFromHVACElectricsWatts = AveragePowerDemandAtCrankFromHVACElectricsWatts.SI(Of Watt)()
_AveragePowerDemandAtCrankFromHVACMechanicalsWatts = AveragePowerDemandAtCrankFromHVACMechanicalsWatts.SI(Of Watt)()
- _HVACFuelingLitresPerHour = HVACFuelingLitresPerHour.SI().Liter.Per.Hour.Cast(Of LiterPerSecond)() _
- '(Of LiterPerHour)()
- End Sub
+ _HVACFuelingLitresPerHour = HVACFuelingLitresPerHour.SI(Unit.SI.Liter.Per.Hour).Cast(Of LiterPerSecond)() _
+ '(Of LiterPerHour)()
+ End Sub
End Class
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb
index c637132d74..6b6230ac46 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb
@@ -32,9 +32,9 @@ Namespace UnitTests
target.CycleStep(1.SI(Of Second))
- Assert.AreEqual(out1.SI().Gramm.Value(), target.AverageLoadsFuelConsumptionInterpolatedForPneumatics.Value(), 0.001)
- Assert.AreEqual(out2.SI().Gramm.Value(), target.FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand.Value(), 0.001)
- End Sub
+ Assert.AreEqual(out1.SI(Unit.SI.Gramm).Value(), target.AverageLoadsFuelConsumptionInterpolatedForPneumatics.Value(), 0.001)
+ Assert.AreEqual(out2.SI(Unit.SI.Gramm).Value(), target.FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand.Value(), 0.001)
+ End Sub
End Class
End Namespace
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
index bc46d48955..5a1ca06c3b 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
@@ -41,11 +41,11 @@ Namespace UnitTests
'Act
Dim target = New M12(M10Mock.Object, m11Mock.Object, sgnlsMock.Object)
- 'Assert
- Assert.AreEqual(target.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand().Value(),
- OUT1.SI().Gramm.Value(), 0.001)
- Assert.AreEqual(target.BaseFuelConsumptionWithTrueAuxiliaryLoads().Value(), OUT2.SI().Gramm.Value(), 0.001)
- End Sub
+ 'Assert
+ Assert.AreEqual(target.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand().Value(),
+ OUT1.SI(Unit.SI.Gramm).Value(), 0.001)
+ Assert.AreEqual(target.BaseFuelConsumptionWithTrueAuxiliaryLoads().Value(), OUT2.SI(Unit.SI.Gramm).Value(), 0.001)
+ End Sub
End Class
End Namespace
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
index a5be740128..683db25ad8 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
@@ -55,9 +55,9 @@ Namespace UnitTests
'Act
Dim target = New M13(m10.Object, m11.Object, m12.Object, Signals.Object)
- 'Assert
- Assert.AreEqual(OUT1.SI().Gramm.Value(), target.WHTCTotalCycleFuelConsumptionGrams.Value(), 0.001)
- End Sub
+ 'Assert
+ Assert.AreEqual(OUT1.SI(Unit.SI.Gramm).Value(), target.WHTCTotalCycleFuelConsumptionGrams.Value(), 0.001)
+ End Sub
End Class
End Namespace
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
index f5f7f3ad65..8f9ea5206f 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
@@ -117,10 +117,10 @@ Namespace UnitTests
'Act
Dim m14 As New M14(m13.Object, ssmMock, constants, signals.Object)
- 'Assert
- Assert.AreEqual(expectedOut1.SI().Gramm.Value(), m14.TotalCycleFCGrams.Value(), 0.1)
- Assert.AreEqual(expectedOut2.SI().Liter.Value(), m14.TotalCycleFCLitres.Value(), 0.00001)
- End Sub
+ 'Assert
+ Assert.AreEqual(expectedOut1.SI(Unit.SI.Gramm).Value(), m14.TotalCycleFCGrams.Value(), 0.1)
+ Assert.AreEqual(expectedOut2.SI(Unit.SI.Liter).Value(), m14.TotalCycleFCLitres.Value(), 0.00001)
+ End Sub
End Class
End Namespace
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
index 9a6c23400a..0489873cf4 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
@@ -61,9 +61,9 @@ Namespace UnitTests
Assert.AreEqual(target.LitresOfAirCompressorOnContinually.Value(), AG1, 0.000001)
Assert.AreEqual(target.LitresOfAirCompressorOnOnlyInOverrun.Value(), AG2, 0.000001)
- Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOnContinuously.Value(), AG3.SI().Gramm.Value(), 0.000001)
- Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOffContinuously.Value(), AG4.SI().Gramm.Value(), 0.000001)
- End Sub
+ Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOnContinuously.Value(), AG3.SI(Unit.SI.Gramm).Value(), 0.000001)
+ Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOffContinuously.Value(), AG4.SI(Unit.SI.Gramm).Value(), 0.000001)
+ End Sub
<Test()> _
--
GitLab