diff --git a/VECTOAux/VectoAuxiliaries/Hvac/HVACMap.vb b/VECTOAux/VectoAuxiliaries/Hvac/HVACMap.vb
index d974bb6128fa976417118b0bc1cd1d205ffb5997..c915afbc62bff2424149bd8726c8857caa86c1f0 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/HVACMap.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/HVACMap.vb
@@ -7,8 +7,6 @@ Namespace Hvac
Public Class HVACMap
Implements IHVACMap
-
-
#Region "Header Comments"
'Some sort of multi-dimensional map implemented here
@@ -212,7 +210,6 @@ Namespace Hvac
End Sub
-
'Public Map Enquiry Methods
Public Function GetMapHeaders() As Dictionary(Of String, HVACMapParameter) Implements IHVACMap.GetMapHeaders
@@ -307,8 +304,6 @@ Namespace Hvac
End Function
-
-
End Class
End Namespace
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliaries/Pneumatics/AirCompressor.vb b/VECTOAux/VectoAuxiliaries/Pneumatics/AirCompressor.vb
index 1b3e45e8e62b166ecfca71db951402cd3fc49d1c..782986b407a97fd34d7ec6727e975d4dbf6ab087 100644
--- a/VECTOAux/VectoAuxiliaries/Pneumatics/AirCompressor.vb
+++ b/VECTOAux/VectoAuxiliaries/Pneumatics/AirCompressor.vb
@@ -1,6 +1,8 @@

