Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit f7df71d3 authored by Harald Martini's avatar Harald Martini
Browse files

Merge branch 'feature/VECTO-1572-mockup-vecto' of... 

Merge branch 'feature/VECTO-1572-mockup-vecto' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/hm_vecto-dev into feature/VECTO-1572-mockup-vecto
parents 64b04dc0 e17f22d6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationExemptedVehicleDataProvider.cs
+ 2
− 1
View file @ f7df71d3
...@@ -45,7 +45,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24 ...@@ -45,7 +45,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider.v24
public override bool VocationalVehicle => false; 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; public override TankSystem? TankSystem => null;
......
VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/ExemptedVehicles/exempted_mediumLorry.xml
+ 8
− 8
View file @ f7df71d3
...@@ -8,16 +8,16 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" ...@@ -8,16 +8,16 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd"> 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"> <v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Exempted_MediumLorryDeclarationType">
<Manufacturer>Some Manufacturer</Manufacturer> <Manufacturer>ML Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop 1</ManufacturerAddress> <ManufacturerAddress>ML Street 1</ManufacturerAddress>
<Model>Sample Bus Model</Model> <Model>Sample ML Model</Model>
<VIN>VEH-1234567890</VIN> <VIN>VEH-ML34567890</VIN>
<Date>2020-01-09T11:00:00Z</Date> <Date>2020-01-09T11:00:00Z</Date>
<LegislativeCategory>N2</LegislativeCategory> <LegislativeCategory>N2</LegislativeCategory>
<ChassisConfiguration>Tractor</ChassisConfiguration> <ChassisConfiguration>Van</ChassisConfiguration>
<AxleConfiguration>6x2</AxleConfiguration> <AxleConfiguration>4x2</AxleConfiguration>
<CorrectedActualMass>7500</CorrectedActualMass> <CorrectedActualMass>3600</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>15400</TechnicalPermissibleMaximumLadenMass> <TechnicalPermissibleMaximumLadenMass>7300</TechnicalPermissibleMaximumLadenMass>
<ZeroEmissionVehicle>true</ZeroEmissionVehicle> <ZeroEmissionVehicle>true</ZeroEmissionVehicle>
<SumNetPower>350000</SumNetPower> <SumNetPower>350000</SumNetPower>
<Technology>Fuel cell vehicle</Technology> <Technology>Fuel cell vehicle</Technology>
......
VectoMockup/VectoMockupTest/MockUpVectoTest.cs
+ 88
− 97
View file @ f7df71d3
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.Design;
using System.IO; using System.IO;
using System.IO.Compression;
using System.Linq; using System.Linq;
using System.Xml; using System.Xml;
using System.Xml.Linq; using System.Xml.Linq;
using System.Xml.XPath;
using Newtonsoft.Json; using Newtonsoft.Json;
using Ninject; using Ninject;
using NUnit.Framework; using NUnit.Framework;
...@@ -18,17 +14,12 @@ using TUGraz.VectoCommon.Utils; ...@@ -18,17 +14,12 @@ using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore; using TUGraz.VectoCore;
using TUGraz.VectoCore.InputData.FileIO.JSON; using TUGraz.VectoCore.InputData.FileIO.JSON;
using TUGraz.VectoCore.InputData.FileIO.XML; using TUGraz.VectoCore.InputData.FileIO.XML;
using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider;
using TUGraz.VectoCore.Models.Simulation; using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Impl; using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory;
using TUGraz.VectoCore.OutputData; using TUGraz.VectoCore.OutputData;
using TUGraz.VectoCore.OutputData.FileIO; using TUGraz.VectoCore.OutputData.FileIO;
using TUGraz.VectoCore.Tests.Utils;
using TUGraz.VectoCore.Tests.XML.Reports; using TUGraz.VectoCore.Tests.XML.Reports;
using TUGraz.VectoCore.Utils; using TUGraz.VectoCore.Utils;
using VectoMockupTest.TestData;
using Formatting = System.Xml.Formatting;
using XmlDocumentType = TUGraz.VectoCore.Utils.XmlDocumentType; using XmlDocumentType = TUGraz.VectoCore.Utils.XmlDocumentType;
namespace VectoMockupTest namespace VectoMockupTest
...@@ -343,94 +334,94 @@ namespace VectoMockupTest ...@@ -343,94 +334,94 @@ namespace VectoMockupTest
} }
[TestCase(Conventional_InterimBus, Conventional_StageInput, TestName = "ConventionalInterimBus")] //[TestCase(Conventional_InterimBus, Conventional_StageInput, TestName = "ConventionalInterimBus")]
public void InterimBusMockupTest(string vifInput, string stageInputFile) //public void InterimBusMockupTest(string vifInput, string stageInputFile)
{ //{
CopyInputFile(vifInput); // CopyInputFile(vifInput);
//SimulatorFactory.MockUpRun = mockup; // //SimulatorFactory.MockUpRun = mockup;
var multistageBusInput = _inputDataReader.Create(vifInput) as IMultistepBusInputDataProvider; // var multistageBusInput = _inputDataReader.Create(vifInput) as IMultistepBusInputDataProvider;
Assert.NotNull(multistageBusInput); // Assert.NotNull(multistageBusInput);
var stageInput = _inputDataReader.CreateDeclaration(stageInputFile); // var stageInput = _inputDataReader.CreateDeclaration(stageInputFile);
var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, vifInput); // var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, vifInput);
var sumWriter = new SummaryDataContainer(null); // var sumWriter = new SummaryDataContainer(null);
var jobContainer = new JobContainer(sumWriter); // var jobContainer = new JobContainer(sumWriter);
var inputData = new XMLDeclarationVIFInputData(multistageBusInput, stageInput.JobInputData.Vehicle); // var inputData = new XMLDeclarationVIFInputData(multistageBusInput, stageInput.JobInputData.Vehicle);
var _simulatorFactory = // var _simulatorFactory =
_simFactoryFactory.Factory(ExecutionMode.Declaration, inputData, fileWriter, null, null, true); // _simFactoryFactory.Factory(ExecutionMode.Declaration, inputData, fileWriter, null, null, true);
Clearfiles(fileWriter); // Clearfiles(fileWriter);
jobContainer.AddRuns(_simulatorFactory); // jobContainer.AddRuns(_simulatorFactory);
jobContainer.Execute(false); // jobContainer.Execute(false);
jobContainer.WaitFinished(); // jobContainer.WaitFinished();
CheckFileExists(fileWriter, checkMrf:false, checkCif: false, checkVif: true); // CheckFileExists(fileWriter, checkMrf:false, checkCif: false, checkVif: true);
} //}
[TestCase(Conventional_CompletedBus, TestName = "ConventionalCompletedBus")] //[TestCase(Conventional_CompletedBus, TestName = "ConventionalCompletedBus")]
public void CompletedBusMockupTest(string fileName) //public void CompletedBusMockupTest(string fileName)
{ //{
CopyInputFile(fileName); // CopyInputFile(fileName);
//SimulatorFactory.MockUpRun = mockup; // //SimulatorFactory.MockUpRun = mockup;
XMLDeclarationVIFInputData input = null!; // XMLDeclarationVIFInputData input = null!;
var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName); // var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName);
using (var reader = XmlReader.Create(fileName)) // using (var reader = XmlReader.Create(fileName))
{ // {
input = new XMLDeclarationVIFInputData(_inputDataReader.Create(fileName) as IMultistepBusInputDataProvider, null); // input = new XMLDeclarationVIFInputData(_inputDataReader.Create(fileName) as IMultistepBusInputDataProvider, null);
fileWriter = new FileOutputVIFWriter(fileName, input.MultistageJobInputData.JobInputData.ManufacturingStages.Count); // fileWriter = new FileOutputVIFWriter(fileName, input.MultistageJobInputData.JobInputData.ManufacturingStages.Count);
} // }
var sumWriter = new SummaryDataContainer(null); // var sumWriter = new SummaryDataContainer(null);
var jobContainer = new JobContainer(sumWriter); // var jobContainer = new JobContainer(sumWriter);
var _simulatorFactory = // var _simulatorFactory =
_simFactoryFactory.Factory(ExecutionMode.Declaration, input, fileWriter, null, null, true); // _simFactoryFactory.Factory(ExecutionMode.Declaration, input, fileWriter, null, null, true);
Clearfiles(fileWriter); // Clearfiles(fileWriter);
jobContainer.AddRuns(_simulatorFactory); // jobContainer.AddRuns(_simulatorFactory);
jobContainer.Execute(false); // jobContainer.Execute(false);
jobContainer.WaitFinished(); // jobContainer.WaitFinished();
CheckFileExists(fileWriter, checkCif: true, checkVif: false); // CheckFileExists(fileWriter, checkCif: true, checkVif: false);
} //}
[TestCase(CompleteDiesel, TestName="CompleteDiesel")] //[TestCase(CompleteDiesel, TestName="CompleteDiesel")]
[TestCase(CompleteExempted, TestName = "CompleteExempted Bus")] // [TestCase(CompleteExempted, TestName = "CompleteExempted Bus")]
[TestCase(CompleteExemptedWithoutTPMLM, TestName = "CompleteExempted No TPMLM")] // [TestCase(CompleteExemptedWithoutTPMLM, TestName = "CompleteExempted No TPMLM")]
public void PrimaryAndCompletedTest(string fileName) //public void PrimaryAndCompletedTest(string fileName)
{ //{
var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName); // var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName);
var sumWriter = new SummaryDataContainer(null); // var sumWriter = new SummaryDataContainer(null);
var jobContainer = new JobContainer(sumWriter); // var jobContainer = new JobContainer(sumWriter);
var input = JSONInputDataFactory.ReadJsonJob(fileName); // var input = JSONInputDataFactory.ReadJsonJob(fileName);
var _simulatorFactory = // var _simulatorFactory =
_simFactoryFactory.Factory(ExecutionMode.Declaration, input, fileWriter, null, null, true); // _simFactoryFactory.Factory(ExecutionMode.Declaration, input, fileWriter, null, null, true);
Clearfiles(fileWriter); // Clearfiles(fileWriter);
jobContainer.AddRuns(_simulatorFactory); // jobContainer.AddRuns(_simulatorFactory);
jobContainer.Execute(false); // jobContainer.Execute(false);
jobContainer.WaitFinished(); // jobContainer.WaitFinished();
CheckFileExists(fileWriter, checkCif: true, checkVif: true, checkMrf: true, checkPrimaryMrf: true); // CheckFileExists(fileWriter, checkCif: true, checkVif: true, checkMrf: true, checkPrimaryMrf: true);
} //}
[TestCase(InterimDiesel, TestName = "PrimaryAndInterim")] //[TestCase(InterimDiesel, TestName = "PrimaryAndInterim")]
public void PrimaryAndInterim(string fileName) //public void PrimaryAndInterim(string fileName)
{ //{
var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName); // var fileWriter = GetOutputFileWriter(TestContext.CurrentContext.Test.Name, fileName);
var sumWriter = new SummaryDataContainer(null); // var sumWriter = new SummaryDataContainer(null);
var jobContainer = new JobContainer(sumWriter); // var jobContainer = new JobContainer(sumWriter);
var input = JSONInputDataFactory.ReadJsonJob(fileName); // var input = JSONInputDataFactory.ReadJsonJob(fileName);
var _simulatorFactory = // var _simulatorFactory =
_simFactoryFactory.Factory(ExecutionMode.Declaration, input, fileWriter, null, null, true); // _simFactoryFactory.Factory(ExecutionMode.Declaration, input, fileWriter, null, null, true);
Clearfiles(fileWriter); // Clearfiles(fileWriter);
jobContainer.AddRuns(_simulatorFactory); // jobContainer.AddRuns(_simulatorFactory);
jobContainer.Execute(false); // jobContainer.Execute(false);
jobContainer.WaitFinished(); // jobContainer.WaitFinished();
CheckFileExists(fileWriter, checkCif: false, checkVif: true, checkMrf:false, checkPrimaryMrf:true); // 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_Tyres, Conventional_InterimBusInput, "Conventional", TestName = "Interim_Conventional_Bus_DifferentTyres")]
[TestCase(Conventional_PrimaryBus_AT_Angledrive, Conventional_InterimBusInput, "Conventional", TestName = "Interim_Conventional_Bus_AT_Angledrive")] [TestCase(Conventional_PrimaryBus_AT_Angledrive, Conventional_InterimBusInput, "Conventional", TestName = "Interim_Conventional_Bus_AT_Angledrive")]
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about