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 92c68b5c authored by Harald Martini's avatar Harald Martini
Browse files

Merge branch 'amdm2/develop' into amdm2/bug/34-retrycount-exceeded

parents a655663d 94820b48
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 132 additions and 126 deletions
Tools/GraphDrawer/GraphDrawer.csproj
+ 1
− 1
View file @ 92c68b5c
......@@ -3,7 +3,7 @@
<OutputType>Exe</OutputType>
<RootNamespace>GraphDrawer</RootNamespace>
<AssemblyName>GraphDrawer</AssemblyName>
<TargetFrameworks>net6.0-windows</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<DefineConstants />
</PropertyGroup>
......
VECTOAux/VectoAuxiliariesTests/IntegrationTests/AuxDemandTest.vb
+ 6
− 6
View file @ 92c68b5c
......@@ -22,8 +22,8 @@ Namespace IntegrationTests
<TestCase(15700, 1319, -35.79263, -144.0441, 9093.9511)>
Public Sub AuxDemandTest(vehicleWeight As Double, engineSpeed As Double, driveLinePower As Double,
internalPower As Double, expectedPowerDemand As Double)
Dim engineFCMapFilePath = "TestFiles\Integration\24t Coach.vmap"
Dim auxFilePath = "TestFiles\Integration\AdvAuxTest.aaux"
Dim engineFCMapFilePath = "TestFiles/Integration/24t Coach.vmap"
Dim auxFilePath = "TestFiles/Integration/AdvAuxTest.aaux"
Dim aux As BusAuxiliaries = New BusAuxiliaries(new NoBattery(Nothing))
......@@ -40,7 +40,7 @@ Namespace IntegrationTests
dim auxConfig = BusAuxiliaryInputData.ReadBusAuxiliaries(auxFilePath, Utils.GetDefaultVehicleData(vehicleWeight.SI(Of Kilogram)))
aux.Initialise(auxConfig) ', Path.GetDirectoryName(Path.GetFullPath(auxFilePath)) + "\")
aux.Initialise(auxConfig) ', Path.GetDirectoryName(Path.GetFullPath(auxFilePath)) + "/")
aux.Signals.ClutchEngaged = True
'aux.Signals.EngineDrivelinePower = (driveLinePower * 1000).SI(Of Watt)() 'kW
......@@ -72,8 +72,8 @@ Namespace IntegrationTests
Dim engineSpeed As Double = 1256
Dim engineFCMapFilePath = "TestFiles\Integration\24t Coach.vmap"
Dim auxFilePath = "TestFiles\Integration\AdvAuxTest.aaux"
Dim engineFCMapFilePath = "TestFiles/Integration/24t Coach.vmap"
Dim auxFilePath = "TestFiles/Integration/AdvAuxTest.aaux"
Dim aux As BusAuxiliaries = New BusAuxiliaries(New NoBattery(Nothing))
......@@ -91,7 +91,7 @@ Namespace IntegrationTests
Dim auxCfg = BusAuxiliaryInputData.ReadBusAuxiliaries(auxFilePath, Utils.GetDefaultVehicleData(12000.SI(Of Kilogram)()))
'CType(auxCfg, AuxiliaryConfig).FuelMap = fuelMap
CType(aux, BusAuxiliaries).Initialise(auxCfg) ', Path.GetDirectoryName(Path.GetFullPath(auxFilePath)) + "\")
CType(aux, BusAuxiliaries).Initialise(auxCfg) ', Path.GetDirectoryName(Path.GetFullPath(auxFilePath)) + "/")
aux.Signals.ClutchEngaged = True
'aux.Signals.EngineDrivelinePower = (driveLinePower * 1000).SI(Of Watt)() 'kW
......
VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
+ 9
− 9
View file @ 92c68b5c
......@@ -8,15 +8,15 @@ Imports TUGraz.VectoCore.InputData.Reader.ComponentData
Namespace UnitTests
<TestFixture()>
Public Class AlternatorMapTests
Private Const _GOODMAP As String = "TestFiles\testAlternatorMap.aalt"
Private Const _GOODMAPORIGINALSINGLEMAP As String = "TestFiles\testAlternatorMapOriginalSingleMap.aalt"
Private Const _INVALIDRPMMAP As String = "TestFiles\testAlternatorMapWithInvalidRpm.aalt"
Private Const _INVALIDAMPSMAP As String = "TestFiles\testAlternatorMapWithInvalidAmps.aalt"
Private Const _IVALIDEFFICIENCYMAP As String = "TestFiles\testAlternatorMapWithInvalidEfficiency.aalt"
Private Const _INVALIDPOWERMAP As String = "TestFiles\testAlternatorMapWithInvalidPower.aalt"
Private Const _GOODCOMBINEDMAP As String = "TestFiles\testAlternatorMapCombined.aalt"
Private Const _ASYMETRICALCOMBINEDROWSMAP As String = "TestFiles\testAlternatorMapAsymetricalRowsCombined.aalt"
Private Const _ASYMETRICALCOMBINEDXYPAIRSMAP As String = "TestFiles\testAlternatorMapAsymetricalXYPairsCombined.aalt"
Private Const _GOODMAP As String = "TestFiles/testAlternatorMap.aalt"
Private Const _GOODMAPORIGINALSINGLEMAP As String = "TestFiles/testAlternatorMapOriginalSingleMap.aalt"
Private Const _INVALIDRPMMAP As String = "TestFiles/testAlternatorMapWithInvalidRpm.aalt"
Private Const _INVALIDAMPSMAP As String = "TestFiles/testAlternatorMapWithInvalidAmps.aalt"
Private Const _IVALIDEFFICIENCYMAP As String = "TestFiles/testAlternatorMapWithInvalidEfficiency.aalt"
Private Const _INVALIDPOWERMAP As String = "TestFiles/testAlternatorMapWithInvalidPower.aalt"
Private Const _GOODCOMBINEDMAP As String = "TestFiles/testAlternatorMapCombined.aalt"
Private Const _ASYMETRICALCOMBINEDROWSMAP As String = "TestFiles/testAlternatorMapAsymetricalRowsCombined.aalt"
Private Const _ASYMETRICALCOMBINEDXYPAIRSMAP As String = "TestFiles/testAlternatorMapAsymetricalXYPairsCombined.aalt"
<OneTimeSetUp>
Sub RunBeforeAnyTests()
......
VECTOAux/VectoAuxiliariesTests/UnitTests/AuxiliaryEnvironmentPersistanceTests.vb
+ 4
− 4
View file @ 92c68b5c
......@@ -18,7 +18,7 @@ Namespace UnitTests
Public Sub SaveDefaultFile()
dim auxDefault = AuxiliaryComparisonTests.GetDefaultAuxiliaryConfig() ' New AuxiliaryConfig("")
BusAuxWriter.SaveAuxConfig(auxDefault, "TestFiles\auxiliaryConfigKEEP.json")
BusAuxWriter.SaveAuxConfig(auxDefault, "TestFiles/auxiliaryConfigKEEP.json")
End Sub
<OneTimeSetUp>
......@@ -38,8 +38,8 @@ Namespace UnitTests
'Act
SaveDefaultFile()
BusAuxiliaryInputData.ReadBusAuxiliaries("TestFiles\auxiliaryConfigKEEP.json", utils.GetDefaultVehicleData())
'actual=auxEmpty.Load("TestFiles\auxiliaryConfigKEEP.json")
BusAuxiliaryInputData.ReadBusAuxiliaries("TestFiles/auxiliaryConfigKEEP.json", utils.GetDefaultVehicleData())
'actual=auxEmpty.Load("TestFiles/auxiliaryConfigKEEP.json")
Assert.AreEqual(auxDefault, auxEmpty)
End Sub
......@@ -76,7 +76,7 @@ Namespace UnitTests
'Act
SaveDefaultFile()
auxDefault = BusAuxiliaryInputData.ReadBusAuxiliaries("TestFiles\auxiliaryConfigKEEP.json",
auxDefault = BusAuxiliaryInputData.ReadBusAuxiliaries("TestFiles/auxiliaryConfigKEEP.json",
Utils.GetDefaultVehicleData())
Dim areEqual = auxTest.ConfigValuesAreTheSameAs(auxDefault)
'Assert
......
VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
+ 2
− 2
View file @ 92c68b5c
......@@ -26,8 +26,8 @@ Namespace UnitTests
Private _cycleDurationMinutes As Single = 51.9
Private _totalAirDemand As Single
Private _actuationsMapPath As String = "Testfiles\testPneumaticActuationsMap_GOODMAP.apac"
Private _compressorMapPath As String = "Testfiles\testCompressorMap.acmp"
Private _actuationsMapPath As String = "TestFiles/testPneumaticActuationsMap_GOODMAP.apac"
Private _compressorMapPath As String = "TestFiles/testCompressorMap.acmp"
Private _defaultInputConfig As PneumaticUserInputsConfig
Private _Signals As ISignals = New Signals
......
VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
+ 1
− 1
View file @ 92c68b5c
......@@ -28,7 +28,7 @@ Namespace UnitTests
Private Const COMBINEDALT_GOODMAP = "testfiles\testCombinedAlternatorMap.aalt"
Private Const COMBINEDALT_GOODMAP = "TestFiles/testCombinedAlternatorMap.aalt"
Sub New()
......
VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
+ 7
− 7
View file @ 92c68b5c
......@@ -9,13 +9,13 @@ Imports TUGraz.VectoCore.InputData.Reader.ComponentData
Namespace UnitTests
<TestFixture()>
Public Class CompressorMapTests
Private Const GOODMAP As String = "TestFiles\testCompressorMap.acmp"
Private Const INVALIDPOWERCOMPRESSORONMAP As String = "TestFiles\testCompressorMapInvalidOnPower.acmp"
Private Const INVALIDPOWERCOMPRESSOROFFMAP As String = "TestFiles\testCompressorMapInvalidOffPower.acmp"
Private Const INVALIDFLOWRATEMAP As String = "TestFiles\testCompressorMapInvalidFlow.acmp"
Private Const INSSUFICIENTROWSMAP As String = "TestFiles\testCompressorMapNotEnoughRows.acmp"
Private Const INVALIDRPMMAP As String = "TestFiles\testCompressorMapInvalidRpm.acmp"
Private Const INVALIDNUMBEROFCOLUMNS As String = "TestFiles\testCompressorMapWrongNumberOfColumns.acmp"
Private Const GOODMAP As String = "TestFiles/testCompressorMap.acmp"
Private Const INVALIDPOWERCOMPRESSORONMAP As String = "TestFiles/testCompressorMapInvalidOnPower.acmp"
Private Const INVALIDPOWERCOMPRESSOROFFMAP As String = "TestFiles/testCompressorMapInvalidOffPower.acmp"
Private Const INVALIDFLOWRATEMAP As String = "TestFiles/testCompressorMapInvalidFlow.acmp"
Private Const INSSUFICIENTROWSMAP As String = "TestFiles/testCompressorMapNotEnoughRows.acmp"
Private Const INVALIDRPMMAP As String = "TestFiles/testCompressorMapInvalidRpm.acmp"
Private Const INVALIDNUMBEROFCOLUMNS As String = "TestFiles/testCompressorMapWrongNumberOfColumns.acmp"
#Region "Helpers"
......
VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
+ 3
− 3
View file @ 92c68b5c
......@@ -32,8 +32,8 @@ Namespace UnitTests
Private Function GetSSM() As ISSMTOOL
Const _SSMMAP As String = "TestFiles\ssm.Ahsm"
'Const _BusDatabase As String ="TestFiles\BusDatabase.abdb
Const _SSMMAP As String = "TestFiles/ssm.Ahsm"
'Const _BusDatabase As String ="TestFiles/BusDatabase.abdb
dim ssmInput As ISSMDeclarationInputs = SSMInputData.ReadFile(_SSMMAP, utils.GetDefaultVehicleData(), Nothing)
'CType(CType(ssmInput, SSMInputs).Vehicle, VehicleData).Height = 0.SI (Of Meter)
......@@ -55,7 +55,7 @@ Namespace UnitTests
signals.EngineSpeed = 2000.RPMtoRad()
Dim auxConfig = Utils.GetAuxTestConfig()
'Dim hvacMap As New HVACMap("testFiles\TestHvacMap.csv")
'Dim hvacMap As New HVACMap("testFiles/TestHvacMap.csv")
'hvacMap.Initialise()
CType(auxConfig.ElectricalUserInputsConfig, ElectricsUserInputsConfig).PowerNetVoltage = 26.3.SI (Of Volt)
Dim m0 As New M00Impl(auxConfig.ElectricalUserInputsConfig, signals, ssm.ElectricalWAdjusted)
......
VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
+ 4
− 4
View file @ 92c68b5c
......@@ -12,9 +12,9 @@ Imports Signals = TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.Signals
Namespace UnitTests
<TestFixture()>
Public Class M0_NonSmart_AlternatorsSetEfficiencyTests
Private Const cstrAlternatorsEfficiencyMapLocation As String = "tests\testAlternatorMap.aalt"
Private Const cstrHVACMapLocation As String = "TestFiles\TestHvacMap.csv"
Private Const cstrAlternatorMap As String = "TestFiles\testAlternatorMap.aalt"
Private Const cstrAlternatorsEfficiencyMapLocation As String = "tests/testAlternatorMap.aalt"
Private Const cstrHVACMapLocation As String = "TestFiles/TestHvacMap.csv"
Private Const cstrAlternatorMap As String = "TestFiles/testAlternatorMap.aalt"
'Private elecConsumers As IElectricalConsumerList
......@@ -24,7 +24,7 @@ Namespace UnitTests
Private Function GetSSM() As ISSMTOOL
Const _SSMMAP As String = "TestFiles\ssm.Ahsm"
Const _SSMMAP As String = "TestFiles/ssm.Ahsm"
Dim auxconfig = Utils.GetAuxTestConfig()
......
VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
+ 3
− 3
View file @ 92c68b5c
......@@ -15,9 +15,9 @@ Imports TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.HVAC
Namespace UnitTests
<TestFixture()>
Public Class M1_AverageHVACLoadDemandTests
Private Const _GOODMAP As String = "TestFiles\testAlternatorMap.aalt"
Private Const _SSMMAP As String = "TestFiles\ssm.Ahsm"
Private Const _BusDatabase As String = "TestFiles\BusDatabase.abdb"
Private Const _GOODMAP As String = "TestFiles/testAlternatorMap.aalt"
Private Const _SSMMAP As String = "TestFiles/ssm.Ahsm"
Private Const _BusDatabase As String = "TestFiles/BusDatabase.abdb"
Private signals As ISignals = New Signals With {.EngineSpeed = 2000.RPMtoRad()}
Private powernetVoltage As Volt = 26.3.SI (of Volt)
......
VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
+ 5
− 5
View file @ 92c68b5c
......@@ -24,8 +24,8 @@ Namespace UnitTests
Private Function GetSSM() As ISSMTOOL
Const _SSMMAP As String = "TestFiles\ssm.Ahsm"
'Const _BusDatabase As String ="TestFiles\BusDatabase.abdb
Const _SSMMAP As String = "TestFiles/ssm.Ahsm"
'Const _BusDatabase As String ="TestFiles/BusDatabase.abdb
Dim ssm As ISSMTOOL = New SSMTOOL(SSMInputData.ReadFile(_SSMMAP, Utils.GetDefaultVehicleData(), Nothing))
'CType(CType(ssm.SSMInputs, SSMInputs).Vehicle, VehicleData).Height = 0.SI(of Meter)
......@@ -50,7 +50,7 @@ Namespace UnitTests
Dim auxConfig = Utils.GetAuxTestConfig()
'CType(CType(auxConfig.SSMInputs, SSMInputs).Vehicle, VehicleData).Height = 0.SI(of Meter)
Dim altMap As IAlternatorMap = AlternatorReader.ReadMap( "testfiles\testAlternatorMap.aalt")
Dim altMap As IAlternatorMap = AlternatorReader.ReadMap("TestFiles/testAlternatorMap.aalt")
'altMap.Initialise()
CType(auxConfig.ElectricalUserInputsConfig, ElectricsUserInputsConfig).PowerNetVoltage = 26.3.SI(Of Volt)
CType(auxConfig.ElectricalUserInputsConfig, ElectricsUserInputsConfig).AlternatorMap =altMap
......
VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
+ 4
− 4
View file @ 92c68b5c
......@@ -16,8 +16,8 @@ Namespace UnitTests
Public Class M5_SmartAlternatorSetGenerationTests
'Constants
Private Shared ReadOnly _powerNetVoltage As Volt = 26.3.SI(of Volt)
Private Const _hvacMap As String = "testFiles\TestHvacMap.csv"
Private Const _altMap As String = "testFiles\testAlternatormap.aalt"
Private Const _hvacMap As String = "TestFiles/TestHvacMap.csv"
Private Const _altMap As String = "TestFiles/testAlternatorMap.aalt"
Private Const _rpm As Integer = 2000
Private Const _altGearPullyEfficiency As Single = 0.8
......@@ -35,8 +35,8 @@ Namespace UnitTests
Private Function GetSSM() As ISSMTOOL
Const _SSMMAP As String = "TestFiles\ssm.Ahsm"
'Const _BusDatabase As String ="TestFiles\BusDatabase.abdb
Const _SSMMAP As String = "TestFiles/ssm.Ahsm"
'Const _BusDatabase As String ="TestFiles/BusDatabase.abdb
Dim auxConfig = Utils.GetAuxTestConfig()
......
VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb
+ 6
− 6
View file @ 92c68b5c
......@@ -8,27 +8,27 @@ Namespace Pneumatics
<TestFixture()>
Public Class PneumaticActuationsMapTests
Public _
Const cstrPneumaticActuationsMapPath_GOODMAP As String = "TestFiles\testPneumaticActuationsMap_GOODMAP.apac"
Const cstrPneumaticActuationsMapPath_GOODMAP As String = "TestFiles/testPneumaticActuationsMap_GOODMAP.apac"
Public _
Const cstrPneumaticActuationsMapPath_INCORRECTCOLUMNS As String =
"TestFiles\testPneumaticActuationsMap_INCORRECTCOLUMNS.apac"
"TestFiles/testPneumaticActuationsMap_INCORRECTCOLUMNS.apac"
Public _
Const cstrPneumaticActuationsMapPath_INVALIDINTEGERVALUE As String =
"TestFiles\testPneumaticActuationsMap_INVALIDINTEGERVALUE.apac"
"TestFiles/testPneumaticActuationsMap_INVALIDINTEGERVALUE.apac"
Public _
Const cstrPneumaticActuationsMapPath_DUPLICATEKEY As String =
"TestFiles\testPneumaticActuationsMap_DUPLICATEKEY.apac"
"TestFiles/testPneumaticActuationsMap_DUPLICATEKEY.apac"
Public _
Const cstrPneumaticActuationsMapPath_INVALIDCONSUMERNAME As String =
"TestFiles\testPneumaticActuationsMap_INVALIDCONSUMERNAME.apac"
"TestFiles/testPneumaticActuationsMap_INVALIDCONSUMERNAME.apac"
Public _
Const cstrPneumaticActuationsMapPath_INVALIDCYCLENAME As String =
"TestFiles\testPneumaticActuationsMap_INVALIDCYCLENAME.apac"
"TestFiles/testPneumaticActuationsMap_INVALIDCYCLENAME.apac"
<OneTimeSetUp>
......
VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
+ 6
− 6
View file @ 92c68b5c
......@@ -18,10 +18,10 @@ Namespace UnitTests
<TestFixture()>
Public Class _SSMTOOLTests
'TechBenefitsList - FilePath Constants
Private Const GOODTechList As String = "TestFiles\testSSMTechBenefits.csv"
Private Const GOODTechListALLON As String = "TestFiles\testSSMTechBenefitsALLON.csv"
Private Const GOODTechListALLOFF As String = "TestFiles\testSSMTechBenefitsALLOFF.csv"
Private Const GOODTechListEMPTYLIST As String = "TestFiles\testSSMTechBenefitsEMPTYLIST.csv"
Private Const GOODTechList As String = "TestFiles/testSSMTechBenefits.csv"
Private Const GOODTechListALLON As String = "TestFiles/testSSMTechBenefitsALLON.csv"
Private Const GOODTechListALLOFF As String = "TestFiles/testSSMTechBenefitsALLOFF.csv"
Private Const GOODTechListEMPTYLIST As String = "TestFiles/testSSMTechBenefitsEMPTYLIST.csv"
<OneTimeSetUp>
Public Sub RunBeforeAnyTests()
......@@ -97,7 +97,7 @@ Namespace UnitTests
Dim dao = New GenericCompletedBusAuxiliaryDataAdapter()
Dim target As ISSMDeclarationInputs = dao.CreatePrimarySSMModelParameters(auxInput, mission, LoadingType.ReferenceLoad, mission.BusParameter.HVACConventional.HVACConfiguration,
HeatPumpType.none, mission.BusParameter.HVACConventional.HeatPumpTypePassengerCompartmentCooling, mission.BusParameter.HVACConventional.HVACAuxHeaterPower, FuelData.Diesel, true)
mission.BusParameter.HVACConventional, FuelData.Diesel, true)
If section = "BusParameterisation" Then
'BUS Parameterisation
......@@ -608,7 +608,7 @@ Namespace UnitTests
Dim dao = New GenericCompletedBusAuxiliaryDataAdapter()
Dim params as ISSMDeclarationInputs = dao.CreatePrimarySSMModelParameters(auxInput, mission, LoadingType.ReferenceLoad, mission.BusParameter.HVACConventional.HVACConfiguration,
HeatPumpType.none, mission.BusParameter.HVACConventional.HeatPumpTypePassengerCompartmentCooling, mission.BusParameter.HVACConventional.HVACAuxHeaterPower, FuelData.Diesel, true)
mission.BusParameter.HVACConventional, FuelData.Diesel, true)
Dim target As SSMTOOL = New SSMTOOL(params)
......
VECTOAux/VectoAuxiliariesTests/UnitTests/Utils.vb
+ 12
− 12
View file @ 92c68b5c
......@@ -105,7 +105,7 @@ Public Class Utils
.ResultCardIdle = New DummyResultCard(), ' New ResultCard(New List(Of SmartResult)()),
.ResultCardTraction = New DummyResultCard(), 'New ResultCard(New List(Of SmartResult)()),
.ResultCardOverrun = New DummyResultCard(), 'New ResultCard(New List(Of SmartResult)()),
.AlternatorMap = AlternatorReader.ReadMap("TestFiles\testAlternatormap.aalt"),
.AlternatorMap = AlternatorReader.ReadMap("TestFiles/testAlternatorMap.aalt"),
.DoorActuationTimeSecond = Constants.BusAuxiliaries.ElectricalConsumers.DoorActuationTimeSecond,
.PowerNetVoltage = Constants.BusAuxiliaries.ElectricSystem.PowernetVoltage,
.AlternatorType = AlternatorType.Conventional
......@@ -126,7 +126,7 @@ Public Class Utils
.BusFloorType = FloorType.HighFloor,
.BusSurfaceArea = 0.SI(Of SquareMeter),
.BusVolumeVentilation = 0.SI(Of CubicMeter),
.BusWindowSurface = 0.SI(of SquareMeter),
.BusWindowSurface = 0.SI(Of SquareMeter),
.UValue = 3.SI(Of WattPerKelvinSquareMeter),
.VentilationRate = 20.SI(Unit.SI.Per.Hour).Cast(Of PerSecond),
.VentilationRateHeating = 20.SI(Unit.SI.Per.Hour).Cast(Of PerSecond),
......@@ -136,9 +136,9 @@ Public Class Utils
.HeatingBoundaryTemperature = 18.0.DegCelsiusToKelvin(),
.CoolingBoundaryTemperature = 23.0.DegCelsiusToKelvin(),
.SpecificVentilationPower = 0.56.SI(Unit.SI.Watt.Hour.Per.Cubic.Meter).Cast(Of JoulePerCubicMeter),
.HVACMaxCoolingPowerPassenger = 18.si(Unit.SI.kilo.watt).Cast (of Watt),
.HVACMaxCoolingPowerPassenger = 18.SI(Unit.SI.Kilo.Watt).Cast(Of Watt),
.AuxHeaterEfficiency = 0.84,
.FuelFiredHeaterPower = 30.SI(Unit.SI.kilo.watt).Cast (Of Watt),
.FuelFiredHeaterPower = 30.SI(Unit.SI.Kilo.Watt).Cast(Of Watt),
.FuelEnergyToHeatToCoolant = Constants.BusAuxiliaries.Heater.FuelEnergyToHeatToCoolant,
.CoolantHeatTransferredToAirCabinHeater =
Constants.BusAuxiliaries.Heater.CoolantHeatTransferredToAirCabinHeater,
......@@ -150,7 +150,7 @@ Public Class Utils
.Braking = 153,
.ParkBrakeAndDoors = 24,
.Kneeling = 25,
.CycleTime = 1000.SI(of Second)()
.CycleTime = 1000.SI(Of Second)()
}
}
Return retVal
......
VectoCommon/VectoHashingTest/BasicHasingTests.cs
+ 4
− 4
View file @ 92c68b5c
......@@ -43,11 +43,11 @@ namespace VectoHashingTest
//[Parallelizable(ParallelScope.All)]
public class BasicHasingTests
{
public const string SimpleXML = @"Testdata\XML\simple_document.xml";
public const string ReferenceXMLEngine = @"Testdata\XML\Reference\vecto_engine-sample.xml";
public const string ReferenceXMLVehicle = @"Testdata\XML\Reference\vecto_vehicle-sample_FULL.xml";
public const string SimpleXML = @"Testdata/XML/simple_document.xml";
public const string ReferenceXMLEngine = @"Testdata/XML/Reference/vecto_engine-sample.xml";
public const string ReferenceXMLVehicle = @"Testdata/XML/Reference/vecto_vehicle-sample_FULL.xml";
public const string UnorderedXMLVehicle = @"Testdata\XML\Variations\vecto_vehicle-sample_FULL_Entry_Order.xml";
public const string UnorderedXMLVehicle = @"Testdata/XML/Variations/vecto_vehicle-sample_FULL_Entry_Order.xml";
public const string HashSimpleXML = "U2zic7KOnKw60rzh+KKQ1lwZL6NmXju+DXG7cYYmlxo=";
......
VectoCommon/VectoHashingTest/VectoComponentHashSortTest.cs
+ 2
− 2
View file @ 92c68b5c
......@@ -7,8 +7,8 @@ namespace VectoHashingTest
{
public class VectoComponentHashSortTest
{
private const string UnsortedComponentPath = @"Testdata\XML\Sort\Component\Unsorted\";
private const string SortedComponentPath = @"Testdata\XML\Sort\Component\Sorted\";
private const string UnsortedComponentPath = @"Testdata/XML/Sort/Component/Unsorted/";
private const string SortedComponentPath = @"Testdata/XML/Sort/Component/Sorted/";
[OneTimeSetUp]
public void RunBeforeAnyTests()
......
VectoCommon/VectoHashingTest/VectoHashTest.cs
+ 45
− 45
View file @ 92c68b5c
......@@ -61,8 +61,8 @@ namespace VectoHashingTest
//[Parallelizable(ParallelScope.All)]
public class VectoHashTest
{
public const string ReferenceXMLEngine = @"Testdata\XML\Reference\vecto_engine-sample.xml";
public const string ReferenceXMLVehicle = @"Testdata\XML\Reference\vecto_vehicle-sample_FULL.xml";
public const string ReferenceXMLEngine = @"Testdata/XML/Reference/vecto_engine-sample.xml";
public const string ReferenceXMLVehicle = @"Testdata/XML/Reference/vecto_vehicle-sample_FULL.xml";
protected IXMLInputDataReader xmlInputReader;
......@@ -150,8 +150,8 @@ namespace VectoHashingTest
Assert.AreEqual(expectedHash, existingHash);
}
[TestCase(@"Testdata\XML\ToHash\vecto_vehicle-sample_3axle1.xml"),
TestCase(@"Testdata\XML\ToHash\vecto_vehicle-sample_3axle1_unsortedAxle.xml")]
[TestCase(@"Testdata/XML/ToHash/vecto_vehicle-sample_3axle1.xml"),
TestCase(@"Testdata/XML/ToHash/vecto_vehicle-sample_3axle1_unsortedAxle.xml")]
public void TestReadTyres1Index(string file)
{
var h = VectoHash.Load(file);
......@@ -171,7 +171,7 @@ namespace VectoHashingTest
[TestCase]
public void TestReadTyres2Index()
{
var file = @"Testdata\XML\ToHash\vecto_vehicle-sample_3axle2.xml";
var file = @"Testdata/XML/ToHash/vecto_vehicle-sample_3axle2.xml";
var h = VectoHash.Load(file);
var expectedHash = new[] {
"5074334bb2c090c5e258e9a664f5d19689a3f13d",
......@@ -189,8 +189,8 @@ namespace VectoHashingTest
"index exceeds number of components found! index: 3, #components: 3");
}
[TestCase(@"Testdata\XML\ToHash\vecto_vehicle-sample_3axle1.xml"),
TestCase(@"Testdata\XML\ToHash\vecto_vehicle-sample_3axle1_unsortedAxle.xml")]
[TestCase(@"Testdata/XML/ToHash/vecto_vehicle-sample_3axle1.xml"),
TestCase(@"Testdata/XML/ToHash/vecto_vehicle-sample_3axle1_unsortedAxle.xml")]
public void TestComputeTyres1Index(string file)
{
var h = VectoHash.Load(file);
......@@ -207,7 +207,7 @@ namespace VectoHashingTest
[TestCase]
public void TestComputeTyres2Index()
{
var file = @"Testdata\XML\ToHash\vecto_vehicle-sample_3axle2.xml";
var file = @"Testdata/XML/ToHash/vecto_vehicle-sample_3axle2.xml";
var h = VectoHash.Load(file);
var hash1 = h.ComputeHash(VectoComponents.Tyre, 0);
......@@ -234,23 +234,23 @@ namespace VectoHashingTest
]
public void TestHashComputationVariations(string file, string expectedHash)
{
var h = VectoHash.Load(@"Testdata\XML\Variations\" + file);
var h = VectoHash.Load(@"Testdata/XML/Variations/" + file);
var hash = h.ComputeHash();
Assert.AreEqual(expectedHash, hash);
}
[TestCase(@"Testdata\XML\Validation\vecto_engine_valid.xml"),
TestCase(@"Testdata\XML\Validation\vecto_gearbox_valid.xml")]
[TestCase(@"Testdata/XML/Validation/vecto_engine_valid.xml"),
TestCase(@"Testdata/XML/Validation/vecto_gearbox_valid.xml")]
public void TestValidation(string file)
{
var h = VectoHash.Load(file);
Assert.IsTrue(h.ValidateHash());
}
[TestCase(@"Testdata\XML\Validation\vecto_engine_invalid.xml"),
TestCase(@"Testdata\XML\Validation\vecto_gearbox_invalid.xml")]
[TestCase(@"Testdata/XML/Validation/vecto_engine_invalid.xml"),
TestCase(@"Testdata/XML/Validation/vecto_gearbox_invalid.xml")]
public void TestValidationInvalid(string file)
{
var h = VectoHash.Load(file);
......@@ -262,7 +262,7 @@ namespace VectoHashingTest
]
public void TestValidationComponentValid(VectoComponents component)
{
var file = @"Testdata\XML\Validation\vecto_vehicle_components_valid-engine_gbx.xml";
var file = @"Testdata/XML/Validation/vecto_vehicle_components_valid-engine_gbx.xml";
var h = VectoHash.Load(file);
Assert.IsTrue(h.ValidateHash(component));
......@@ -279,15 +279,15 @@ namespace VectoHashingTest
]
public void TestValidationComponentInvalid(VectoComponents component)
{
var file = @"Testdata\XML\Validation\vecto_vehicle_components_invalid.xml";
var file = @"Testdata/XML/Validation/vecto_vehicle_components_invalid.xml";
var h = VectoHash.Load(file);
Assert.IsFalse(h.ValidateHash(component));
}
[TestCase(@"Testdata\XML\ToHash\vecto_engine-input.xml"),
TestCase(@"Testdata\XML\ToHash\vecto_engine_withid-input.xml"),
TestCase(@"Testdata\XML\ToHash\vecto_gearbox-input.xml")]
[TestCase(@"Testdata/XML/ToHash/vecto_engine-input.xml"),
TestCase(@"Testdata/XML/ToHash/vecto_engine_withid-input.xml"),
TestCase(@"Testdata/XML/ToHash/vecto_gearbox-input.xml")]
public void TestAddHash(string file)
{
var destination = Path.GetFileNameWithoutExtension(file) + "_hashed.xml";
......@@ -304,10 +304,10 @@ namespace VectoHashingTest
Assert.IsTrue(h2.ValidateHash());
}
[TestCase(@"Testdata\XML\ToHash\vecto_engine_withid-input.xml", 5),
TestCase(@"Testdata\XML\ToHash\vecto_engine_withid-input.xml", 10),
TestCase(@"Testdata\XML\ToHash\vecto_engine_withid-input.xml", 15),
TestCase(@"Testdata\XML\ToHash\vecto_engine_withid-input.xml", 20),
[TestCase(@"Testdata/XML/ToHash/vecto_engine_withid-input.xml", 5),
TestCase(@"Testdata/XML/ToHash/vecto_engine_withid-input.xml", 10),
TestCase(@"Testdata/XML/ToHash/vecto_engine_withid-input.xml", 15),
TestCase(@"Testdata/XML/ToHash/vecto_engine_withid-input.xml", 20),
]
public void TestAddHashoDoNotOverwriteID(string file, int idLength)
{
......@@ -325,9 +325,9 @@ namespace VectoHashingTest
Assert.AreEqual(newid, id.Attribute("id").Value);
}
[TestCase(@"Testdata\XML\ToHash\vecto_engine_withid-input.xml", 2),
TestCase(@"Testdata\XML\ToHash\vecto_engine_withid-input.xml", 3),
TestCase(@"Testdata\XML\ToHash\vecto_engine_withid-input.xml", 4)]
[TestCase(@"Testdata/XML/ToHash/vecto_engine_withid-input.xml", 2),
TestCase(@"Testdata/XML/ToHash/vecto_engine_withid-input.xml", 3),
TestCase(@"Testdata/XML/ToHash/vecto_engine_withid-input.xml", 4)]
public void TestAddHashoDoOverwriteID(string file, int idLength)
{
var newid = "x" + Guid.NewGuid().ToString("n").Substring(0, idLength - 1);
......@@ -344,7 +344,7 @@ namespace VectoHashingTest
Assert.AreNotEqual(newid, id.Attribute("id").Value);
}
[TestCase(@"Testdata\XML\ToHash\vecto_engine_withid-input.xml")]
[TestCase(@"Testdata/XML/ToHash/vecto_engine_withid-input.xml")]
public void TestReplaceDate(string file)
{
var input = new XmlDocument();
......@@ -365,10 +365,10 @@ namespace VectoHashingTest
Assert.IsTrue(now.ToUniversalTime() - newDate < new TimeSpan(0, 0, 0, 1));
}
[TestCase(@"Testdata\XML\ToHash\vecto_engine_withhash-input.xml", "input data already contains a signature element"),
TestCase(@"Testdata\XML\ToHash\vecto_vehicle-sample.xml", "adding hash for Vehicle is not supported"),
TestCase(@"Testdata\XML\ToHash\vecto_gearbox-input_nodata.xml", "'Data' element for component 'Gearbox' not found!"),
TestCase(@"Testdata\XML\ToHash\multiple_components.xml", "input must not contain multiple components!"),
[TestCase(@"Testdata/XML/ToHash/vecto_engine_withhash-input.xml", "input data already contains a signature element"),
TestCase(@"Testdata/XML/ToHash/vecto_vehicle-sample.xml", "adding hash for Vehicle is not supported"),
TestCase(@"Testdata/XML/ToHash/vecto_gearbox-input_nodata.xml", "'Data' element for component 'Gearbox' not found!"),
TestCase(@"Testdata/XML/ToHash/multiple_components.xml", "input must not contain multiple components!"),
]
public void TestAddHashException(string file, string expectedExceptionMsg)
{
......@@ -381,7 +381,7 @@ namespace VectoHashingTest
[TestCase]
public void TestDuplicateSigElement()
{
var filename = @"Testdata\XML\Invalid\duplicate-sig.xml";
var filename = @"Testdata/XML/Invalid/duplicate-sig.xml";
var h = VectoHash.Load(filename);
AssertHelper.Exception<Exception>(() => { var r = h.ReadHash(); }, "Multiple DigestValue elements found!");
......@@ -414,10 +414,10 @@ namespace VectoHashingTest
Assert.AreEqual(BasicHasingTests.HashVehicleXML, hash);
}
[TestCase(@"Testdata\XML\ToHash\vecto_engine-input.xml"),
TestCase(@"Testdata\XML\ToHash\vecto_engine-input_emptyDate.xml"),
TestCase(@"Testdata\XML\ToHash\vecto_engine_withid-input.xml"),
TestCase(@"Testdata\XML\ToHash\vecto_gearbox-input.xml")]
[TestCase(@"Testdata/XML/ToHash/vecto_engine-input.xml"),
TestCase(@"Testdata/XML/ToHash/vecto_engine-input_emptyDate.xml"),
TestCase(@"Testdata/XML/ToHash/vecto_engine_withid-input.xml"),
TestCase(@"Testdata/XML/ToHash/vecto_gearbox-input.xml")]
public void TestHashedComponentIsValid(string file)
{
var destination = Path.GetFileNameWithoutExtension(file) + "_hashed.xml";
......@@ -442,7 +442,7 @@ namespace VectoHashingTest
[TestCase("vecto_vehicle-namespace_prefix.xml", BasicHasingTests.HashVehicleXML)]
public void TestNamespacePrefixVariations(string file, string expectedHash)
{
var h = VectoHash.Load(@"Testdata\XML\Variations\" + file);
var h = VectoHash.Load(@"Testdata/XML/Variations/" + file);
var hash = h.ComputeHash();
Assert.AreEqual(expectedHash, hash);
......@@ -451,7 +451,7 @@ namespace VectoHashingTest
[TestCase()]
public void TestInvalidXMLAsFile()
{
var file = @"Testdata\XML\Invalid\invalid-comp.xml";
var file = @"Testdata/XML/Invalid/invalid-comp.xml";
AssertHelper.Exception<Exception>(() => VectoHash.Load(file), "failed to read XML document");
}
......@@ -459,7 +459,7 @@ namespace VectoHashingTest
[TestCase()]
public void TestInvalidXMLAsStream()
{
var file = @"Testdata\XML\Invalid\invalid-comp.xml";
var file = @"Testdata/XML/Invalid/invalid-comp.xml";
var stream = File.Open(file, FileMode.Open);
AssertHelper.Exception<Exception>(() => VectoHash.Load(stream), "failed to read XML document");
}
......@@ -520,8 +520,8 @@ namespace VectoHashingTest
[TestCase(@"Testdata\XML\Validation\vecto_engine_valid.xml"),
TestCase(@"Testdata\XML\Validation\vecto_gearbox_valid.xml")]
[TestCase(@"Testdata/XML/Validation/vecto_engine_valid.xml"),
TestCase(@"Testdata/XML/Validation/vecto_gearbox_valid.xml")]
public void TestXMLComponentValidation(string file)
{
var xmlDoc = new XmlDocument();
......@@ -534,8 +534,8 @@ namespace VectoHashingTest
}
[TestCase(@"Testdata\XML\Validation\vecto_engine_valid.xml"),
TestCase(@"Testdata\XML\Validation\vecto_engine_valid-typeAttr.xml")]
[TestCase(@"Testdata/XML/Validation/vecto_engine_valid.xml"),
TestCase(@"Testdata/XML/Validation/vecto_engine_valid-typeAttr.xml")]
public void TestIgnoreTypeAttribute(string file)
{
var h = VectoHash.Load(file);
......@@ -543,7 +543,7 @@ namespace VectoHashingTest
}
public const string MultistageFile =
@"Testdata\XML\Multistage\vecto_multistage_primary_vehicle_stage_2_3_group41.xml";
@"Testdata/XML/Multistage/vecto_multistage_primary_vehicle_stage_2_3_group41.xml";
......@@ -612,7 +612,7 @@ namespace VectoHashingTest
}
[TestCase(@"Testdata\XML\Multistage\final.VIF_Report_5.xml")]
[TestCase(@"Testdata/XML/Multistage/final.VIF_Report_5.xml")]
public void TestMultistageVerifyHashStructure(string file)
{
var h = VectoHash.Load(file);
......@@ -661,7 +661,7 @@ namespace VectoHashingTest
}
private const string WheelsFileToHash25 = @"Testdata\XML\ToHash\Tyre_v25.xml";
private const string WheelsFileToHash25 = @"Testdata/XML/ToHash/Tyre_v25.xml";
[TestCase(WheelsFileToHash25)]
public void TestTyreValidDimension(string file)
......
VectoCommon/VectoHashingTest/VectoHashingTest.csproj
+ 6
− 0
View file @ 92c68b5c
......@@ -20,6 +20,12 @@
<ProjectReference Include="..\VectoHashing\VectoHashing.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="Testdata\**\*.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<None Include="TestData\**\*.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
......
VectoCommon/VectoHashingTest/VectoJobHashSortTest.cs
+ 2
− 2
View file @ 92c68b5c
......@@ -7,8 +7,8 @@ namespace VectoHashingTest
{
public class VectoJobHashSortTest
{
private const string UnsortedJobPath = @"Testdata\XML\Sort\Job\Unsorted\";
private const string SortedJobPath = @"Testdata\XML\Sort\Job\Sorted\";
private const string UnsortedJobPath = @"Testdata/XML/Sort/Job/Unsorted/";
private const string SortedJobPath = @"Testdata/XML/Sort/Job/Sorted/";
[OneTimeSetUp]
public void RunBeforeAnyTests()
......
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