diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs b/VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs index ea674de0ffb5e6a9d379e653f3c28465006d92dd..7bc3a4ecada8fd5c156c0af94e2c180402174df9 100644 --- a/VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs +++ b/VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs @@ -78,7 +78,8 @@ namespace TUGraz.VectoCore.Tests.Integration [TestCase(ExemptedVehicle, 1), TestCase(ExemptedVehicleNoHEV, 1), TestCase(ExemptedVehicleV2, 1), - TestCase(ExemptedVehicleV2NoHEV, 1) + TestCase(ExemptedVehicleV2NoHEV, 1), + Ignore("ExemptedVehicles XML Version 1.0/2.0 no longer supported") ] public void TestSimulationExemptedVehicle(string filename, int numRuns) { @@ -127,7 +128,9 @@ namespace TUGraz.VectoCore.Tests.Integration [TestCase(ExemptedVehicle, true, true, true, "Invalid input: ZE-HDV and DualFuelVehicle are mutually exclusive!"), TestCase(ExemptedVehicle, true, false, true, "Invalid input: ZE-HDV and DualFuelVehicle are mutually exclusive!"), - TestCase(ExemptedVehicle, false, false, false, "Invalid input: at least one option of ZE-HDV, He-HDV, and DualFuelVehicle has to be set for an exempted vehicle!")] + TestCase(ExemptedVehicle, false, false, false, "Invalid input: at least one option of ZE-HDV, He-HDV, and DualFuelVehicle has to be set for an exempted vehicle!"), + Ignore("ExemptedVehicles XML Version 1.0 no longer supported") + ] public void TestInvalidExemptedCombination(string filename, bool zeroEmission, bool hybrid, bool dualFuel, string exMsg) { var writer = new FileOutputWriter(InputDataHelper.GetRandomFilename(filename)); @@ -179,7 +182,8 @@ namespace TUGraz.VectoCore.Tests.Integration [TestCase(ExemptedVehicle, null, 10000), TestCase(ExemptedVehicle, 100000, null), - TestCase(ExemptedVehicle, null, null)] + TestCase(ExemptedVehicle, null, null), + Ignore("ExemptedVehicles XML Version 1.0 no longer supported")] public void TestHybridExemptedRequiresMaxNetPower(string filename, double? maxNetPower1, double? maxNetPower2) { var writer = new FileOutputWriter(InputDataHelper.GetRandomFilename(filename)); diff --git a/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs b/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs index b8f1581e11e5998d7beb0d4ae7b3f930d7b8beb1..f54f2bc4184df981ed98ef202d6fbc33c16b0a96 100644 --- a/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs +++ b/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs @@ -164,7 +164,8 @@ namespace TUGraz.VectoCore.Tests.Integration } [TestCase(@"Testdata\XML\XMLReaderDeclaration\vecto_vehicle-sample.xml"), - TestCase(@"TestData\Integration\DeclarationMode\ExemptedVehicle\vecto_vehicle-sample_exempted.xml")] + //TestCase(@"TestData\Integration\DeclarationMode\ExemptedVehicle\vecto_vehicle-sample_exempted.xml") // ExemptedVehicles XML Version 1.0 no longer supported + ] public void TestValidationXMLReports(string jobfile) { var dataProvider = xmlInputReader.CreateDeclaration(jobfile); diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs index 1918d4458c9c0de30ce6881567ec8db947c79b22..ec1b0c85a1b68fd2895b2969693475784c5dcb3a 100644 --- a/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs +++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs @@ -85,7 +85,8 @@ namespace TUGraz.VectoCore.Tests.XML ReadDeclarationJob(jobFile); } - [TestCase(@"SchemaVersion2.1\vecto_vehicle-exempted-sample.xml")] + [TestCase(@"SchemaVersion2.1\vecto_vehicle-exempted-sample.xml"), + Ignore("ExemptedVehicles XML Version 1.0 no longer supported")] public void TestReadingJobVersion_V21_Exempted(string jobFile) { ReadDeclarationJob(jobFile);