From 554f4638354add0663e22e346ecadb435444ccc5 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Mon, 24 Jan 2022 11:57:53 +0100
Subject: [PATCH] updated testcases
---
.../Models/Declaration/ShiftPolygonTest.cs | 4 +++-
VectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs | 12 ++++--------
.../VectoCoreTest/XML/XMLEngineeringInputRefTest.cs | 7 ++-----
.../XML/XMLEngineeringInputSingleTest.cs | 8 +++-----
4 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/ShiftPolygonTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/ShiftPolygonTest.cs
index 5eaf85863a..cc0bc9807e 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/ShiftPolygonTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/ShiftPolygonTest.cs
@@ -869,9 +869,11 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
[TestCase(@"E:\QUAM\Workspace\VECTO-Bugreports\BugReportTests\Bugreport Jobs\20190307_VECTO-904_Extrapolation\OM-18173493.xml")]
//[TestCase(@"E:\QUAM\Workspace\VECTO_DEV_Hybrid\Generic Vehicles\Declaration Mode\Group5_Tractor_4x2\Class5_Tractor_DECL.xml")]
- [Ignore("Confidential data")]
public void ComputeShiftPolygonXML(string xmlJob)
{
+ if (!File.Exists(xmlJob)) {
+ Assert.Inconclusive("Confidential File not found. Test cannot run without file.");
+ }
var inputData = xmlInputReader.CreateDeclaration(xmlJob);
var dao = new DeclarationDataAdapterHeavyLorry();
diff --git a/VectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs b/VectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs
index ed2a5c8894..555510e8df 100644
--- a/VectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs
+++ b/VectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs
@@ -340,19 +340,15 @@ namespace TUGraz.VectoCore.Tests.Models
}
- [TestCase()]
+ [TestCase, Ignore("Engineering XML not maintained")]
public void ReadEngineeringXMLDualFuel()
{
var inputDataProvider = xmlInputReader.CreateEngineering(EngineeringDualFuelWHRVehicle);
var dao = new EngineeringModeVectoRunDataFactory(inputDataProvider);
- VectoRunData[] runs;
- Assert.That(() => runs = dao.NextRun().ToArray(),
- Throws.TypeOf<VectoException>()
- .And.Message.EqualTo("Node IdlingSpeed not found in input data"));
- //Assert.AreEqual(1, runs.Length);
- //Assert.IsTrue(runs.All(x => x.EngineData.ElectricalWHR?.WHRMap != null));
- Assert.Inconclusive("Engineering Mode XML");
+ var runs = dao.NextRun().ToArray();
+ Assert.AreEqual(1, runs.Length);
+ Assert.IsTrue(runs.All(x => x.EngineData.ElectricalWHR?.WHRMap != null));
}
}
}
diff --git a/VectoCore/VectoCoreTest/XML/XMLEngineeringInputRefTest.cs b/VectoCore/VectoCoreTest/XML/XMLEngineeringInputRefTest.cs
index ec68eeedd5..66ebf86333 100644
--- a/VectoCore/VectoCoreTest/XML/XMLEngineeringInputRefTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLEngineeringInputRefTest.cs
@@ -285,7 +285,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(1.0, inputDataProvider.JobInputData.Vehicle.Components.RetarderInputData.Ratio);
}
- [TestCase]
+ [TestCase, Ignore("Engineering XML not maintained")]
public void TestXMLPowertrainGenerationReferencedFile()
{
var fileWriter = new FileOutputWriter("foo");
@@ -301,10 +301,7 @@ namespace TUGraz.VectoCore.Tests.XML
Throws.TypeOf<VectoException>()
.And.Message.EqualTo("Node IdlingSpeed not found in input data"));
- Assert.Inconclusive("Engineering Mode XML");
-
-
- //Assert.AreEqual(6, jobContainer.Runs.Count);
+ Assert.AreEqual(6, jobContainer.Runs.Count);
}
diff --git a/VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs b/VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs
index 70ed97a9ed..cdc154af10 100644
--- a/VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs
@@ -477,7 +477,7 @@ namespace TUGraz.VectoCore.Tests.XML
}
- [TestCase]
+ [TestCase, Ignore("Engineering XML not maintained")]
public void TestXMLPowertrainGenerationSingleFile()
{
var fileWriter = new FileOutputWriter("foo");
@@ -495,9 +495,9 @@ namespace TUGraz.VectoCore.Tests.XML
jobContainer.Execute();
- Assert.Inconclusive("Engineering Mode XML");
+ //Assert.Inconclusive("Engineering Mode XML");
- //Assert.AreEqual(6, jobContainer.Runs.Count);
+ Assert.AreEqual(6, jobContainer.Runs.Count);
}
[TestCase]
@@ -765,8 +765,6 @@ namespace TUGraz.VectoCore.Tests.XML
.And.Message.EqualTo("Missing Power Demands for ICE Off Driving, ICE Off Standstill, and Base Demand"));
jobContainer.Execute();
-
- Assert.Inconclusive("Engineering Mode XML");
}
[TestCase]
--
GitLab