refactor tests to use fuel map interface, formatting

VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb

@@ -6,47 +6,17 @@ Imports NUnit.Framework
 Imports VectoAuxiliaries
 
 public class MockFuel50PC
-Implements IFUELMAP
+	Implements IFuelConsumptionMap
 
+	Public Function fFCdelaunay_Intp(nU As Single, Tq As Single) As Single
 
-   Public Function fFCdelaunay_Intp(nU As Single, Tq As Single) As Single Implements IFUELMAP.fFCdelaunay_Intp
+		Return (nU + Tq) * 0.5
+	End Function
 
-       Return (nU + Tq ) * 0.5
 
-   End Function
-
-   Public Property FilePath As String Implements IFUELMAP.FilePath
-
-   Public Function ReadFile(Optional ShowMsg As Boolean = True) As Boolean Implements IFUELMAP.ReadFile
-   Return true
-   End Function
-
-            Public ReadOnly Property FC As List(Of Single) Implements IFUELMAP.FC
-                Get
-                 Return New List(Of Single)
-                End Get
-            End Property
-
-            Public ReadOnly Property MapDim As Integer Implements IFUELMAP.MapDim
-                Get
-                 Return 0
-                End Get
-            End Property
-
-            Public ReadOnly Property nU As List(Of Single) Implements IFUELMAP.nU
-                Get
-                 Return New List(Of Single)
-                End Get
-            End Property
-
-            Public ReadOnly Property Tq As List(Of Single) Implements IFUELMAP.Tq
-                Get
-                 Return New List(Of Single)
-                End Get
-            End Property
-
-            Public Function Triangulate() As Boolean Implements IFUELMAP.Triangulate
-             Return true
-            End Function
+	Public Function GetFuelConsumption(torque As Double, angularVelocity As Double) As Double _
+		Implements IFuelConsumptionMap.GetFuelConsumption
+		Return fFCdelaunay_Intp(angularVelocity, torque)
+	End Function
 End Class
 

VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb

@@ -2,85 +2,77 @@
 Imports VectoAuxiliaries.Hvac
 Imports NUnit.Framework
 Imports VectoAuxiliariesTests.Mocks
-imports VectoAuxiliaries
+Imports VectoAuxiliaries
 
 Namespace UnitTests
+	<TestFixture()>
+	Public Class M2_AverageElectricalDemandTests
+		Private signals As ISignals = New Signals
 
-    <TestFixture()>
-    Public Class M2_AverageElectricalDemandTests
+		Private Const csngDoorDutyCycleZeroToOne As Single = 0.0963391136801541
+		Private Const csngPowernetVoltage As Single = 26.3
+		Private ssmHVac As IHVACSteadyStateModel = New HVACSteadyStateModel(100, 100, 100)
 
-    Private signals As ISignals = New Signals
+		Private Function GetSSM() As ISSMTOOL
 
-    Private Const csngDoorDutyCycleZeroToOne As Single = 0.0963391136801541
-    Private Const csngPowernetVoltage As Single = 26.3
-    Private ssmHVac As IHVACSteadyStateModel = New HVACSteadyStateModel(100,100,100)
 
-Private Function GetSSM() As ISSMTOOL
+			Const _SSMMAP As String = "TestFiles\ssm.Ahsm"
+			'Const _BusDatabase As String ="TestFiles\BusDatabase.abdb
 
+			Dim ssm As ISSMTOOL = New SSMTOOL(_SSMMAP, New HVACConstants())
 
-  Const _SSMMAP As String = "TestFiles\ssm.Ahsm
-  Const _BusDatabase As String ="TestFiles\BusDatabase.abdb
 
-            Dim ssm As ISSMTOOL = New SSMTOOL(_SSMMAP, New HVACConstants())
+			ssm.Load(_SSMMAP)
 
 
-  ssm.Load( _SSMMAP)
-
-
-   Return ssm
-
-
-End Function
+			Return ssm
+		End Function
 
 #Region "Helpers"
-        Private Function GetAverageElectricalDemandInstance() As M2_AverageElectricalLoadDemand
-
-            signals.EngineSpeed=2000
 
+		Private Function GetAverageElectricalDemandInstance() As M2_AverageElectricalLoadDemand
 
-            Dim consumers As IElectricalConsumerList = CType(New ElectricalConsumerList(26.3,0.096, True), IElectricalConsumerList)
+			signals.EngineSpeed = 2000
 
-            Dim altMap As IAlternatorMap = CType(New AlternatorMap("testfiles\testAlternatorMap.aalt"), IAlternatorMap)
-            altMap.Initialise()
-            Dim m0 As New M0_NonSmart_AlternatorsSetEfficiency(consumers, altMap, 26.3,signals,GetSSM())
 
-            'Get Consumers.
+			Dim consumers As IElectricalConsumerList = CType(New ElectricalConsumerList(26.3, 0.096, True), 
+															IElectricalConsumerList)
 
+			Dim altMap As IAlternatorMap = CType(New AlternatorMap("testfiles\testAlternatorMap.aalt"), IAlternatorMap)
+			altMap.Initialise()
+			Dim m0 As New M0_NonSmart_AlternatorsSetEfficiency(consumers, altMap, 26.3, signals, GetSSM())
 
+			'Get Consumers.
 
-            Return New M2_AverageElectricalLoadDemand(consumers, m0, 0.8, 26.3,signals)
 
+			Return New M2_AverageElectricalLoadDemand(consumers, m0, 0.8, 26.3, signals)
+		End Function
 
-        End Function
 #End Region
 
-        <Test()>
-        Public Sub NewTest()
-            Dim target As M2_AverageElectricalLoadDemand = GetAverageElectricalDemandInstance()
-            Assert.IsNotNull(target)
-        End Sub
-
-
-
-
-         <Test()>
-        Public Sub GetAveragePowerAtAlternatorTest()
+		<Test()>
+		Public Sub NewTest()
+			Dim target As M2_AverageElectricalLoadDemand = GetAverageElectricalDemandInstance()
+			Assert.IsNotNull(target)
+		End Sub
 
 
-            Dim expected As Single  = 1594.61572
-            Dim target As M2_AverageElectricalLoadDemand = GetAverageElectricalDemandInstance()
-            Dim actual As Single = target.GetAveragePowerDemandAtAlternator()
-            Assert.AreEqual(expected,actual)
+		<Test()>
+		Public Sub GetAveragePowerAtAlternatorTest()
 
-        End Sub
 
-        <Test()>
-        Public Sub GetAveragePowerAtCrankTest()
-            Dim target As M2_AverageElectricalLoadDemand = GetAverageElectricalDemandInstance()
-            Dim expected As Single = 10914.6543
-            Dim actual As Single = target.GetAveragePowerAtCrankFromElectrics()
-            Assert.AreEqual(expected, actual)
-        End Sub
+			Dim expected As Single = 1594.61572
+			Dim target As M2_AverageElectricalLoadDemand = GetAverageElectricalDemandInstance()
+			Dim actual As Single = target.GetAveragePowerDemandAtAlternator()
+			Assert.AreEqual(expected, actual)
+		End Sub
 
-    End Class
+		<Test()>
+		Public Sub GetAveragePowerAtCrankTest()
+			Dim target As M2_AverageElectricalLoadDemand = GetAverageElectricalDemandInstance()
+			Dim expected As Single = 10914.6543
+			Dim actual As Single = target.GetAveragePowerAtCrankFromElectrics()
+			Assert.AreEqual(expected, actual)
+		End Sub
+	End Class
 End Namespace
\ No newline at end of file