Code development platform for open source projects from the European Union institutions

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

renaming testcase, correcting assertions

parent 7d89a064
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
+ 1
− 1
View file @ e81dd308
......@@ -834,7 +834,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
case 0:
case 1://Interurban
Assert.AreEqual(3.5, genericValue);
Assert.AreEqual(3.55781260, specificValue, 1e-6);
Assert.AreEqual(3.55, specificValue, 1e-6);
break;
case 2:
case 3://Coach
......
VectoCore/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs
+ 1
− 1
View file @ e81dd308
......@@ -55,7 +55,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
}
[TestCase()]
[Parallelizable(ParallelScope.All)]
//[Parallelizable(ParallelScope.All)]
public void TestEngineOnly()
{
var dataWriter = new MockModalDataContainer();
......
VectoCore/VectoCoreTest/XML/XMLDeclarationInputv210.cs
+ 3
− 3
View file @ e81dd308
......@@ -28,7 +28,7 @@ namespace TUGraz.VectoCore.Tests.XML
xmlInputReader = _kernel.Get<IXMLInputDataReader>();
}
private const string BASE_DIR = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.10\Distributed\";
private const string BASE_DIR = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.4\Distributed\";
[TestCase(@"HeavyLorry\Conventional_heavyLorry_AMT.xml"),
......@@ -73,7 +73,7 @@ namespace TUGraz.VectoCore.Tests.XML
TestCase(@"ExemptedVehicles\exempted_mediumLorry.xml"),
TestCase(@"ExemptedVehicles\exempted_primaryBus.xml"),
]
public void TestReadingJobVersion_V210(string jobFile)
public void TestReadingJobVersion_V24(string jobFile)
{
ReadDeclarationJob(jobFile);
}
......@@ -83,7 +83,7 @@ namespace TUGraz.VectoCore.Tests.XML
TestCase(@"CompletedBus\IEPC_completedBus_1.xml"),
TestCase(@"CompletedBus\PEV_completedBus_1.xml"),
]
public void TestReadingCompletedBus_V210(string jobfile)
public void TestReadingCompletedBus_V24(string jobfile)
{
var filename = Path.Combine(BASE_DIR, jobfile);
var dataProvider = xmlInputReader.CreateDeclaration(XmlReader.Create(filename));
......
VectoCore/VectoCoreTest/XML/XMLDeclarationInputv24.cs
+ 19
− 12
View file @ e81dd308
......@@ -159,13 +159,14 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.Components.AngledriveInputData);//optional
Assert.IsNull(vehicle.Components.RetarderInputData);//optional
Assert.IsNull(vehicle.Components.AirdragInputData);//optional
Assert.IsNull(vehicle.TorqueLimits);//optional
Assert.IsEmpty(vehicle.TorqueLimits);//optional
} else {
Assert.IsNotNull(vehicle.TankSystem);
Assert.IsNotNull(vehicle.Components.AngledriveInputData);//optional
Assert.IsNotNull(vehicle.Components.RetarderInputData);//optional
Assert.IsNotNull(vehicle.Components.AirdragInputData);//optional
Assert.IsNotNull(vehicle.TorqueLimits);//optional
Assert.IsNotEmpty(vehicle.TorqueLimits);//optional
}
Assert.IsNotNull(vehicle.Components.AxleGearInputData);
Assert.IsNotNull(vehicle.Components.AxleWheels);
......@@ -220,7 +221,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.Components.RetarderInputData);
Assert.IsNull(vehicle.Components.AirdragInputData);
Assert.IsNull(vehicle.CargoVolume);
Assert.IsNull(vehicle.TorqueLimits);
Assert.IsEmpty(vehicle.TorqueLimits);
}
else {
Assert.IsNotNull(vehicle.TankSystem);
......@@ -229,6 +230,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNotNull(vehicle.Components.AirdragInputData);
Assert.AreEqual(20.300.SI<CubicMeter>(), vehicle.CargoVolume);
Assert.IsNotNull(vehicle.TorqueLimits);
Assert.IsNotEmpty(vehicle.TorqueLimits);
}
Assert.IsNotNull(vehicle.Components.AxleGearInputData);
......@@ -266,12 +268,13 @@ namespace TUGraz.VectoCore.Tests.XML
if (testDir == Optional_TESTS_DIR) {
Assert.IsNull(vehicle.Components.AngledriveInputData);
Assert.IsNull(vehicle.Components.RetarderInputData);
Assert.IsNull(vehicle.TorqueLimits);
Assert.IsEmpty(vehicle.TorqueLimits);
}
else {
Assert.IsNotNull(vehicle.Components.AngledriveInputData);
Assert.IsNotNull(vehicle.Components.RetarderInputData);
Assert.IsNotNull(vehicle.TorqueLimits);
Assert.IsNotEmpty(vehicle.TorqueLimits);
}
Assert.IsNotNull(vehicle.Components.AxleGearInputData);
......@@ -316,7 +319,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.Components.AngledriveInputData);
Assert.IsNull(vehicle.Components.RetarderInputData);
Assert.IsNull(vehicle.Components.AirdragInputData);
Assert.IsNull(vehicle.TorqueLimits);
Assert.IsEmpty(vehicle.TorqueLimits);
Assert.IsNull(vehicle.ElectricMotorTorqueLimits);
Assert.IsNull(vehicle.BoostingLimitations);
}
......@@ -328,6 +331,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNotNull(vehicle.Components.RetarderInputData);
Assert.IsNotNull(vehicle.Components.AirdragInputData);
Assert.IsNotNull(vehicle.TorqueLimits);
Assert.IsNotEmpty(vehicle.TorqueLimits);
TestElectricMotorTorqueLimits(vehicle.ElectricMotorTorqueLimits);//Vehicle EM Drive Limits
TestBoostingLimitations(vehicle.BoostingLimitations);//Vehicle Max Prop. Limit
}
......@@ -693,7 +697,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.Components.RetarderInputData);
Assert.IsNull(vehicle.Components.AirdragInputData);
Assert.IsNull(vehicle.CargoVolume);
Assert.IsNull(vehicle.TorqueLimits);
Assert.IsEmpty(vehicle.TorqueLimits);
Assert.IsNull(vehicle.ElectricMotorTorqueLimits);//Vehicle EM Drive Limits
Assert.IsNull(vehicle.BoostingLimitations);//Vehicle Max Prop. Limit
}
......@@ -703,8 +707,9 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNotNull(vehicle.Components.AngledriveInputData);
Assert.IsNotNull(vehicle.Components.RetarderInputData);
Assert.IsNotNull(vehicle.Components.AirdragInputData);
Assert.AreEqual(20.300.SI<CubicMeter>(), vehicle.CargoVolume);
Assert.AreEqual(20.300.SI<CubicMeter>(), vehicle.CargoVolume);
Assert.IsNotNull(vehicle.TorqueLimits);
Assert.IsNotEmpty(vehicle.TorqueLimits);
Assert.IsNotNull(vehicle.ElectricMotorTorqueLimits);//Vehicle EM Drive Limits
Assert.IsNotNull(vehicle.BoostingLimitations);//Vehicle Max Prop. Limit
}
......@@ -744,7 +749,7 @@ namespace TUGraz.VectoCore.Tests.XML
{
Assert.IsNull(vehicle.Components.AngledriveInputData);
Assert.IsNull(vehicle.Components.RetarderInputData);
Assert.IsNull(vehicle.TorqueLimits);
Assert.IsEmpty(vehicle.TorqueLimits);
Assert.IsNull(vehicle.ElectricMotorTorqueLimits);//Vehicle EM Drive Limits
Assert.IsNull(vehicle.BoostingLimitations);//Vehicle Max Prop. Limit
}
......@@ -753,6 +758,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNotNull(vehicle.Components.AngledriveInputData);
Assert.IsNotNull(vehicle.Components.RetarderInputData);
Assert.IsNotNull(vehicle.TorqueLimits);
Assert.IsNotEmpty(vehicle.TorqueLimits);
Assert.IsNotNull(vehicle.ElectricMotorTorqueLimits);//Vehicle EM Drive Limits
Assert.IsNotNull(vehicle.BoostingLimitations);//Vehicle Max Prop. Limit
}
......@@ -1001,7 +1007,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.Components.RetarderInputData);
Assert.IsNull(vehicle.Components.AirdragInputData);
Assert.IsNull(vehicle.CargoVolume);
Assert.IsNull(vehicle.TorqueLimits);
Assert.IsEmpty(vehicle.TorqueLimits);
Assert.IsNull(vehicle.ElectricMotorTorqueLimits);
}
else
......@@ -1011,7 +1017,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNotNull(vehicle.Components.RetarderInputData);
Assert.IsNotNull(vehicle.Components.AirdragInputData);
Assert.IsNotNull(vehicle.CargoVolume);
Assert.IsNotNull(vehicle.TorqueLimits);
Assert.IsNull(vehicle.TorqueLimits);
Assert.IsNotNull(vehicle.ElectricMotorTorqueLimits);
}
Assert.IsNotNull(vehicle.Components.AxleGearInputData);
......@@ -1149,14 +1155,14 @@ namespace TUGraz.VectoCore.Tests.XML
{
Assert.IsNull(vehicle.Components.AngledriveInputData);
Assert.IsNull(vehicle.Components.RetarderInputData);
Assert.IsNull(vehicle.TorqueLimits);
Assert.IsEmpty(vehicle.TorqueLimits);
Assert.IsNull(vehicle.ElectricMotorTorqueLimits);
}
else
{
Assert.IsNotNull(vehicle.Components.AngledriveInputData);
Assert.IsNotNull(vehicle.Components.RetarderInputData);
Assert.IsNotNull(vehicle.TorqueLimits);
Assert.IsNull(vehicle.TorqueLimits);
Assert.IsNotNull(vehicle.ElectricMotorTorqueLimits);
}
......@@ -1765,7 +1771,7 @@ namespace TUGraz.VectoCore.Tests.XML
{
Assert.IsNull(vehicle.Components.AngledriveInputData);
Assert.IsNull(vehicle.Components.RetarderInputData);
Assert.IsNull(vehicle.TorqueLimits);
Assert.IsEmpty(vehicle.TorqueLimits);
Assert.IsNull(vehicle.ElectricMotorTorqueLimits);
}
else
......@@ -1773,6 +1779,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNotNull(vehicle.Components.AngledriveInputData);
Assert.IsNotNull(vehicle.Components.RetarderInputData);
Assert.IsNotNull(vehicle.TorqueLimits);
Assert.IsNotEmpty(vehicle.TorqueLimits);
Assert.IsNotNull(vehicle.ElectricMotorTorqueLimits);
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

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