From 0048c661dc6a3cbf76d55161dbe515061b29ff45 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 6 Aug 2020 13:51:54 +0200
Subject: [PATCH] updating testcases with new expected values
---
.../CompletedBusFactorMethodTest.cs | 37 ++++++++++---------
...eclarationSegmentComplete2AxleBusesTest.cs | 2 +-
...eclarationSegmentComplete3AxleBusesTest.cs | 8 ++--
...eclarationSegmentComplete4AxleBusesTest.cs | 6 +--
.../DeclarationSegmentHeavyBusesTest.cs | 2 +-
5 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
index ad51b0e90d..495d5b4f2d 100644
--- a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
@@ -50,17 +50,15 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
}
- private List<RelatedRun> relatedRuns;
- private Segment primarySegment;
- private Segment completedSegment;
-
+ //private List<RelatedRun> relatedRuns;
+
[OneTimeSetUp]
public void RunBeforeAnyTests()
{
Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
- relatedRuns = new List<RelatedRun>();
+ //relatedRuns = new List<RelatedRun>();
var kernel = new StandardKernel(new VectoNinjectModule());
xmlInputReader = kernel.Get<IXMLInputDataReader>();
@@ -81,7 +79,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
//var floorType = FloorType.HighFloor;
var articulated = false;
- primarySegment = DeclarationData.PrimaryBusSegments.Lookup(category, axleConfiguration, articulated);
+ //primarySegment = DeclarationData.PrimaryBusSegments.Lookup(category, axleConfiguration, articulated);
}
private void CompletedBusSegment()
@@ -93,7 +91,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
var bodyHeight = 3.SI<Meter>();
var lowEntry = false;
- completedSegment = DeclarationData.CompletedBusSegments.Lookup(numberOfAxles, vehicleCode, registrationClass, passengersLowerDeck, bodyHeight, lowEntry);
+ //completedSegment = DeclarationData.CompletedBusSegments.Lookup(numberOfAxles, vehicleCode, registrationClass, passengersLowerDeck, bodyHeight, lowEntry);
}
[TestCase()]
@@ -115,7 +113,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
var runs = factory.DataReader.NextRun().ToList();
Assert.IsTrue(runs.Count == 8 || runs.Count == 12);
- SetRelatedVehicleParts(runs);
+ var relatedRuns = SetRelatedVehicleParts(runs);
for (int i = 0; i < relatedRuns.Count; i++)
{
@@ -174,7 +172,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
// generic loading values shall match expected values of primary vehicle for IU and CO cycle
// see TestPrimaryBusGroup41Test
case 0:
- Assert.AreEqual(879.903, genericLoading.Value(), 1e-4);
+ Assert.AreEqual(1075.437, genericLoading.Value(), 1e-4);
Assert.AreEqual(1058.5088, specificLoading.Value(), 1e-4);
break;
case 1:
@@ -681,7 +679,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
// generic loading values shall match expected values of primary vehicle for IU and CO cycle
// see TestPrimaryBusGroup41Test
case 0:
- Assert.AreEqual(13.393, genericLoading, 1e-4);
+ Assert.AreEqual(16.147, genericLoading, 1e-4);
Assert.AreEqual(15.908575, specificLoading, 1e-4);
break;
case 1:
@@ -939,10 +937,11 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
- private void SetRelatedVehicleParts(List<VectoRunData> runs)
+ private List<RelatedRun> SetRelatedVehicleParts(List<VectoRunData> runs)
{
- relatedRuns.Clear();
- for (int i = 0; i < runs.Count; i++)
+ var relatedRuns = new List<RelatedRun>();
+
+ for (int i = 0; i < runs.Count; i++)
{
var relatedRun = new RelatedRun
{
@@ -952,6 +951,8 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
relatedRuns.Add(relatedRun);
i++;
}
+
+ return relatedRuns;
}
@@ -964,7 +965,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
{
var runs = GetVectoRunData(jobFile);
- SetRelatedVehicleParts(runs);
+ var relatedRuns = SetRelatedVehicleParts(runs);
var pair = relatedRuns[pairIdx];
File.WriteAllText($"{pair.VectoRunDataGenericBody.JobName}_{pair.VectoRunDataGenericBody.Cycle.Name}{pair.VectoRunDataGenericBody.ModFileSuffix}.json", JsonConvert.SerializeObject(pair.VectoRunDataGenericBody, Formatting.Indented));
@@ -984,7 +985,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
{
var runs = GetVectoRunData(jobFile);
- SetRelatedVehicleParts(runs);
+ var relatedRuns = SetRelatedVehicleParts(runs);
var run = runs[runIdx];
File.WriteAllText($"{run.JobName}_{run.Cycle.Name}{run.ModFileSuffix}.json", JsonConvert.SerializeObject(run, Formatting.Indented));
@@ -1059,9 +1060,9 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
TestCase(@"TestData\Integration\Buses\primary_heavyBus group P39_40_nonSmart_ESS.xml", 18, TestName = "RunBusSimulation Grp 39/40 P40DD CO/LL"),
- TestCase(@"E:\QUAM\tmp\ESS_Tests\primary_heavyBus group 42_ConvAux_ESS_SmartPS.xml", 10, TestName = "RunBusSimulation ESS P33DD SU/LL ConvAux SmartPS"),
- TestCase(@"E:\QUAM\tmp\ESS_Tests\primary_heavyBus group 42_ESS_SmartPS.xml", 10, TestName = "RunBusSimulation ESS P33DD SU/LL ES Aux SmartPS"),
- TestCase(@"E:\QUAM\tmp\ESS_Tests\primary_heavyBus group 42_ESS_SmartPS_SmartES.xml", 10, TestName = "RunBusSimulation ESS P33DD SU/LL ES Aux SmartPS SmartES"),
+ //TestCase(@"E:\QUAM\tmp\ESS_Tests\primary_heavyBus group 42_ConvAux_ESS_SmartPS.xml", 10, TestName = "RunBusSimulation ESS P33DD SU/LL ConvAux SmartPS"),
+ //TestCase(@"E:\QUAM\tmp\ESS_Tests\primary_heavyBus group 42_ESS_SmartPS.xml", 10, TestName = "RunBusSimulation ESS P33DD SU/LL ES Aux SmartPS"),
+ //TestCase(@"E:\QUAM\tmp\ESS_Tests\primary_heavyBus group 42_ESS_SmartPS_SmartES.xml", 10, TestName = "RunBusSimulation ESS P33DD SU/LL ES Aux SmartPS SmartES"),
]
public void TestRunPrimaryBusSimulation_ESS(string jobName, int runIdx)
{
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs
index 18de36d67c..ac0839d7ce 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete2AxleBusesTest.cs
@@ -21,7 +21,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
[
TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CE, RegistrationClass.I, 0, 0, false, VehicleClass.Class31a, 3),
- TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CE, RegistrationClass.II, 0, 0, true, VehicleClass.Class31b2, 3),
+ TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CE, RegistrationClass.II, 0, 0, true, VehicleClass.Class31b2, 4),
TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CF, RegistrationClass.A, 0, 0, false, VehicleClass.Class31c, 3),
TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CI, RegistrationClass.B, 0, 0, false, VehicleClass.Class31d, 3),
TestCase(AxleConfiguration.AxleConfig_4x2, VehicleCode.CJ, RegistrationClass.A, 0, 0, false, VehicleClass.Class31e, 3),
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs
index a32418b263..0af2d107ca 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete3AxleBusesTest.cs
@@ -26,7 +26,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
[
TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CE, RegistrationClass.I, 0, 0, false, VehicleClass.Class33a, 3),
TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CE, RegistrationClass.I, 0, 0, true, VehicleClass.Class33b1, 3),
- TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CE, RegistrationClass.II, 0, 0, true, VehicleClass.Class33b2, 3),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CE, RegistrationClass.II, 0, 0, true, VehicleClass.Class33b2, 4),
TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CF, RegistrationClass.A, 0, 0, false, VehicleClass.Class33c, 3),
TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CI, RegistrationClass.B, 0, 0, false, VehicleClass.Class33d, 3),
TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CJ, RegistrationClass.A, 0, 0, false, VehicleClass.Class33e, 3),
@@ -38,8 +38,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CB, RegistrationClass.II, 8, 0, false, VehicleClass.Class34f, 2),
TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CG, RegistrationClass.I, 0, 0, false, VehicleClass.Class35a, 3),
- TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CG, RegistrationClass.III, 0, 0, true, VehicleClass.Class35b1, 3),
- TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CG, RegistrationClass.II, 0, 0, true, VehicleClass.Class35b2, 3),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CG, RegistrationClass.A, 0, 0, true, VehicleClass.Class35b1, 3),
+ TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CG, RegistrationClass.II, 0, 0, true, VehicleClass.Class35b2, 4),
TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CH, RegistrationClass.A, 0, 0, false, VehicleClass.Class35c, 3),
TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CC, RegistrationClass.II, 0, 0, false, VehicleClass.Class36a, 2),
TestCase(AxleConfiguration.AxleConfig_6x2, VehicleCode.CC, RegistrationClass.II_III, 0, 3.1, true, VehicleClass.Class36b, 2),
@@ -460,7 +460,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
AssertBusParameters(
missionType: mission.MissionType,
- passengerDensity: new[] { 3.0 },
+ passengerDensity: new[] { mission.MissionType == MissionType.Interurban ? 2.2 : 3 },
airDragAllowed: mission.MissionType == MissionType.Interurban ? true : false,
doubleDecker: false,
busParameters: mission.BusParameter
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs
index 0c9e3c0ed1..57f5cf2138 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentComplete4AxleBusesTest.cs
@@ -22,7 +22,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
[
TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CE, RegistrationClass.I, 0, 0, false, VehicleClass.Class37a, 3),
TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CE, RegistrationClass.I, 0, 0, true, VehicleClass.Class37b1, 3),
- TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CE, RegistrationClass.II, 0, 0, true, VehicleClass.Class37b2, 3),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CE, RegistrationClass.II, 0, 0, true, VehicleClass.Class37b2, 4),
TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CF, RegistrationClass.A, 0, 0, false, VehicleClass.Class37c, 3),
TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CI, RegistrationClass.B, 0, 0, false, VehicleClass.Class37d, 3),
TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CJ, RegistrationClass.A, 0, 0, false, VehicleClass.Class37e, 3),
@@ -34,8 +34,8 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CB, RegistrationClass.II, 8, 0, false, VehicleClass.Class38f, 2),
TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CG, RegistrationClass.I, 0, 0, false, VehicleClass.Class39a, 3),
- TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CG, RegistrationClass.II_III, 0, 0, true, VehicleClass.Class39b1, 3),
- TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CG, RegistrationClass.II, 0, 0, true, VehicleClass.Class39b2, 3),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CG, RegistrationClass.I_II, 0, 0, true, VehicleClass.Class39b1, 3),
+ TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CG, RegistrationClass.II, 0, 0, true, VehicleClass.Class39b2, 4),
TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CH, RegistrationClass.A, 0, 0, false, VehicleClass.Class39c, 3),
TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CC, RegistrationClass.II, 0, 0, false, VehicleClass.Class40a, 2),
TestCase(AxleConfiguration.AxleConfig_8x2, VehicleCode.CC, RegistrationClass.II_III, 0, 3.1, true, VehicleClass.Class40b, 2),
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs
index 7146e86e02..9a207efa56 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs
@@ -80,7 +80,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
var segment = DeclarationData.PrimaryBusSegments.Lookup(
category, axleConfiguration, articulated);
- Assert.AreEqual(10, segment.Missions.Length);
+ Assert.AreEqual(11, segment.Missions.Length);
Assert.AreEqual(expectedClass, segment.VehicleClass);
}
--
GitLab