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

Skip to content
Snippets Groups Projects
Commit 7c16c0ed authored by Raphael Kalchgruber's avatar Raphael Kalchgruber
Browse files

Change of constructer call to newer version

parent f40bf8aa
No related branches found
No related tags found
No related merge requests found
......@@ -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:
......
......@@ -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);
......
......@@ -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;
......
......@@ -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);
......
......@@ -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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment