This site uses cookies. Visit our cookies policy page or click the link in any footer for more information and to change your preferences.

Accept all cookies Accept only essential cookies

Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 1f6cc474 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

updating tests to use new c# implementation

parent 304740c6
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 173 additions and 90 deletions
VECTO.sln
+ 45
− 0
View file @ 1f6cc474
......@@ -75,6 +75,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VECTO-GIT", "VECTO-GIT", "{
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VECTO_GIT_TEST", "..\STUDENTEN_PROJEKTE\Kober_VectoGIT\VECTO_GIT\VECTO_GIT_TEST\VECTO_GIT_TEST.csproj", "{52430C51-892A-4D8E-9189-B6C9D09791C0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BusAuxiliaries", "VECTOAux\BusAuxiliaries\BusAuxiliaries.csproj", "{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug PerformanceStats|Any CPU = Debug PerformanceStats|Any CPU
......@@ -835,6 +837,48 @@ Global
{52430C51-892A-4D8E-9189-B6C9D09791C0}.ReleaseTUG|x64.Build.0 = Release|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.ReleaseTUG|x86.ActiveCfg = Release|Any CPU
{52430C51-892A-4D8E-9189-B6C9D09791C0}.ReleaseTUG|x86.Build.0 = Release|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Debug PerformanceStats|Any CPU.ActiveCfg = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Debug PerformanceStats|Any CPU.Build.0 = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Debug PerformanceStats|x64.ActiveCfg = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Debug PerformanceStats|x64.Build.0 = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Debug PerformanceStats|x86.ActiveCfg = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Debug PerformanceStats|x86.Build.0 = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Debug PerformanceTrace|Any CPU.ActiveCfg = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Debug PerformanceTrace|Any CPU.Build.0 = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Debug PerformanceTrace|x64.ActiveCfg = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Debug PerformanceTrace|x64.Build.0 = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Debug PerformanceTrace|x86.ActiveCfg = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Debug PerformanceTrace|x86.Build.0 = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Debug|x64.ActiveCfg = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Debug|x64.Build.0 = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Debug|x86.ActiveCfg = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Debug|x86.Build.0 = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.DebugTUG|Any CPU.ActiveCfg = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.DebugTUG|Any CPU.Build.0 = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.DebugTUG|x64.ActiveCfg = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.DebugTUG|x64.Build.0 = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.DebugTUG|x86.ActiveCfg = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.DebugTUG|x86.Build.0 = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Deploy|Any CPU.Build.0 = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Deploy|x64.ActiveCfg = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Deploy|x64.Build.0 = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Deploy|x86.ActiveCfg = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Deploy|x86.Build.0 = Debug|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Release|Any CPU.Build.0 = Release|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Release|x64.ActiveCfg = Release|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Release|x64.Build.0 = Release|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Release|x86.ActiveCfg = Release|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.Release|x86.Build.0 = Release|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.ReleaseTUG|Any CPU.ActiveCfg = Release|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.ReleaseTUG|Any CPU.Build.0 = Release|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.ReleaseTUG|x64.ActiveCfg = Release|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.ReleaseTUG|x64.Build.0 = Release|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.ReleaseTUG|x86.ActiveCfg = Release|Any CPU
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}.ReleaseTUG|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......@@ -860,5 +904,6 @@ Global
{A684BC49-C9B3-4C0C-8D2E-A13077853EDA} = {5DDEEEC2-743F-4395-B058-687B5773E3D2}
{C234077C-F81E-42FA-9367-1319753678A6} = {D29E62A2-CF08-469F-B29F-1B25DCB35386}
{52430C51-892A-4D8E-9189-B6C9D09791C0} = {5DDEEEC2-743F-4395-B058-687B5773E3D2}
{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D} = {B7C0A40B-E468-44DE-A784-7A5B8DAC1042}
EndGlobalSection
EndGlobal
VECTO/VECTO.vbproj
+ 4
− 0
View file @ 1f6cc474
......@@ -519,6 +519,10 @@
<WCFMetadata Include="Service References\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\VECTOAux\BusAuxiliaries\BusAuxiliaries.csproj">
<Project>{550d99d4-25f7-48d9-b0f0-e5dd6cb3485d}</Project>
<Name>BusAuxiliaries</Name>
</ProjectReference>
<ProjectReference Include="..\VectoCommon\AdvancedAuxiliaryInterfaces\AdvancedAuxiliaryInterfaces.vbproj">
<Project>{b4b9bd2f-fd8f-4bb8-82fa-e2154d2c7fbd}</Project>
<Name>AdvancedAuxiliaryInterfaces</Name>
......
VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
+ 8
− 4
View file @ 1f6cc474
......@@ -68,7 +68,7 @@ Namespace IntegrationTests
Dim engineFCMapFilePath = "TestFiles\Integration\24t Coach.vmap"
Dim auxFilePath = "TestFiles\Integration\AdvAuxTest.aaux"
Dim aux As AdvancedAuxiliaries = New AdvancedAuxiliaries
Dim aux As IAdvancedAuxiliaries = New AdvancedAuxiliaries
aux.VectoInputs.Cycle = "Coach"
aux.VectoInputs.VehicleWeightKG = 12000.SI(Of Kilogram)()
......@@ -84,7 +84,7 @@ Namespace IntegrationTests
aux.Signals.TotalCycleTimeSeconds = 15000
aux.Signals.EngineIdleSpeed = 560.RPMtoRad()
aux.Initialise(Path.GetFileName(auxFilePath), Path.GetDirectoryName(Path.GetFullPath(auxFilePath)) + "\")
CType(aux, AdvancedAuxiliaries).Initialise(Path.GetFileName(auxFilePath), Path.GetDirectoryName(Path.GetFullPath(auxFilePath)) + "\")
aux.Signals.ClutchEngaged = True
aux.Signals.EngineDrivelinePower = (driveLinePower * 1000).SI(Of Watt)() 'kW
......@@ -100,9 +100,10 @@ Namespace IntegrationTests
Dim msg As String = String.Empty
For i As Integer = 0 To 9
aux.ResetCalculations()
Assert.AreEqual(6087.0317, aux.AuxiliaryPowerAtCrankWatts().Value(), 0.001)
aux.CycleStep(1.SI(Of Second), msg)
Debug.Print("{0}", aux.AA_TotalCycleFC_Grams)
Console.WriteLine("{0}", aux.AA_TotalCycleFC_Grams)
Next
Assert.AreEqual(79.303.SI(Unit.SI.Gramm).Value(), aux.AA_TotalCycleFC_Grams().Value(), 0.0001)
......@@ -112,9 +113,10 @@ Namespace IntegrationTests
aux.Signals.InternalEnginePower = (-50 * 1000).SI(Of Watt)()
For i As Integer = 0 To 9
aux.ResetCalculations()
Assert.AreEqual(8954.1435, aux.AuxiliaryPowerAtCrankWatts().Value(), 0.001)
aux.CycleStep(1.SI(Of Second), msg)
Debug.Print("{0}", aux.AA_TotalCycleFC_Grams)
Console.WriteLine("{0}", aux.AA_TotalCycleFC_Grams)
Next
Assert.AreEqual(82.5783.SI(Unit.SI.Gramm).Value(), aux.AA_TotalCycleFC_Grams().Value(), 0.0001)
......@@ -124,8 +126,10 @@ Namespace IntegrationTests
aux.Signals.InternalEnginePower = (internalPower * 1000).SI(Of Watt)() 'kW
For i As Integer = 0 To 9
aux.ResetCalculations()
Assert.AreEqual(6087.0317, aux.AuxiliaryPowerAtCrankWatts().Value(), 0.001)
aux.CycleStep(1.SI(Of Second), msg)
Console.WriteLine("{0}", aux.AA_TotalCycleFC_Grams)
Next
Assert.AreEqual(162.4655.SI(Unit.SI.Gramm).Value(), aux.AA_TotalCycleFC_Grams().Value(), 0.0001)
......
VECTOAux/VectoAuxiliariesTests/UnitTests/AirCompressorTests.vb
+ 31
− 30
View file @ 1f6cc474
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
Imports VectoAuxiliaries.Pneumatics
Imports VectoAuxiliariesTests.Mocks
Imports VectoAuxiliaries
......@@ -40,56 +41,56 @@ Namespace UnitTests
Return New CompressorMapMock(True)
End Function
Private Function GetGoodCompressor() As M4_AirCompressor
Private Function GetGoodCompressor() As IM4_AirCompressor
Dim map As ICompressorMap = GetNonFailingCompressorMapMock()
Dim target As M4_AirCompressor = New M4_AirCompressor(map, GoodRatio, GoodEfficiency, _signals)
Dim target As IM4_AirCompressor = New M04Impl(map, GoodRatio, GoodEfficiency, _signals)
Return target
End Function
#End Region
<Test()>
<TestCase()>
Public Sub CreateNewJustPathTest()
Dim map As ICompressorMap = GetNonFailingCompressorMapMock()
_signals.EngineSpeed = 100.RPMtoRad()
Dim target As M4_AirCompressor = New M4_AirCompressor(map, 2, 0.8, _signals)
Dim target As IM4_AirCompressor = New M04Impl(map, 2, 0.8, _signals)
Assert.IsNotNull(target)
End Sub
<Test()>
<TestCase()>
Public Sub CreateNewAllParametersTest()
Dim map As ICompressorMap = GetNonFailingCompressorMapMock()
Dim target As M4_AirCompressor = New M4_AirCompressor(map, GoodRatio, GoodEfficiency, _signals)
Dim target As IM4_AirCompressor = New M04Impl(map, GoodRatio, GoodEfficiency, _signals)
Assert.IsNotNull(target)
End Sub
<Test()>
<TestCase()>
Public Sub InitialiseTest()
Dim map As ICompressorMap = GetNonFailingCompressorMapMock()
_signals.EngineSpeed = 100.RPMtoRad()
Dim target As M4_AirCompressor = New M4_AirCompressor(map, 2, 0.8, _signals)
Dim target As IM4_AirCompressor = New M04Impl(map, 2, 0.8, _signals)
Assert.IsTrue(target.Initialise())
End Sub
<Test()>
<TestCase()>
Public Sub InitialiseInvalidMapTest()
Dim map As ICompressorMap = GetFailingCompressorMapMock()
_signals.EngineSpeed = 100.RPMtoRad()
Dim target As M4_AirCompressor = New M4_AirCompressor(map, 2, 0.8, _signals)
Dim target As IM4_AirCompressor = New M04Impl(map, 2, 0.8, _signals)
Assert.That(Sub() target.Initialise(), Throws.InstanceOf(Of System.ArgumentException))
End Sub
<Test()>
<TestCase()>
Public Sub GetEfficiencyTest()
Dim comp As M4_AirCompressor = GetGoodCompressor()
Dim comp As IM4_AirCompressor = GetGoodCompressor()
Dim target = comp.PulleyGearEfficiency
Assert.AreEqual(target, GoodEfficiency)
End Sub
<Test()>
<TestCase()>
Public Sub SetEfficiencyTest()
Dim comp As M4_AirCompressor = GetGoodCompressor()
Dim comp As IM4_AirCompressor = GetGoodCompressor()
Dim target As Single = 0.3
comp.PulleyGearEfficiency = target
Dim actual As Single = comp.PulleyGearEfficiency
......@@ -99,22 +100,22 @@ Namespace UnitTests
<TestCase(TooLowEfficiency)>
<TestCase(TooHighEfficiency)>
Public Sub SetEfficiencyOutOfRangeTest(ByVal efficiency As Single)
Dim comp As M4_AirCompressor = GetGoodCompressor()
Dim comp As IM4_AirCompressor = GetGoodCompressor()
Assert.That(Sub() comp.PulleyGearEfficiency = efficiency, Throws.InstanceOf(Of ArgumentException))
End Sub
<Test()>
<TestCase()>
Public Sub GetRatioTest()
Dim comp As M4_AirCompressor = GetGoodCompressor()
Dim comp As IM4_AirCompressor = GetGoodCompressor()
Dim target = comp.PulleyGearRatio
Assert.AreEqual(target, GoodRatio)
End Sub
<Test()>
<TestCase()>
Public Sub SetRatioTest()
Dim comp As M4_AirCompressor = GetGoodCompressor()
Dim comp As IM4_AirCompressor = GetGoodCompressor()
Dim target As Single = 3
comp.PulleyGearRatio = target
Dim actual As Single = comp.PulleyGearRatio
......@@ -124,50 +125,50 @@ Namespace UnitTests
<TestCase(TooLowRatio)>
<TestCase(TooHighRatio)>
Public Sub SetRatioOutOfRangeTest(ByVal ratio As Single)
Dim comp As M4_AirCompressor = GetGoodCompressor()
Dim comp As IM4_AirCompressor = GetGoodCompressor()
Assert.That(Sub() comp.PulleyGearRatio = ratio, Throws.InstanceOf(Of ArgumentException))
End Sub
<Test()>
<TestCase()>
Public Sub GetCompressorFlowRateTest()
Dim comp As M4_AirCompressor = GetGoodCompressor()
Dim comp As IM4_AirCompressor = GetGoodCompressor()
Dim expected As Double = 0.0333333351
Dim actual = comp.GetFlowRate()
Assert.AreEqual(expected, actual.Value(), 0.00000001)
End Sub
<Test()>
<TestCase()>
Public Sub GetPowerCompressorOffTest()
Dim comp As M4_AirCompressor = GetGoodCompressor()
Dim comp As IM4_AirCompressor = GetGoodCompressor()
Dim expected As Double = 5.0
Dim actual = comp.GetPowerCompressorOff()
Assert.AreEqual(expected, actual.Value(), 0.00000001)
End Sub
<Test()>
<TestCase()>
Public Sub GetPowerCompressorOnTest()
Dim comp As M4_AirCompressor = GetGoodCompressor()
Dim comp As IM4_AirCompressor = GetGoodCompressor()
Dim expected As Double = 8.0
Dim actual = comp.GetPowerCompressorOn()
Assert.AreEqual(expected, actual.Value(), 0.00000001)
End Sub
<Test()>
<TestCase()>
Public Sub GetPowerDifferenceTest()
Dim comp As M4_AirCompressor = GetGoodCompressor()
Dim comp As IM4_AirCompressor = GetGoodCompressor()
Dim expected As Double = 3.0
Dim actual = comp.GetPowerDifference()
Assert.AreEqual(expected, actual.Value(), 0.00000001)
End Sub
<Test>
<TestCase>
Public Sub GetAveragePowerDemandPerCompressorUnitFlowRate()
Dim comp As M4_AirCompressor = GetGoodCompressor()
Dim comp As IM4_AirCompressor = GetGoodCompressor()
Dim expected As Single = 0.01
Dim actual As SI = comp.GetAveragePowerDemandPerCompressorUnitFlowRate
......
VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
+ 1
− 0
View file @ 1f6cc474
......@@ -2,6 +2,7 @@
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
Imports VectoAuxiliaries
Imports VectoAuxiliaries.DownstreamModules.Electrics
Namespace UnitTests
......
VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentComparisonTests.vb
+ 1
− 0
View file @ 1f6cc474
......@@ -3,6 +3,7 @@ Imports NUnit.Framework
Imports NUnit
Imports TUGraz.VectoCommon.Utils
Imports VectoAuxiliaries
Imports VectoAuxiliaries.DownstreamModules.Electrics
Imports VectoAuxiliaries.Electrics
Imports VectoAuxiliaries.Pneumatics
Imports VectoAuxiliaries.Hvac
......
VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
+ 20
− 14
View file @ 1f6cc474

Imports System.IO
Imports VectoAuxiliaries.Pneumatics
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
Imports VectoAuxiliariesTests.Mocks
Imports VectoAuxiliaries
......@@ -24,6 +26,10 @@ Namespace UnitTests
Private _defaultInputConfig As IPneumaticUserInputsConfig
Private _Signals As ISignals = New Signals
<OneTimeSetUp>
Sub RunBeforeAnyTests()
Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory)
end Sub
'Constructors
Public Sub New()
......@@ -51,7 +57,7 @@ Namespace UnitTests
End Sub
<Test>
<TestCase()>
Public Sub CreateNewtest()
Dim psUserInputsConfig = CType(New PneumaticUserInputsConfig(), IPneumaticUserInputsConfig)
......@@ -68,14 +74,14 @@ Namespace UnitTests
psCompressorMap.Initialise()
Dim _
target As _
New M3_AveragePneumaticLoadDemand(psUserInputsConfig, psAuxConfig, psActuationsMap, psCompressorMap,
New M03Impl(psUserInputsConfig, psAuxConfig, psActuationsMap, psCompressorMap,
_vehicleMassKG.SI(Of Kilogram), "Urban", _Signals)
Assert.IsNotNull(target)
End Sub
<Test()>
<TestCase()>
Public Sub AverageLoadValueUsingDefaultAuxValuesTest()
initialise()
......@@ -88,11 +94,11 @@ Namespace UnitTests
Dim _
target As _
New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
New M03Impl(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
_vehicleMassKG.SI(Of Kilogram), "Urban", _Signals)
Dim expected As Double = 7947.684
Dim actual As NormLiter = target.TotalAirDemand()
Dim actual As NormLiter = target.TotalAirDemand
Assert.AreEqual(expected, actual.Value(), 0.000001)
End Sub
......@@ -110,7 +116,7 @@ Namespace UnitTests
Dim _
target As _
New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
New M03Impl(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
_vehicleMassKG.SI(Of Kilogram), "Urban", _Signals)
Dim expected As Single = 5832.091
......@@ -135,7 +141,7 @@ Namespace UnitTests
Dim _
target As _
New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
New M03Impl(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
_vehicleMassKG.SI(Of Kilogram), "Urban", _Signals)
Dim expected As Single = 5832.091
......@@ -156,7 +162,7 @@ Namespace UnitTests
Dim _
target As _
New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
New M03Impl(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
_vehicleMassKG.SI(Of Kilogram), "Urban", _Signals)
Dim expected As Single = 7947.55127 / _Signals.TotalCycleTimeSeconds
......@@ -180,7 +186,7 @@ Namespace UnitTests
Dim _
target As _
New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
New M03Impl(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
_vehicleMassKG.SI(Of Kilogram), "Urban", _Signals)
Dim expected As Double = 8863.378 / _Signals.TotalCycleTimeSeconds
......@@ -204,7 +210,7 @@ Namespace UnitTests
Dim _
target As _
New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
New M03Impl(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
_vehicleMassKG.SI(Of Kilogram), "Urban", _Signals)
Dim expected As Double = 8541.45 / _Signals.TotalCycleTimeSeconds
......@@ -229,7 +235,7 @@ Namespace UnitTests
Dim _
target As _
New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
New M03Impl(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
_vehicleMassKG.SI(Of Kilogram), "Urban", _Signals)
Dim expected As Double = 8557.524 / _Signals.TotalCycleTimeSeconds
......@@ -253,7 +259,7 @@ Namespace UnitTests
Dim _
target As _
New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
New M03Impl(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
_vehicleMassKG.SI(Of Kilogram), "Urban", _Signals)
Dim expected As Double = 7947.68457 / _Signals.TotalCycleTimeSeconds
......@@ -277,7 +283,7 @@ Namespace UnitTests
Dim _
target As _
New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
New M03Impl(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
_vehicleMassKG.SI(Of Kilogram), "Urban", _Signals)
Dim expected As Double = 7947.68457 / _Signals.TotalCycleTimeSeconds
......@@ -301,7 +307,7 @@ Namespace UnitTests
Dim _
target As _
New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
New M03Impl(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap,
_vehicleMassKG.SI(Of Kilogram), "Urban", _Signals)
Dim expected As Double = 6880.88428 / _Signals.TotalCycleTimeSeconds
......
VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
+ 1
− 0
View file @ 1f6cc474
......@@ -7,6 +7,7 @@ Imports VectoAuxiliariesTests.Mocks
Imports VectoAuxiliaries
Imports VectoAuxiliaries.Hvac
Imports System.IO
Imports VectoAuxiliaries.DownstreamModules.Electrics
Namespace UnitTests
......
VECTOAux/VectoAuxiliariesTests/UnitTests/ElectricalConsumerTests.vb
+ 1
− 0
View file @ 1f6cc474
Imports VectoAuxiliaries.Electrics
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
Imports VectoAuxiliaries.DownstreamModules.Electrics
Namespace UnitTests
<TestFixture()>
......
VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
+ 5
− 3
View file @ 1f6cc474
......@@ -3,11 +3,13 @@ Imports VectoAuxiliaries.Hvac
Imports VectoAuxiliaries
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
Imports VectoAuxiliaries.DownstreamModules.Electrics
Namespace UnitTests
<TestFixture()>
Public Class M0_5_SmartAlternatorSetEfficiencyTests
Private target As M0_5_SmartAlternatorSetEfficiency
Private target As IM0_5_SmartAlternatorSetEfficiency
Private signals = New Signals
Public Sub New()
......@@ -45,7 +47,7 @@ Namespace UnitTests
Dim signals = New Signals()
signals.EngineSpeed = 2000.RPMtoRad()
Dim m0 As New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, alternatoMap, 26.3.SI(Of Volt), signals, ssm)
Dim m0 As New M00Impl(elecConsumers, alternatoMap, 26.3.SI(Of Volt), signals, ssm)
'Results Cards
Dim readings = New List(Of SmartResult)
......@@ -58,7 +60,7 @@ Namespace UnitTests
signals.EngineSpeed = 2000.RPMtoRad()
target = New M0_5_SmartAlternatorSetEfficiency(m0, elecConsumers, alternatoMap, idleResult, tractionResult,
target = New M0_5Impl(m0, elecConsumers, alternatoMap, idleResult, tractionResult,
overrunResult, signals)
End Sub
......
VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
+ 10
− 8
View file @ 1f6cc474
......@@ -6,6 +6,9 @@ Imports VectoAuxiliariesTests.Mocks
Imports VectoAuxiliaries.Electrics
Imports VectoAuxiliaries.Hvac
Imports System.IO
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
Imports VectoAuxiliaries.DownstreamModules.Electrics
Imports VectoAuxiliaries.DownstreamModules.HVAC
Namespace UnitTests
<TestFixture()>
......@@ -54,27 +57,26 @@ Namespace UnitTests
<Test()>
Public Sub CreateNewTest()
Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers,
alternatorMap, powernetVoltage, signals, GetSSM())
Dim target As IM0_NonSmart_AlternatorsSetEfficiency = New M00Impl(elecConsumers,alternatorMap, powernetVoltage, signals, GetSSM())
Assert.IsNotNull(target)
End Sub
<Test()>
Public Sub CreateNew_MissingElecConsumers_ThrowArgumentExceptionTest()
Dim target As M0_NonSmart_AlternatorsSetEfficiency
Assert.That(Sub() target = New M0_NonSmart_AlternatorsSetEfficiency(Nothing, alternatorMap, powernetVoltage, signals, GetSSM()), Throws.InstanceOf(Of ArgumentException))
Dim target As IM0_NonSmart_AlternatorsSetEfficiency
Assert.That(Sub() target = New M00Impl(Nothing, alternatorMap, powernetVoltage, signals, GetSSM()), Throws.InstanceOf(Of ArgumentException))
End Sub
<Test()>
Public Sub CreateNew_MissingAlternatorMap_ThrowArgumentExceptionTest()
Dim target As M0_NonSmart_AlternatorsSetEfficiency
Assert.That(Sub() target = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, Nothing, powernetVoltage, signals, GetSSM()), Throws.InstanceOf(Of ArgumentException))
Dim target As IM0_NonSmart_AlternatorsSetEfficiency
Assert.That(Sub() target = New M00Impl(elecConsumers, Nothing, powernetVoltage, signals, GetSSM()), Throws.InstanceOf(Of ArgumentException))
End Sub
<Test()>
Public Sub EfficiencyValueTest()
Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers,
Dim target As IM0_NonSmart_AlternatorsSetEfficiency = New M00Impl(elecConsumers,
alternatorMap, powernetVoltage, signals, GetSSM())
Dim actual As Single = target.AlternatorsEfficiency
......@@ -87,7 +89,7 @@ Namespace UnitTests
<Test()>
Public Sub HVAC_PowerDemandAmpsTest()
Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers,
Dim target As IM0_NonSmart_AlternatorsSetEfficiency = New M00Impl(elecConsumers,
alternatorMap, powernetVoltage, signals, GetSSM())
Dim actual As Ampere
......
VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb
+ 4
− 3
View file @ 1f6cc474
......@@ -6,6 +6,7 @@ Imports NUnit.Framework
Imports VectoAuxiliaries
Imports Moq
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
Namespace UnitTests
<TestFixture()>
......@@ -28,7 +29,7 @@ Namespace UnitTests
m9.Setup(Function(x) x.TotalCycleFuelConsumptionCompressorOffContinuously).Returns((y3 / 1000).SI(Of Kilogram))
Dim target As IM10 = New M10(m3.Object, m9.Object, signals)
Dim target As IM10 = New M10Impl(m3.Object, m9.Object, signals)
target.CycleStep(1.SI(Of Second))
......
VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
+ 3
− 2
View file @ 1f6cc474
......@@ -6,6 +6,7 @@ Imports NUnit.Framework
Imports VectoAuxiliaries
Imports Moq
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
Namespace UnitTests
<TestFixture()>
......@@ -53,7 +54,7 @@ Namespace UnitTests
'Act
Dim target = New M11(m1Mock.Object, m3Mock.Object, m6Mock.Object, m8Mock.Object, fmap, sgnlsMock.Object) _
Dim target = New M11Impl(m1Mock.Object, m3Mock.Object, m6Mock.Object, m8Mock.Object, fmap, sgnlsMock.Object) _
',m3Mock.Object,m6Mock.Object,m8Mock.Object,fmap,sgnlsMock.Object)
'Add Current Calculation to Internal Aggregates ( Accesseed by public output properties which are external interface )
......@@ -109,7 +110,7 @@ Namespace UnitTests
'Act
Dim target = New M11(m1Mock.Object, m3Mock.Object, m6Mock.Object, m8Mock.Object, fmap, sgnlsMock.Object) _
Dim target = New M11Impl(m1Mock.Object, m3Mock.Object, m6Mock.Object, m8Mock.Object, fmap, sgnlsMock.Object) _
',m3Mock.Object,m6Mock.Object,m8Mock.Object,fmap,sgnlsMock.Object)
......
VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
+ 2
− 1
View file @ 1f6cc474
......@@ -6,6 +6,7 @@ Imports NUnit.Framework
Imports VectoAuxiliaries
Imports Moq
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
Namespace UnitTests
<TestFixture()>
......@@ -39,7 +40,7 @@ Namespace UnitTests
M10Mock.Setup(Function(x) x.AverageLoadsFuelConsumptionInterpolatedForPneumatics).Returns((IP7 / 1000).SI(Of Kilogram))
'Act
Dim target = New M12(M10Mock.Object, m11Mock.Object, sgnlsMock.Object)
Dim target = New M12Impl(M10Mock.Object, m11Mock.Object, sgnlsMock.Object)
'Assert
Assert.AreEqual(target.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand().Value(),
......
VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
+ 2
− 1
View file @ 1f6cc474
......@@ -6,6 +6,7 @@ Imports NUnit.Framework
Imports VectoAuxiliaries
Imports Moq
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
Namespace UnitTests
......@@ -53,7 +54,7 @@ Namespace UnitTests
Signals.Setup(Function(x) x.CurrentCycleTimeInSeconds).Returns(3114)
'Act
Dim target = New M13(m10.Object, m11.Object, m12.Object, Signals.Object)
Dim target = New M13Impl(m10.Object, m11.Object, m12.Object, Signals.Object)
'Assert
Assert.AreEqual(OUT1.SI(Unit.SI.Gramm).Value(), target.WHTCTotalCycleFuelConsumptionGrams.Value(), 0.001)
......
VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
+ 3
− 1
View file @ 1f6cc474
......@@ -6,6 +6,8 @@ Imports NUnit.Framework
Imports VectoAuxiliaries
Imports Moq
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
Imports VectoAuxiliaries.DownstreamModules.HVAC
Namespace UnitTests
......@@ -115,7 +117,7 @@ Namespace UnitTests
'Act
Dim m14 As New M14(m13.Object, ssmMock, constants, signals.Object)
Dim m14 As New M14Impl(m13.Object, ssmMock, constants, signals.Object)
'Assert
Assert.AreEqual(expectedOut1.SI(Unit.SI.Gramm).Value(), m14.TotalCycleFCGrams.Value(), 0.1)
......
VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
+ 4
− 3
View file @ 1f6cc474
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
Imports VectoAuxiliaries
Imports VectoAuxiliaries.DownstreamModules.Electrics
Imports VectoAuxiliaries.Electrics
Imports VectoAuxiliaries.Pneumatics
Imports VectoAuxiliaries.Hvac
......@@ -30,7 +32,7 @@ Namespace UnitTests
ssm.Load(_SSMMAP)
m0 = New M0_NonSmart_AlternatorsSetEfficiency(New ElectricalConsumerList(powernetVoltage, 0.096, True),
m0 = New M00Impl(New ElectricalConsumerList(powernetVoltage, 0.096, True),
alternatorMap, powernetVoltage.SI(Of Volt), signals, ssm)
End Sub
......@@ -38,8 +40,7 @@ Namespace UnitTests
ssm.Load(_SSMMAP)
Return New M1_AverageHVACLoadDemand(m0,
alternatorGearEfficiency,
Return New M01Impl(m0, alternatorGearEfficiency,
compressorGrearEfficiency,
powernetVoltage.SI(Of Volt),
signals,
......
VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
+ 9
− 6
View file @ 1f6cc474
......@@ -2,8 +2,11 @@
Imports VectoAuxiliaries.Hvac
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
Imports VectoAuxiliariesTests.Mocks
Imports VectoAuxiliaries
Imports VectoAuxiliaries.DownstreamModules.Electrics
Imports VectoAuxiliaries.DownstreamModules.HVAC
Namespace UnitTests
<TestFixture()>
......@@ -31,7 +34,7 @@ Namespace UnitTests
#Region "Helpers"
Private Function GetAverageElectricalDemandInstance() As M2_AverageElectricalLoadDemand
Private Function GetAverageElectricalDemandInstance() As IM2_AverageElectricalLoadDemand
signals.EngineSpeed = 2000.RPMtoRad()
......@@ -41,19 +44,19 @@ Namespace UnitTests
Dim altMap As IAlternatorMap = CType(New AlternatorMap("testfiles\testAlternatorMap.aalt"), IAlternatorMap)
altMap.Initialise()
Dim m0 As New M0_NonSmart_AlternatorsSetEfficiency(consumers, altMap, 26.3.SI(Of Volt), signals, GetSSM())
Dim m0 As New M00Impl(consumers, altMap, 26.3.SI(Of Volt), signals, GetSSM())
'Get Consumers.
Return New M2_AverageElectricalLoadDemand(consumers, m0, 0.8, 26.3.SI(Of Volt), signals)
Return New M02Impl(consumers, m0, 0.8, 26.3.SI(Of Volt), signals)
End Function
#End Region
<Test()>
Public Sub NewTest()
Dim target As M2_AverageElectricalLoadDemand = GetAverageElectricalDemandInstance()
Dim target As IM2_AverageElectricalLoadDemand = GetAverageElectricalDemandInstance()
Assert.IsNotNull(target)
End Sub
......@@ -63,14 +66,14 @@ Namespace UnitTests
Dim expected As Single = 1594.61572
Dim target As M2_AverageElectricalLoadDemand = GetAverageElectricalDemandInstance()
Dim target As IM2_AverageElectricalLoadDemand = GetAverageElectricalDemandInstance()
Dim actual As Watt = target.GetAveragePowerDemandAtAlternator()
Assert.AreEqual(expected, actual.Value(), 0.001)
End Sub
<Test()>
Public Sub GetAveragePowerAtCrankTest()
Dim target As M2_AverageElectricalLoadDemand = GetAverageElectricalDemandInstance()
Dim target As IM2_AverageElectricalLoadDemand = GetAverageElectricalDemandInstance()
Dim expected As Single = 10914.6543
Dim actual As Watt = target.GetAveragePowerAtCrankFromElectrics()
Assert.AreEqual(expected, actual.Value(), 0.001)
......
VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
+ 15
− 12
View file @ 1f6cc474
Imports NUnit.Framework
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
Imports VectoAuxiliaries.Pneumatics
Imports VectoAuxiliariesTests.Mocks
Imports VectoAuxiliaries.Electrics
Imports VectoAuxiliaries.Hvac
Imports VectoAuxiliaries
Imports VectoAuxiliaries.DownstreamModules.Electrics
Imports VectoAuxiliaries.DownstreamModules.HVAC
Namespace UnitTests
<TestFixture()>
......@@ -17,8 +20,8 @@ Namespace UnitTests
Private Const _altGearPullyEfficiency As Single = 0.8
'Private fields
Private _m05 As M0_5_SmartAlternatorSetEfficiency
Private _target As M5__SmartAlternatorSetGeneration
Private _m05 As IM0_5_SmartAlternatorSetEfficiency
Private _target As IM5_SmartAlternatorSetGeneration
Private _signals As ISignals = New Signals
Private ssmHVac As IHVACSteadyStateModel = New HVACSteadyStateModel(100, 100, 100)
......@@ -48,7 +51,7 @@ Namespace UnitTests
alternatoMap.Initialise()
Dim _
m0 As _
New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, alternatoMap, _powerNetVoltage.SI(Of Volt), _signals,
New M00Impl(elecConsumers, alternatoMap, _powerNetVoltage.SI(Of Volt), _signals,
GetSSM())
'Results Cards
......@@ -63,45 +66,45 @@ Namespace UnitTests
Dim signals As ISignals = New Signals
signals.EngineSpeed = 2000.RPMtoRad()
_m05 = New M0_5_SmartAlternatorSetEfficiency(m0, elecConsumers, alternatoMap, idleResult, tractionResult,
_m05 = New M0_5Impl(m0, elecConsumers, alternatoMap, idleResult, tractionResult,
overrunResult, signals)
End Sub
<Test()>
<TestCase()>
Public Sub CreateNewTest()
Initialise()
_target = New M5__SmartAlternatorSetGeneration(_m05, _powerNetVoltage.SI(Of Volt), _altGearPullyEfficiency)
_target = New M05Impl(_m05, _powerNetVoltage.SI(Of Volt), _altGearPullyEfficiency)
Assert.IsNotNull(_target)
End Sub
<Test()>
<TestCase()>
Public Sub PowerAtCrankIdleWatts()
Initialise()
_target = New M5__SmartAlternatorSetGeneration(_m05, _powerNetVoltage.SI(Of Volt), _altGearPullyEfficiency)
_target = New M05Impl(_m05, _powerNetVoltage.SI(Of Volt), _altGearPullyEfficiency)
Dim expected As Single = 1641.35791
Dim actual As Watt = _target.AlternatorsGenerationPowerAtCrankIdleWatts()
Assert.AreEqual(expected, actual.Value(), 0.001)
End Sub
<Test()>
<TestCase()>
Public Sub PowerAtCrankTractionWatts()
Initialise()
_target = New M5__SmartAlternatorSetGeneration(_m05, _powerNetVoltage.SI(Of Volt), _altGearPullyEfficiency)
_target = New M05Impl(_m05, _powerNetVoltage.SI(Of Volt), _altGearPullyEfficiency)
Dim expected As Single = 1641.35791
Dim actual As Watt = _target.AlternatorsGenerationPowerAtCrankTractionOnWatts()
Assert.AreEqual(expected, actual.Value(), 0.001)
End Sub
<Test()>
<TestCase()>
Public Sub PowerAtCrankOverrunWatts()
Initialise()
_target = New M5__SmartAlternatorSetGeneration(_m05, _powerNetVoltage.SI(Of Volt), _altGearPullyEfficiency)
_target = New M05Impl(_m05, _powerNetVoltage.SI(Of Volt), _altGearPullyEfficiency)
Dim expected As Single = 1641.35791F
Dim actual As Watt = _target.AlternatorsGenerationPowerAtCrankOverrunWatts()
......
VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
+ 4
− 2
View file @ 1f6cc474
......@@ -6,6 +6,8 @@ Imports NUnit.Framework
Imports VectoAuxiliaries
Imports Moq
Imports TUGraz.VectoCommon.Utils
Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
Namespace UnitTests
<TestFixture()>
......@@ -25,7 +27,7 @@ Namespace UnitTests
M4 = New M4_Mock(100, 2, 200, 100, 100)
M5 = New M5_Mock(200, 50, 80)
Return New M6(M1, M2, M3, M4, M5, Signals)
Return New M06Impl(M1, M2, M3, M4, M5, Signals)
End Function
Public Sub New()
......@@ -103,7 +105,7 @@ Namespace UnitTests
signals.SmartElectrics = SM
Dim target As New M6(M1, M2, M3, M4, M5, signals)
Dim target As New M06Impl(M1, M2, M3, M4, M5, signals)
Assert.AreEqual(OUT1, target.OverrunFlag)
Assert.AreEqual(OUT2, target.SmartElecAndPneumaticsCompressorFlag)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about