diff --git a/VectoMockup/VectoMockupTest/MockUpVectoTest.cs b/VectoMockup/VectoMockupTest/MockUpVectoTest.cs index e159c6aa584cb31f76e45067978d73bc227d4510..70ee3f8c60b88ad9cd5dc52149d7f94793c23589 100644 --- a/VectoMockup/VectoMockupTest/MockUpVectoTest.cs +++ b/VectoMockup/VectoMockupTest/MockUpVectoTest.cs @@ -7,6 +7,7 @@ using System.Xml; using System.Xml.Linq; using Ninject; using NUnit.Framework; +using TUGraz.VectoCommon.Exceptions; using TUGraz.VectoCommon.InputData; using TUGraz.VectoCommon.Models; using TUGraz.VectoCore; @@ -283,7 +284,7 @@ namespace VectoMockupTest public void CompletedBusMockupTest(string fileName) { //SimulatorFactory.MockUpRun = mockup; - XMLDeclarationVIFInputData input = null; + XMLDeclarationVIFInputData input = null!; var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName); using (var reader = XmlReader.Create(fileName)) { @@ -387,10 +388,15 @@ namespace VectoMockupTest [TestCase(@"TestData\XML\XMLReaderDeclaration\GroupTest\Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml",TestName="GroupClass9")] [TestCase(@"TestData\XML\XMLReaderDeclaration\GroupTest\Tractor_4x2_vehicle-class-5_EURO6_2018.xml", TestName="GroupClass5")] [TestCase(@"TestData/XML/XMLReaderDeclaration/GroupTest/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml", TestName="GroupClass16")] - public void GroupTest(string fileName, bool mockup = true) + public void GroupTestFail(string fileName, bool mockup = true) { - var inputProvider = _inputDataReader.Create(fileName); + + IInputDataProvider inputProvider = null; + Assert.Throws(typeof(VectoException), () => _inputDataReader.Create(fileName)); + if (inputProvider == null) { + Assert.Pass("Test cancelled! Inputprovider == null, this is expected on unsupported Schema versions"); + } var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName); var sumWriter = new SummaryDataContainer(fileWriter); var jobContainer = new JobContainer(sumWriter); @@ -414,7 +420,12 @@ namespace VectoMockupTest public void Schema1_0_Test(string fileName, bool mockup = true) { - var inputProvider = _inputDataReader.Create(fileName); + IInputDataProvider inputProvider = null!; + Assert.Throws(typeof(VectoException), () => _inputDataReader.Create(fileName)); + if (inputProvider == null) + { + Assert.Pass("Test cancelled! Inputprovider == null, this is expected on unsupported Schema versions"); + } var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName); var sumWriter = new SummaryDataContainer(fileWriter); var jobContainer = new JobContainer(sumWriter); @@ -437,7 +448,13 @@ namespace VectoMockupTest public void Schema2_0_Test(string fileName, bool mockup = true) { - var inputProvider = _inputDataReader.Create(fileName); + IInputDataProvider inputProvider = null!; + Assert.Throws(typeof(VectoException), () => _inputDataReader.Create(fileName)); + // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract + if (inputProvider == null) + { + Assert.Pass("Test cancelled! Inputprovider == null, this is expected on unsupported Schema versions"); + } var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName); var sumWriter = new SummaryDataContainer(fileWriter); var jobContainer = new JobContainer(sumWriter); @@ -459,6 +476,7 @@ namespace VectoMockupTest [TestCase("TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vecto", TestName="JSON_40TLonghaul")] [TestCase("TestData/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL.vecto", TestName="JSON_RigidTruckClass9")] + [NonParallelizable] public void JSONTest(string fileName, bool mockup = true) { @@ -467,8 +485,15 @@ namespace VectoMockupTest var sumWriter = new SummaryDataContainer(fileWriter); var jobContainer = new JobContainer(sumWriter); - _simulatorFactory = - _simFactoryFactory.Factory(ExecutionMode.Declaration, inputProvider, fileWriter, null, null, true); + _simulatorFactory = null!; + Assert.Throws(typeof(VectoException), () => { + _simulatorFactory = + _simFactoryFactory.Factory(ExecutionMode.Declaration, inputProvider, fileWriter, null, null, true); + }); + // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract + if (_simulatorFactory == null) { + Assert.Pass("Test cancelled! SimulatorFactory could not be created, this is expected on JSON jobs"); + } Clearfiles(fileWriter); jobContainer.AddRuns(_simulatorFactory); jobContainer.Execute(false);