diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationExemptedVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationExemptedVehicleDataProvider.cs
index 13bbba91666b999afd90993d4c7e00afc8e17ec5..c04f4fd92a9b6f4d3068389b7dd4e24946f3f450 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationExemptedVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationExemptedVehicleDataProvider.cs
@@ -45,7 +45,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
public override bool VocationalVehicle => false;
- public override bool? SleeperCab => false;
+ public override bool? SleeperCab =>
+ ElementExists(XMLNames.Vehicle_SleeperCab) && GetBool(XMLNames.Vehicle_SleeperCab);
public override TankSystem? TankSystem => null;
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_mediumLorry.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_mediumLorry.xml
index bb45b98a60c7ea3c94f98dd6a1981afbf2519177..fab2cb1d3acff13c908af07838141b0792a65817 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_mediumLorry.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_mediumLorry.xml
@@ -8,16 +8,16 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_MediumLorryDeclarationType">
- <Manufacturer>Some Manufacturer</Manufacturer>
- <ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
- <Model>Sample Bus Model</Model>
- <VIN>VEH-1234567890</VIN>
+ <Manufacturer>ML Manufacturer</Manufacturer>
+ <ManufacturerAddress>ML Street 1</ManufacturerAddress>
+ <Model>Sample ML Model</Model>
+ <VIN>VEH-ML34567890</VIN>
<Date>2020-01-09T11:00:00Z</Date>
<LegislativeCategory>N2</LegislativeCategory>
- <ChassisConfiguration>Tractor</ChassisConfiguration>
- <AxleConfiguration>6x2</AxleConfiguration>
- <CorrectedActualMass>7500</CorrectedActualMass>
- <TechnicalPermissibleMaximumLadenMass>15400</TechnicalPermissibleMaximumLadenMass>
+ <ChassisConfiguration>Van</ChassisConfiguration>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <CorrectedActualMass>3600</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>7300</TechnicalPermissibleMaximumLadenMass>
<ZeroEmissionVehicle>true</ZeroEmissionVehicle>
<SumNetPower>350000</SumNetPower>
<Technology>Fuel cell vehicle</Technology>
diff --git a/VectoMockup/VectoMockupTest/MockUpVectoTest.cs b/VectoMockup/VectoMockupTest/MockUpVectoTest.cs
index fc47565577b91a45e02918194f4e2e24e9952f73..37800f2451d2d672f5700d22c9c47393f01a168e 100644
--- a/VectoMockup/VectoMockupTest/MockUpVectoTest.cs
+++ b/VectoMockup/VectoMockupTest/MockUpVectoTest.cs
@@ -1,13 +1,9 @@
using System;
-using System.Collections;
using System.Collections.Generic;
-using System.ComponentModel.Design;
using System.IO;
-using System.IO.Compression;
using System.Linq;
using System.Xml;
using System.Xml.Linq;
-using System.Xml.XPath;
using Newtonsoft.Json;
using Ninject;
using NUnit.Framework;
@@ -18,17 +14,12 @@ using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore;
using TUGraz.VectoCore.InputData.FileIO.JSON;
using TUGraz.VectoCore.InputData.FileIO.XML;
-using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider;
using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Impl;
-using TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory;
using TUGraz.VectoCore.OutputData;
using TUGraz.VectoCore.OutputData.FileIO;
-using TUGraz.VectoCore.Tests.Utils;
using TUGraz.VectoCore.Tests.XML.Reports;
using TUGraz.VectoCore.Utils;
-using VectoMockupTest.TestData;
-using Formatting = System.Xml.Formatting;
using XmlDocumentType = TUGraz.VectoCore.Utils.XmlDocumentType;
namespace VectoMockupTest
@@ -343,94 +334,94 @@ namespace VectoMockupTest
}
- [TestCase(Conventional_InterimBus, Conventional_StageInput, TestName = "ConventionalInterimBus")]
- public void InterimBusMockupTest(string vifInput, string stageInputFile)
- {
- CopyInputFile(vifInput);
- //SimulatorFactory.MockUpRun = mockup;
- var multistageBusInput = _inputDataReader.Create(vifInput) as IMultistepBusInputDataProvider;
- Assert.NotNull(multistageBusInput);
-
- var stageInput = _inputDataReader.CreateDeclaration(stageInputFile);
- var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, vifInput);
- var sumWriter = new SummaryDataContainer(null);
- var jobContainer = new JobContainer(sumWriter);
-
- var inputData = new XMLDeclarationVIFInputData(multistageBusInput, stageInput.JobInputData.Vehicle);
-
- var _simulatorFactory =
- _simFactoryFactory.Factory(ExecutionMode.Declaration, inputData, fileWriter, null, null, true);
- Clearfiles(fileWriter);
- jobContainer.AddRuns(_simulatorFactory);
- jobContainer.Execute(false);
- jobContainer.WaitFinished();
- CheckFileExists(fileWriter, checkMrf:false, checkCif: false, checkVif: true);
-
-
- }
-
-
- [TestCase(Conventional_CompletedBus, TestName = "ConventionalCompletedBus")]
- public void CompletedBusMockupTest(string fileName)
- {
- CopyInputFile(fileName);
- //SimulatorFactory.MockUpRun = mockup;
- XMLDeclarationVIFInputData input = null!;
- var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName);
- using (var reader = XmlReader.Create(fileName))
- {
- input = new XMLDeclarationVIFInputData(_inputDataReader.Create(fileName) as IMultistepBusInputDataProvider, null);
- fileWriter = new FileOutputVIFWriter(fileName, input.MultistageJobInputData.JobInputData.ManufacturingStages.Count);
- }
- var sumWriter = new SummaryDataContainer(null);
- var jobContainer = new JobContainer(sumWriter);
-
- var _simulatorFactory =
- _simFactoryFactory.Factory(ExecutionMode.Declaration, input, fileWriter, null, null, true);
- Clearfiles(fileWriter);
- jobContainer.AddRuns(_simulatorFactory);
- jobContainer.Execute(false);
- jobContainer.WaitFinished();
- CheckFileExists(fileWriter, checkCif: true, checkVif: false);
- }
-
- [TestCase(CompleteDiesel, TestName="CompleteDiesel")]
- [TestCase(CompleteExempted, TestName = "CompleteExempted Bus")]
- [TestCase(CompleteExemptedWithoutTPMLM, TestName = "CompleteExempted No TPMLM")]
- public void PrimaryAndCompletedTest(string fileName)
- {
-
- var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName);
- var sumWriter = new SummaryDataContainer(null);
- var jobContainer = new JobContainer(sumWriter);
- var input = JSONInputDataFactory.ReadJsonJob(fileName);
- var _simulatorFactory =
- _simFactoryFactory.Factory(ExecutionMode.Declaration, input, fileWriter, null, null, true);
- Clearfiles(fileWriter);
- jobContainer.AddRuns(_simulatorFactory);
- jobContainer.Execute(false);
- jobContainer.WaitFinished();
- CheckFileExists(fileWriter, checkCif: true, checkVif: true, checkMrf: true, checkPrimaryMrf: true);
- }
-
-
- [TestCase(InterimDiesel, TestName = "PrimaryAndInterim")]
- public void PrimaryAndInterim(string fileName)
- {
-
- var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName);
- var sumWriter = new SummaryDataContainer(null);
- var jobContainer = new JobContainer(sumWriter);
- var input = JSONInputDataFactory.ReadJsonJob(fileName);
- var _simulatorFactory =
- _simFactoryFactory.Factory(ExecutionMode.Declaration, input, fileWriter, null, null, true);
- Clearfiles(fileWriter);
- jobContainer.AddRuns(_simulatorFactory);
- jobContainer.Execute(false);
- jobContainer.WaitFinished();
- CheckFileExists(fileWriter, checkCif: false, checkVif: true, checkMrf:false, checkPrimaryMrf:true);
-
- }
+ //[TestCase(Conventional_InterimBus, Conventional_StageInput, TestName = "ConventionalInterimBus")]
+ //public void InterimBusMockupTest(string vifInput, string stageInputFile)
+ //{
+ // CopyInputFile(vifInput);
+ // //SimulatorFactory.MockUpRun = mockup;
+ // var multistageBusInput = _inputDataReader.Create(vifInput) as IMultistepBusInputDataProvider;
+ // Assert.NotNull(multistageBusInput);
+
+ // var stageInput = _inputDataReader.CreateDeclaration(stageInputFile);
+ // var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, vifInput);
+ // var sumWriter = new SummaryDataContainer(null);
+ // var jobContainer = new JobContainer(sumWriter);
+
+ // var inputData = new XMLDeclarationVIFInputData(multistageBusInput, stageInput.JobInputData.Vehicle);
+
+ // var _simulatorFactory =
+ // _simFactoryFactory.Factory(ExecutionMode.Declaration, inputData, fileWriter, null, null, true);
+ // Clearfiles(fileWriter);
+ // jobContainer.AddRuns(_simulatorFactory);
+ // jobContainer.Execute(false);
+ // jobContainer.WaitFinished();
+ // CheckFileExists(fileWriter, checkMrf:false, checkCif: false, checkVif: true);
+
+
+ //}
+
+
+ //[TestCase(Conventional_CompletedBus, TestName = "ConventionalCompletedBus")]
+ //public void CompletedBusMockupTest(string fileName)
+ //{
+ // CopyInputFile(fileName);
+ // //SimulatorFactory.MockUpRun = mockup;
+ // XMLDeclarationVIFInputData input = null!;
+ // var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName);
+ // using (var reader = XmlReader.Create(fileName))
+ // {
+ // input = new XMLDeclarationVIFInputData(_inputDataReader.Create(fileName) as IMultistepBusInputDataProvider, null);
+ // fileWriter = new FileOutputVIFWriter(fileName, input.MultistageJobInputData.JobInputData.ManufacturingStages.Count);
+ // }
+ // var sumWriter = new SummaryDataContainer(null);
+ // var jobContainer = new JobContainer(sumWriter);
+
+ // var _simulatorFactory =
+ // _simFactoryFactory.Factory(ExecutionMode.Declaration, input, fileWriter, null, null, true);
+ // Clearfiles(fileWriter);
+ // jobContainer.AddRuns(_simulatorFactory);
+ // jobContainer.Execute(false);
+ // jobContainer.WaitFinished();
+ // CheckFileExists(fileWriter, checkCif: true, checkVif: false);
+ //}
+
+ //[TestCase(CompleteDiesel, TestName="CompleteDiesel")]
+ // [TestCase(CompleteExempted, TestName = "CompleteExempted Bus")]
+ // [TestCase(CompleteExemptedWithoutTPMLM, TestName = "CompleteExempted No TPMLM")]
+ //public void PrimaryAndCompletedTest(string fileName)
+ //{
+
+ // var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName);
+ // var sumWriter = new SummaryDataContainer(null);
+ // var jobContainer = new JobContainer(sumWriter);
+ // var input = JSONInputDataFactory.ReadJsonJob(fileName);
+ // var _simulatorFactory =
+ // _simFactoryFactory.Factory(ExecutionMode.Declaration, input, fileWriter, null, null, true);
+ // Clearfiles(fileWriter);
+ // jobContainer.AddRuns(_simulatorFactory);
+ // jobContainer.Execute(false);
+ // jobContainer.WaitFinished();
+ // CheckFileExists(fileWriter, checkCif: true, checkVif: true, checkMrf: true, checkPrimaryMrf: true);
+ //}
+
+
+ //[TestCase(InterimDiesel, TestName = "PrimaryAndInterim")]
+ //public void PrimaryAndInterim(string fileName)
+ //{
+
+ // var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName);
+ // var sumWriter = new SummaryDataContainer(null);
+ // var jobContainer = new JobContainer(sumWriter);
+ // var input = JSONInputDataFactory.ReadJsonJob(fileName);
+ // var _simulatorFactory =
+ // _simFactoryFactory.Factory(ExecutionMode.Declaration, input, fileWriter, null, null, true);
+ // Clearfiles(fileWriter);
+ // jobContainer.AddRuns(_simulatorFactory);
+ // jobContainer.Execute(false);
+ // jobContainer.WaitFinished();
+ // CheckFileExists(fileWriter, checkCif: false, checkVif: true, checkMrf:false, checkPrimaryMrf:true);
+
+ //}
[TestCase(Conventional_PrimaryBus_Tyres, Conventional_InterimBusInput, "Conventional", TestName = "Interim_Conventional_Bus_DifferentTyres")]
[TestCase(Conventional_PrimaryBus_AT_Angledrive, Conventional_InterimBusInput, "Conventional", TestName = "Interim_Conventional_Bus_AT_Angledrive")]