Namespace Pneumatics
+
+
Public Class AirCompressor
Implements IAirCompressor
@@ -82,6 +84,13 @@ Namespace Pneumatics
Return _map.Initialise()
End Function
+ 'Queryable Compressor Methods
+ '
+ 'Compressor ( Speed ) Flow Rate
+ 'Power @ Crank From Pnumatics compressor off ( A )
+ 'Power @ Crank From Pnumatics compressor On ( B )
+ 'Power Delta ( A ) vs ( B )
+
''' <summary>
''' Returns the flow rate [litres/second] of compressor for the given engine rpm
''' </summary>
@@ -142,4 +151,5 @@ Namespace Pneumatics
End Function
End Class
+
End Namespace
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliariesTests/ClassDiagram1.cd b/VECTOAux/VectoAuxiliariesTests/ClassDiagram1.cd
new file mode 100644
index 0000000000000000000000000000000000000000..7b894197b9d8d79b2ad4afafc2c11c60f33c4b42
--- /dev/null
+++ b/VECTOAux/VectoAuxiliariesTests/ClassDiagram1.cd
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram />
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMap.csv b/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMap.csv
index 45f504e02e11bf7f4eb605a9b252daeb9d1f68cf..d65941e1bab89d8806291497f4cb92f7df94e2a9 100644
--- a/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMap.csv
+++ b/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMap.csv
@@ -2,6 +2,5 @@ rpm,flowRate [l/min],power [on] [kW],power [off] [kW]
100,200,2,1
200,400,4,2
300,600,6,3
-
400,800,8,4
500,1000,10,5
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb
index 474e26515adf6bd19c8c076024299c7484b40cbc..94b9b277ec6f9e7307f39b42904504cc844dbebe 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb
@@ -4,7 +4,9 @@ Imports VectoAuxiliariesTests.Mocks
Namespace UnitTests
- <TestFixture()> Public Class AirCompressorTests
+ <TestFixture()>
+ <Category("Pnuematic - Compressor")>
+ Public Class AirCompressorTests
#Region "Test Constants"
Private Const GoodEfficiency As Single = 1
Private Const TooLowEfficiency As Single = 0.1
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
index 0f9f2e5aeb303ca7c22f67def4f44b43bb6e79bf..454e49556c16d0e43551f5366303209b25ac2943 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
@@ -7,6 +7,11 @@ Namespace UnitTests
<TestFixture()>
Public Class AlternatorMapTests
+ Private Const _GOODMAP As String = "TestFiles\testAlternatorMap.csv"
+ Private Const _INVALIDRPMMAP As String = "TestFiles\testAlternatorMapWithInvalidRpm.csv"
+ Private Const _IVALIDEFFICIENCYMAP As String = "TestFiles\testAlternatorMapWithInvalidEfficiency.csv"
+ Private Const _INVALIDPOWERMAP As String = "TestFiles\testAlternatorMapWithInvalidPower.csv"
+
<Test()>
Public Sub CreateNewAlternatorMapInstanceTest()
Dim path As String = "test"
@@ -46,21 +51,21 @@ Namespace UnitTests
<Test(), ExpectedException("System.InvalidCastException")>
Public Sub InitialiseInvalidRpmThrowsExceptionTest()
- Dim path As String = "C:\DEV\VECTO\VectoAuxiliaries\VectoAuxiliariesTests\TestFiles\testAlternatorMapWithInvalidRpm.csv"
+ Dim path As String = _INVALIDRPMMAP
Dim target As AlternatorMap = New AlternatorMap(path)
target.Initialise()
End Sub
<Test(), ExpectedException("System.InvalidCastException")>
Public Sub InitialiseInvalidEfficiencyThrowsExceptionTest()
- Dim path As String = "C:\DEV\VECTO\VectoAuxiliaries\VectoAuxiliariesTests\TestFiles\testAlternatorMapWithInvalidEfficiency.csv"
+ Dim path As String = _IVALIDEFFICIENCYMAP
Dim target As AlternatorMap = New AlternatorMap(path)
target.Initialise()
End Sub
<Test(), ExpectedException("System.InvalidCastException")>
Public Sub InitialiseInvalidPowerThrowsExceptionTest()
- Dim path As String = "C:\DEV\VECTO\VectoAuxiliaries\VectoAuxiliariesTests\TestFiles\testAlternatorMapWithInvalidPower.csv"
+ Dim path As String = _INVALIDPOWERMAP
Dim target As AlternatorMap = New AlternatorMap(path)
target.Initialise()
End Sub
@@ -138,7 +143,7 @@ Namespace UnitTests
End Function
Private Function GetMap() As AlternatorMap
- Dim path As String = "C:\DEV\VECTO\VectoAuxiliaries\VectoAuxiliariesTests\TestFiles\testAlternatorMap.csv"
+ Dim path As String = _GOODMAP
Dim target As AlternatorMap = New AlternatorMap(path)
Return target
End Function
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
index 2b9d1280e8f2a8900cc60d28d39b80ef1a3eaf97..d0f7beb0f6899a7f1bfc7ca1b28e83199afa13ae 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
@@ -6,6 +6,14 @@ Namespace UnitTests
<TestFixture()>
Public Class CompressorMapTests
+ Private Const GOODMAP As String = "TestFiles\testCompressorMap.csv"
+ Private Const INVALIDPOWERCOMPRESSORONMAP As String = "TestFiles\testCompressorMapInvalidOnPower.csv"
+ Private Const INVALIDPOWERCOMPRESSOROFFMAP As String = "TestFiles\testCompressorMapInvalidOffPower.csv"
+ Private Const INVALIDFLOWRATEMAP As String = "TestFiles\testCompressorMapInvalidFlow.csv"
+ Private Const INSSUFICIENTROWSMAP As String = "TestFiles\testCompressorMapNotEnoughRows.csv"
+ Private Const INVALIDRPMMAP As String = "TestFiles\testCompressorMapInvalidRpm.csv"
+
+
#Region "Helpers"
Private Function GetInitialiseMap() As CompressorMap
@@ -15,7 +23,7 @@ Namespace UnitTests
End Function
Private Function GetMap() As CompressorMap
- Dim path As String = "C:\DEV\VECTO\VectoAuxiliaries\VectoAuxiliariesTests\TestFiles\testCompressorMap.csv"
+ Dim path As String = GOODMAP
Dim target As CompressorMap = New CompressorMap(path)
Return target
End Function
@@ -51,35 +59,35 @@ Namespace UnitTests
<Test(), ExpectedException("System.InvalidCastException")>
Public Sub InitialisationInvalidRpmThrowsExceptionTest()
- Dim path As String = "C:\DEV\VECTO\VectoAuxiliaries\VectoAuxiliariesTests\TestFiles\testCompressorMapInvalidRpm.csv"
+ Dim path As String = INVALIDRPMMAP
Dim target As CompressorMap = New CompressorMap(path)
target.Initialise()
End Sub
<Test(), ExpectedException("System.InvalidCastException")>
Public Sub InitialisationInvalidFlowRateThrowsExceptionTest()
- Dim path As String = "C:\DEV\VECTO\VectoAuxiliaries\VectoAuxiliariesTests\TestFiles\testCompressorMapInvalidFlow.csv"
+ Dim path As String = INVALIDFLOWRATEMAP
Dim target As CompressorMap = New CompressorMap(path)
target.Initialise()
End Sub
<Test(), ExpectedException("System.InvalidCastException")>
Public Sub InitialisationInvalidPowerCompressorOnThrowsExceptionTest()
- Dim path As String = "C:\DEV\VECTO\VectoAuxiliaries\VectoAuxiliariesTests\TestFiles\testCompressorMapInvalidOnPower.csv"
+ Dim path As String = INVALIDPOWERCOMPRESSORONMAP
Dim target As CompressorMap = New CompressorMap(path)
target.Initialise()
End Sub
<Test(), ExpectedException("System.InvalidCastException")>
Public Sub InitialisationInvalidPowerCompressorOffThrowsExceptionTest()
- Dim path As String = "C:\DEV\VECTO\VectoAuxiliaries\VectoAuxiliariesTests\TestFiles\testCompressorMapInvalidOffPower.csv"
+ Dim path As String = INVALIDPOWERCOMPRESSOROFFMAP
Dim target As CompressorMap = New CompressorMap(path)
target.Initialise()
End Sub
<Test(), ExpectedException("System.ArgumentException")>
Public Sub InitialisationInsufficientRowsThrowsExceptionTest()
- Dim path As String = "C:\DEV\VECTO\VectoAuxiliaries\VectoAuxiliariesTests\TestFiles\testCompressorMapNotEnoughRows.csv"
+ Dim path As String = INSSUFICIENTROWSMAP
Dim target As CompressorMap = New CompressorMap(path)
target.Initialise()
End Sub
@@ -160,4 +168,5 @@ Namespace UnitTests
End Sub
End Class
+
End Namespace
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
index 99cf5a5de00702469d90fbae6ed73c877c55dd0d..99df40ff9a57659ad89906cb7de63eb3fd9d3436 100644
--- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
+++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
@@ -126,6 +126,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
+ <None Include="ClassDiagram1.cd" />
<None Include="My Project\Application.myapp">
<Generator>MyApplicationCodeGenerator</Generator>
<LastGenOutput>Application.Designer.vb</LastGenOutput>