diff --git a/VectoCore/VectoCoreTest/Models/Declaration/ShiftPolygonTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/ShiftPolygonTest.cs index 5eaf85863a4d3c0c7a904567e726eb600ba80d12..cc0bc9807e83182045481158436d0bf51e232684 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 ed2a5c889472dd33f61d8a99a263d0ec14048e5e..555510e8df1c4cef064fb876566288adeb29ae41 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 ec68eeedd50c349f44e842749d52c0c96579933a..66ebf86333ccd85b9236f59d3a766fdb6d080e55 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 70ed97a9ed262832fc65680c252218adde412de3..cdc154af1079b570121439b6310a50f9c5ed26d6 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]