From 2a2103b2cf212ea18eed9bfbb5021f80de5cdb41 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 6 Apr 2020 10:20:43 +0200
Subject: [PATCH] fix testcases after file renaming
---
.../vecto_vehicle-medium_lorry-sample.xml | 6 +++---
VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs | 4 ++--
.../VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs | 2 +-
VectoCore/VectoCoreTest/XML/XMLPrimaryBusInputDataTest.cs | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-medium_lorry-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-medium_lorry-sample.xml
index 1a276314e7..d66de6b8d8 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-medium_lorry-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.6_Buses/vecto_vehicle-medium_lorry-sample.xml
@@ -9,9 +9,9 @@ urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1 E:\QUAM\Workspace\VECTO_DEV_
<Date>2017-09-26T15:33:45.0798047Z</Date>
<LegislativeClass>N3</LegislativeClass>
<VehicleCategory>Tractor</VehicleCategory>
- <AxleConfiguration>4x2</AxleConfiguration>
- <CurbMassChassis>8229</CurbMassChassis>
- <TechnicalPermissibleMaximumLadenMass>40000</TechnicalPermissibleMaximumLadenMass>
+ <AxleConfiguration>4x2F</AxleConfiguration>
+ <CurbMassChassis>4229</CurbMassChassis>
+ <TechnicalPermissibleMaximumLadenMass>7000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>100</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
diff --git a/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs b/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
index ad5c46453a..f946a7ce79 100644
--- a/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
@@ -62,8 +62,8 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(2.700, vehicle.Height.Value());
Assert.AreEqual(11.830, vehicle.Length.Value());
Assert.AreEqual(2.550, vehicle.Width.Value());
- Assert.AreEqual(0.120, ((XMLDeclarationCompletedBusDataProviderV26)vehicle).EntranceHeight.Value());
- Assert.AreEqual("pneumatic", ((XMLDeclarationCompletedBusDataProviderV26)vehicle).DoorDriveTechnology);
+ Assert.AreEqual(0.120, vehicle.EntranceHeight.Value());
+ Assert.AreEqual(ConsumerTechnology.Pneumatically, vehicle.DoorDriveTechnology);
var components = inputDataProvider.JobInputData.Vehicle.Components;
Assert.IsNotNull(components);
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
index 2e775ccb16..5b9919d940 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
@@ -90,7 +90,7 @@ namespace TUGraz.VectoCore.Tests.XML
public void CreateRunDataMediumLorry()
{
var runIdx = 0;
- var jobFile = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-medium_lorry.xml";
+ var jobFile = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-medium_lorry-sample.xml";
var writer = new FileOutputWriter(jobFile);
var inputData = xmlInputReader.CreateDeclaration(jobFile);
diff --git a/VectoCore/VectoCoreTest/XML/XMLPrimaryBusInputDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLPrimaryBusInputDataTest.cs
index 5e1c367e7e..7a4538a988 100644
--- a/VectoCore/VectoCoreTest/XML/XMLPrimaryBusInputDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLPrimaryBusInputDataTest.cs
@@ -14,7 +14,7 @@ namespace TUGraz.VectoCore.Tests.XML
protected IXMLInputDataReader xmlInputReader;
private IKernel _kernel;
- const string SampleVehicleDecl = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-primary_heavyBus.xml";
+ const string SampleVehicleDecl = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-primary_heavyBus-sample.xml";
[OneTimeSetUp]
--
GitLab