From fb1d476290d2151fa1ab33e680cf756c7260edd2 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 16 Jan 2020 16:52:32 +0100
Subject: [PATCH] adding test for medium lorries
---
VectoCommon/VectoHashing/VectoHash.cs | 2 +-
VectoCore/VectoCoreTest/VectoCoreTest.csproj | 3 +++
.../XML/XMLDeclarationReaderVersionsTest.cs | 26 +++++++++++++++++++
3 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/VectoCommon/VectoHashing/VectoHash.cs b/VectoCommon/VectoHashing/VectoHash.cs
index 68a3870c82..2a6a8d2218 100644
--- a/VectoCommon/VectoHashing/VectoHash.cs
+++ b/VectoCommon/VectoHashing/VectoHash.cs
@@ -256,7 +256,7 @@ namespace TUGraz.VectoHashing
node.Attributes.Append(attr);
}
- query = component == VectoComponents.VectoCustomerInformation || component == VectoComponents.VectoOutput
+ query = component.IsReport()
? string.Format("*/*[local-name()='Data']/*[local-name()='ApplicationInformation']/*[local-name()='Date']")
: string.Format("*/*[local-name()='{0}']/*/*[local-name()='Date']", component.XMLElementName());
var dateNode = Document.SelectSingleNode(query);
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index f6c78db402..10aabe6866 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -3581,6 +3581,9 @@
<Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.3\vehicle_sampleDualModeDualFuel.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-medium_lorry.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-primary_heavyBus.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
index e05bb981ec..2e775ccb16 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
@@ -4,10 +4,12 @@ using System.Xml;
using Ninject;
using NUnit.Framework;
using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCore.InputData.FileIO.JSON;
using TUGraz.VectoCore.InputData.FileIO.XML;
using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.OutputData.FileIO;
+using TUGraz.VectoCore.Tests.Models.Simulation;
namespace TUGraz.VectoCore.Tests.XML
{
@@ -83,6 +85,30 @@ namespace TUGraz.VectoCore.Tests.XML
}
+
+ [TestCase()]
+ public void CreateRunDataMediumLorry()
+ {
+ var runIdx = 0;
+ var jobFile = @"TestData\XML\XMLReaderDeclaration\SchemaVersion2.6_Buses\vecto_vehicle-medium_lorry.xml";
+
+ var writer = new FileOutputWriter(jobFile);
+ var inputData = xmlInputReader.CreateDeclaration(jobFile);
+
+ var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, writer) {
+ WriteModalResults = true,
+ //ActualModalData = true,
+ Validate = false
+ };
+ var jobContainer = new JobContainer(new MockSumWriter());
+
+ var runs = factory.SimulationRuns().ToArray();
+ //jobContainer.AddRun(runs[runIdx]);
+ runs[runIdx].Run();
+
+ Assert.IsTrue(runs[runIdx].FinishedWithoutErrors);
+ }
+
public IVectoRun[] ReadDeclarationJob(string jobfile)
{
--
GitLab