From 7c16c0ed0dd2f9475c7ed4fef2caa361d628a87a Mon Sep 17 00:00:00 2001
From: Raphael Kalchgruber <kalchgruber@ivt.tugraz.at>
Date: Thu, 6 Oct 2022 12:37:44 +0200
Subject: [PATCH] Change of constructer call to newer version
---
.../OutputData/XML/XMLDeclarationReportFactory.cs | 2 +-
VectoCore/VectoCoreTest/Integration/XMLReportTest.cs | 10 +++++-----
.../DeclarationAdapterCreateVocationalVehicleTest.cs | 5 +++--
VectoCore/VectoCoreTest/Reports/SumWriterTest.cs | 2 +-
VectoMockup/VectoMockup/Reports/MockupReportFactory.cs | 2 +-
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportFactory.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportFactory.cs
index 83dca383fa..9e3fe51470 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportFactory.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportFactory.cs
@@ -36,7 +36,7 @@ namespace TUGraz.VectoCore.OutputData.XML
case IMultistepBusInputDataProvider multistageBusInputDataProvider:
break;
case ISingleBusInputDataProvider singleBusInputDataProvider:
- return new XMLDeclarationReport(outputWriter);
+ return new XMLDeclarationReport(outputWriter, _mrfFactory, _cifFactory);
case IDeclarationInputDataProvider declarationInputDataProvider:
return CreateDeclarationReport(declarationInputDataProvider, outputWriter);
case IMultiStageTypeInputData multiStageTypeInputData:
diff --git a/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs b/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs
index fd1b61be5c..5d86a844a6 100644
--- a/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs
@@ -140,7 +140,7 @@ namespace TUGraz.VectoCore.Tests.Integration
{
var dataProvider = xmlInputReader.CreateDeclaration(jobfile);
var writer = new FileOutputWriter(jobfile);
- var xmlReport = new XMLDeclarationReport(writer);
+ var xmlReport = new XMLDeclarationReport(writer, _kernel.Get<IManufacturerReportFactory>(), _kernel.Get<ICustomerInformationFileFactory>());
var sumData = new SummaryDataContainer(writer);
var jobContainer = new JobContainer(sumData);
@@ -171,7 +171,7 @@ namespace TUGraz.VectoCore.Tests.Integration
{
var dataProvider = xmlInputReader.CreateDeclaration(jobfile);
var writer = new FileOutputWriter(InputDataHelper.GetRandomFilename(jobfile));
- var xmlReport = new XMLDeclarationReport(writer);
+ var xmlReport = new XMLDeclarationReport(writer, _kernel.Get<IManufacturerReportFactory>(), _kernel.Get<ICustomerInformationFileFactory>());
var sumData = new SummaryDataContainer(writer);
var jobContainer = new JobContainer(sumData);
@@ -263,7 +263,7 @@ namespace TUGraz.VectoCore.Tests.Integration
var modified = XmlReader.Create(new StringReader(nav.OuterXml));
var writer = new FileOutputWriter(InputDataHelper.GetRandomFilename(jobfile));
- var xmlReport = new XMLDeclarationReport(writer);
+ var xmlReport = new XMLDeclarationReport(writer, _kernel.Get<IManufacturerReportFactory>(), _kernel.Get<ICustomerInformationFileFactory>());
var sumData = new SummaryDataContainer(writer);
var jobContainer = new JobContainer(sumData);
@@ -298,7 +298,7 @@ namespace TUGraz.VectoCore.Tests.Integration
var jobfile = @"Testdata\XML\XMLReaderDeclaration\vecto_vehicle-sample.xml";
var dataProvider = xmlInputReader.CreateDeclaration(jobfile);
var writer = new FileOutputWriter(InputDataHelper.GetRandomFilename(jobfile));
- var xmlReport = new XMLDeclarationReport(writer);
+ var xmlReport = new XMLDeclarationReport(writer, _kernel.Get<IManufacturerReportFactory>(), _kernel.Get<ICustomerInformationFileFactory>());
var sumData = new SummaryDataContainer(writer);
var jobContainer = new JobContainer(sumData);
@@ -347,7 +347,7 @@ namespace TUGraz.VectoCore.Tests.Integration
var jobfile = @"Testdata\XML\XMLReaderDeclaration\SchemaVersion2.4/vecto_vehicle-primary_heavyBus-sample.xml";
var dataProvider = xmlInputReader.CreateDeclaration(jobfile);
var writer = new FileOutputWriter(jobfile);
- var xmlReport = new XMLDeclarationReport(writer);
+ var xmlReport = new XMLDeclarationReport(writer, _kernel.Get<IManufacturerReportFactory>(), _kernel.Get<ICustomerInformationFileFactory>());
var sumData = new SummaryDataContainer(writer);
var jobContainer = new JobContainer(sumData);
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationAdapterCreateVocationalVehicleTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationAdapterCreateVocationalVehicleTest.cs
index e753236797..e9dd6fa603 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationAdapterCreateVocationalVehicleTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationAdapterCreateVocationalVehicleTest.cs
@@ -11,6 +11,8 @@ using TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory;
using TUGraz.VectoCore.OutputData;
using TUGraz.VectoCore.OutputData.FileIO;
using TUGraz.VectoCore.OutputData.XML;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformationFile.CustomerInformationFile_0_9;
+using TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport.ManufacturerReport_0_9.ManufacturerReportXMLTypeWriter;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Tests.Models.Declaration.DataAdapter
@@ -57,10 +59,9 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration.DataAdapter
var dataProvider = xmlInputReader.CreateDeclaration(modified);
var writer = new FileOutputWriter(jobfile);
- var xmlReport = new XMLDeclarationReport(writer);
+ var xmlReport = new XMLDeclarationReport(writer, _kernel.Get<IManufacturerReportFactory>(), _kernel.Get<ICustomerInformationFileFactory>());
var sumData = new SummaryDataContainer(null);
var jobContainer = new JobContainer(sumData);
-
var runsFactory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, dataProvider, null, xmlReport);
runsFactory.WriteModalResults = false;
runsFactory.Validate = false;
diff --git a/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs b/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
index b69a0c9d9a..5be8914e8e 100644
--- a/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
+++ b/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
@@ -230,7 +230,7 @@ namespace TUGraz.VectoCore.Tests.Reports
var jobfile = @"Testdata\XML\XMLReaderDeclaration\vecto_vehicle-sample.xml";
var dataProvider = xmlInputReader.CreateDeclaration(jobfile);
var writer = new FileOutputWriter(jobfile);
- var xmlReport = new XMLDeclarationReport(writer);//;, _kernel.Get<IManufacturerReportFactory>(), _kernel.Get<ICustomerInformationFileFactory>());
+ var xmlReport = new XMLDeclarationReport(writer, _kernel.Get<IManufacturerReportFactory>(), _kernel.Get<ICustomerInformationFileFactory>());
var sumData = new SummaryDataContainer(writer);
var jobContainer = new JobContainer(sumData);
diff --git a/VectoMockup/VectoMockup/Reports/MockupReportFactory.cs b/VectoMockup/VectoMockup/Reports/MockupReportFactory.cs
index 47c97e1f1e..9f6d8f16f2 100644
--- a/VectoMockup/VectoMockup/Reports/MockupReportFactory.cs
+++ b/VectoMockup/VectoMockup/Reports/MockupReportFactory.cs
@@ -41,7 +41,7 @@ namespace TUGraz.VectoMockup.Reports
case IMultistepBusInputDataProvider multistageBusInputDataProvider:
break;
case ISingleBusInputDataProvider singleBusInputDataProvider:
- return new XMLDeclarationReport(outputWriter);
+ return new XMLDeclarationReport(outputWriter, _mrfFactory, _cifFactory);
case IDeclarationInputDataProvider declarationInputDataProvider:
return CreateDeclarationReport(declarationInputDataProvider, outputWriter);
case IMultiStageTypeInputData multiStageTypeInputData:
--
GitLab