From af6dfffdb4215ce99c3a3f94342ba8c1b9c4b224 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 8 Nov 2018 19:36:39 +0100
Subject: [PATCH] adapting testcases to changes in segment table
---
.../Integration/VocationalVehicleTest.cs | 2 +-
.../DataAdapter/DeclarationDataAdapterTest_Class5.cs | 12 ++++++++++--
.../Models/Declaration/DeclarationDataTest.cs | 8 ++++----
.../Simulation/DeclarationSimulationFactoryTest.cs | 2 +-
.../VectoCoreTest/XML/XMLDeclarationInputTest.cs | 2 +-
5 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/VectoCore/VectoCoreTest/Integration/VocationalVehicleTest.cs b/VectoCore/VectoCoreTest/Integration/VocationalVehicleTest.cs
index 7bb2dd4acf..fb09920103 100644
--- a/VectoCore/VectoCoreTest/Integration/VocationalVehicleTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/VocationalVehicleTest.cs
@@ -25,7 +25,7 @@ namespace TUGraz.VectoCore.Tests.Integration
}
- [TestCase(Class4Vocational, 1),
+ [TestCase(Class4Vocational, 4),
TestCase(Class5Vocational, 2)]
public void VocationalTest(string filename, int numRuns)
{
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class5.cs b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class5.cs
index 51c23b7160..20d8a281d9 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class5.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class5.cs
@@ -29,6 +29,7 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
+using System.IO;
using NUnit.Framework;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCore.Models.Declaration;
@@ -45,12 +46,19 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration.DataAdapter
public const double CdxA = 5.3;
+ [OneTimeSetUp]
+ public void RunBeforeAnyTests()
+ {
+ Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
+ }
+
+
[TestCase(Class5TractorPTOJob, 0)]
public void TestClass5_Vehicle_LongHaul_LowLoad(string file, int runIdx)
{
var runData = DeclarationAdapterTestHelper.CreateVectoRunData(file);
- Assert.AreEqual(8, runData.Length);
+ Assert.AreEqual(10, runData.Length);
// long haul, min load
DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData, runData[runIdx].AirdragData,
@@ -84,7 +92,7 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration.DataAdapter
{
var runData = DeclarationAdapterTestHelper.CreateVectoRunData(file);
- Assert.AreEqual(8, runData.Length);
+ Assert.AreEqual(10, runData.Length);
// long haul, min load
DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData, runData[runIdx].AirdragData,
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
index 4a692c600d..501ec06ab8 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationDataTest.cs
@@ -370,10 +370,10 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
[TestCase(VehicleClass.Class1, new[] { 0, 150, 150, 0, 0 }),
TestCase(VehicleClass.Class2, new[] { 200, 200, 150, 0, 0 }),
TestCase(VehicleClass.Class3, new[] { 0, 200, 150, 0, 0 }),
- TestCase(VehicleClass.Class4, new[] { 350, 200, 200, 300, 0 }),
- TestCase(VehicleClass.Class5, new[] { 350, 200, 200, 0, 0 }),
- TestCase(VehicleClass.Class9, new[] { 350, 200, 200, 300, 0 }),
- TestCase(VehicleClass.Class10, new[] { 350, 200, 200, 0, 0 }),
+ TestCase(VehicleClass.Class4, new[] { 350, 200, 150, 300, 200 }),
+ TestCase(VehicleClass.Class5, new[] { 350, 200, 150, 0, 200 }),
+ TestCase(VehicleClass.Class9, new[] { 350, 200, 150, 300, 200 }),
+ TestCase(VehicleClass.Class10, new[] { 350, 200, 0, 0, 200 }),
TestCase(VehicleClass.Class11, new[] { 350, 200, 0, 300, 200 }),
TestCase(VehicleClass.Class12, new[] { 350, 200, 0, 0, 200 }),
TestCase(VehicleClass.Class16, new[] { 0, 0, 0, 0, 200 })]
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/DeclarationSimulationFactoryTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/DeclarationSimulationFactoryTest.cs
index 0787985f67..cd4f1b2237 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/DeclarationSimulationFactoryTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/DeclarationSimulationFactoryTest.cs
@@ -82,7 +82,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
var factory = new SimulatorFactory(ExecutionMode.Declaration, inputDataProvider, null) { Validate = false };
var runs = factory.SimulationRuns().ToArray();
- Assert.AreEqual(8, runs.Length);
+ Assert.AreEqual(10, runs.Length);
}
[TestCase()]
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
index aadd422acf..af41e4aeb5 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
@@ -403,7 +403,7 @@ namespace TUGraz.VectoCore.Tests.XML
jobContainer.AddRuns(runsFactory);
- Assert.AreEqual(8, jobContainer.Runs.Count);
+ Assert.AreEqual(10, jobContainer.Runs.Count);
}
[TestCase]
--
GitLab