This site uses cookies. Visit our cookies policy page or click the link in any footer for more information and to change your preferences.

Accept all cookies Accept only essential cookies

Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

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

Updated Testcases to use factory method

parent ab1df824
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
+ 61
− 24
View file @ 4834ccad
...@@ -10,6 +10,7 @@ using Newtonsoft.Json; ...@@ -10,6 +10,7 @@ using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using Ninject; using Ninject;
using Ninject.Planning.Bindings.Resolvers; using Ninject.Planning.Bindings.Resolvers;
using NLog.LayoutRenderers;
using NUnit.Framework; using NUnit.Framework;
using TUGraz.VECTO; using TUGraz.VECTO;
using TUGraz.VectoCommon.BusAuxiliaries; using TUGraz.VectoCommon.BusAuxiliaries;
...@@ -108,10 +109,15 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus ...@@ -108,10 +109,15 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
var inputData = CompletedVIF.CreateCompletedVif( var inputData = CompletedVIF.CreateCompletedVif(
JSONInputDataFactory.ReadJsonJob(JobFile_Group41) as JSONInputDataCompletedBusFactorMethodV7, JSONInputDataFactory.ReadJsonJob(JobFile_Group41) as JSONInputDataCompletedBusFactorMethodV7,
xmlInputReader); xmlInputReader);
var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, inputData, writer, validate: false);
factory.WriteModalResults = true;
var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, inputData, writer); //var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, writer)
factory.WriteModalResults = true; //ActualModalData = true, //{
factory.Validate = false; // WriteModalResults = true,
// //ActualModalData = true,
// Validate = false
//};
//var sumContainer = new SummaryDataContainer(writer); //var sumContainer = new SummaryDataContainer(writer);
//var jobContainer = new JobContainer(sumContainer); //var jobContainer = new JobContainer(sumContainer);
...@@ -1035,10 +1041,14 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus ...@@ -1035,10 +1041,14 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
} }
} }
} }
var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, inputData, writer, validate: false);
factory.WriteModalResults = true;
//var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, writer) {
// WriteModalResults = true,
var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, inputData, writer); // //ActualModalData = true,
factory.WriteModalResults = true; //ActualModalData = true, // Validate = false
factory.Validate = false; //};
var runs = factory.DataReader.NextRun().ToList(); var runs = factory.DataReader.NextRun().ToList();
return runs; return runs;
...@@ -1066,10 +1076,13 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus ...@@ -1066,10 +1076,13 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
break; break;
} }
} }
var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, inputData, writer, validate: false);
var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, inputData, writer); factory.WriteModalResults = true;
factory.WriteModalResults = true; //ActualModalData = true, //var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, writer) {
factory.Validate = false; // WriteModalResults = true,
// //ActualModalData = true,
// Validate = false
//};
var jobContainer = new JobContainer(new SummaryDataContainer(writer)); var jobContainer = new JobContainer(new SummaryDataContainer(writer));
//var runs = factory.SimulationRuns().ToArray(); //var runs = factory.SimulationRuns().ToArray();
...@@ -1102,9 +1115,14 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus ...@@ -1102,9 +1115,14 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
var inputData = Path.GetExtension(relativeJobPath) == ".xml" var inputData = Path.GetExtension(relativeJobPath) == ".xml"
? xmlInputReader.CreateDeclaration(relativeJobPath) ? xmlInputReader.CreateDeclaration(relativeJobPath)
: JSONInputDataFactory.ReadJsonJob(relativeJobPath); : JSONInputDataFactory.ReadJsonJob(relativeJobPath);
var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, inputData, writer);
factory.WriteModalResults = true; //ActualModalData = true, var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, inputData, writer, validate: false);
factory.Validate = false; factory.WriteModalResults = true;
//var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, writer) {
// WriteModalResults = true,
// //ActualModalData = true,
// Validate = false
//};
var jobContainer = new JobContainer(new SummaryDataContainer(writer)); var jobContainer = new JobContainer(new SummaryDataContainer(writer));
//var runs = factory.SimulationRuns().ToArray(); //var runs = factory.SimulationRuns().ToArray();
...@@ -1143,9 +1161,14 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus ...@@ -1143,9 +1161,14 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
var inputData = Path.GetExtension(relativeJobPath) == ".xml" var inputData = Path.GetExtension(relativeJobPath) == ".xml"
? xmlInputReader.CreateDeclaration(relativeJobPath) ? xmlInputReader.CreateDeclaration(relativeJobPath)
: JSONInputDataFactory.ReadJsonJob(relativeJobPath); : JSONInputDataFactory.ReadJsonJob(relativeJobPath);
var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, inputData, writer);
factory.WriteModalResults = true; //ActualModalData = true, var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, inputData, writer, validate:false);
factory.Validate = false; factory.WriteModalResults = true;
//var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, writer) {
// WriteModalResults = true,
// //ActualModalData = true,
// Validate = false
//};
var jobContainer = new JobContainer(new SummaryDataContainer(writer)); var jobContainer = new JobContainer(new SummaryDataContainer(writer));
var runs = factory.SimulationRuns().ToArray(); var runs = factory.SimulationRuns().ToArray();
...@@ -1184,9 +1207,12 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus ...@@ -1184,9 +1207,12 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
//var inputData = new MockCompletedBusInputData(XmlReader.Create(PifFile_33_34), modified); //var inputData = new MockCompletedBusInputData(XmlReader.Create(PifFile_33_34), modified);
//var inputData = new MockCompletedBusInputData(modified); //var inputData = new MockCompletedBusInputData(modified);
var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, new XMLDeclarationVIFInputData(completedVif as IMultistageBusInputDataProvider, null), writer); var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, new XMLDeclarationVIFInputData(completedVif as IMultistageBusInputDataProvider, null), writer, validate: false);
factory.WriteModalResults = true; factory.WriteModalResults = true;
factory.Validate = false; //var factory = new SimulatorFactory(ExecutionMode.Declaration, new XMLDeclarationVIFInputData(completedVif as IMultistageBusInputDataProvider, null), writer) {
// WriteModalResults = true,
// Validate = false
//};
var runs = factory.DataReader.NextRun().ToList(); var runs = factory.DataReader.NextRun().ToList();
var run = runs[runIdx]; var run = runs[runIdx];
...@@ -1216,9 +1242,15 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus ...@@ -1216,9 +1242,15 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
var modifiedCompleted = xmlInputReader.CreateDeclaration(XmlReader.Create(new StringReader(modified))); var modifiedCompleted = xmlInputReader.CreateDeclaration(XmlReader.Create(new StringReader(modified)));
var inputData = new MockSingleBusInputDataProvider(primary.JobInputData.Vehicle, modifiedCompleted.JobInputData.Vehicle); var inputData = new MockSingleBusInputDataProvider(primary.JobInputData.Vehicle, modifiedCompleted.JobInputData.Vehicle);
var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, inputData, null); var factory =
factory.WriteModalResults = true; //ActualModalData = true, SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, inputData, null, validate: false);
factory.Validate = false; factory.WriteModalResults = true;
//var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, null) {
// WriteModalResults = true,
// //ActualModalData = true,
// Validate = false
//};
var runs = factory.DataReader.NextRun().ToList(); var runs = factory.DataReader.NextRun().ToList();
var run = runs[runIdx]; var run = runs[runIdx];
...@@ -1308,9 +1340,14 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus ...@@ -1308,9 +1340,14 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
var inputData = Path.GetExtension(relativeJobPath) == ".xml" var inputData = Path.GetExtension(relativeJobPath) == ".xml"
? xmlInputReader.CreateDeclaration(relativeJobPath) ? xmlInputReader.CreateDeclaration(relativeJobPath)
: JSONInputDataFactory.ReadJsonJob(relativeJobPath); : JSONInputDataFactory.ReadJsonJob(relativeJobPath);
var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, inputData, writer);
factory.WriteModalResults = true; //ActualModalData = true, var factory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, inputData, writer, validate: false);
factory.Validate = false; factory.WriteModalResults = true;
//var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, writer) {
// WriteModalResults = true,
// //ActualModalData = true,
// Validate = false
//};
var jobContainer = new JobContainer(new SummaryDataContainer(writer)); var jobContainer = new JobContainer(new SummaryDataContainer(writer));
var runs = factory.SimulationRuns().ToArray(); var runs = factory.SimulationRuns().ToArray();
......
VectoCore/VectoCoreTest/Integration/XMLReportTest.cs
+ 39
− 14
View file @ 4834ccad
...@@ -88,9 +88,13 @@ namespace TUGraz.VectoCore.Tests.Integration ...@@ -88,9 +88,13 @@ namespace TUGraz.VectoCore.Tests.Integration
File.Delete(writer.SumFileName); File.Delete(writer.SumFileName);
} }
var runsFactory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, dataProvider, writer, xmlReport); var runsFactory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, dataProvider, writer,
xmlReport, validate: false);
runsFactory.WriteModalResults = false; runsFactory.WriteModalResults = false;
runsFactory.Validate = false; //var runsFactory = new SimulatorFactory(ExecutionMode.Declaration, dataProvider, writer, xmlReport) {
// WriteModalResults = false,
// Validate = false,
//};
jobContainer.AddRuns(runsFactory); jobContainer.AddRuns(runsFactory);
// no need to run the simulation, we only check whether the meta-data is correct, no results are considered // no need to run the simulation, we only check whether the meta-data is correct, no results are considered
...@@ -138,9 +142,14 @@ namespace TUGraz.VectoCore.Tests.Integration ...@@ -138,9 +142,14 @@ namespace TUGraz.VectoCore.Tests.Integration
var sumData = new SummaryDataContainer(writer); var sumData = new SummaryDataContainer(writer);
var jobContainer = new JobContainer(sumData); var jobContainer = new JobContainer(sumData);
var runsFactory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, dataProvider, writer, xmlReport); var runsFactory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, dataProvider, writer,
xmlReport, validate: false);
runsFactory.WriteModalResults = false; runsFactory.WriteModalResults = false;
runsFactory.Validate = false; //var runsFactory = new SimulatorFactory(ExecutionMode.Declaration, dataProvider, writer, xmlReport)
// {
// WriteModalResults = false,
// Validate = false,
// };
jobContainer.AddRuns(runsFactory); jobContainer.AddRuns(runsFactory);
// no need to run the simulation, we only check whether the meta-data is correct, no results are considered // no need to run the simulation, we only check whether the meta-data is correct, no results are considered
...@@ -168,9 +177,13 @@ namespace TUGraz.VectoCore.Tests.Integration ...@@ -168,9 +177,13 @@ namespace TUGraz.VectoCore.Tests.Integration
File.Delete(writer.SumFileName); File.Delete(writer.SumFileName);
} }
var runsFactory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, dataProvider, writer, xmlReport); var runsFactory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, dataProvider, writer,
xmlReport, validate: false);
runsFactory.WriteModalResults = false; runsFactory.WriteModalResults = false;
runsFactory.Validate = false; //var runsFactory = new SimulatorFactory(ExecutionMode.Declaration, dataProvider, writer, xmlReport) {
// WriteModalResults = false,
// Validate = false,
//};
jobContainer.AddRuns(runsFactory); jobContainer.AddRuns(runsFactory);
jobContainer.Execute(); jobContainer.Execute();
...@@ -254,9 +267,13 @@ namespace TUGraz.VectoCore.Tests.Integration ...@@ -254,9 +267,13 @@ namespace TUGraz.VectoCore.Tests.Integration
var dataProvider = xmlInputReader.CreateDeclaration(modified); var dataProvider = xmlInputReader.CreateDeclaration(modified);
var runsFactory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, dataProvider, writer, xmlReport); var runsFactory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, dataProvider, writer,
xmlReport, validate: false);
runsFactory.WriteModalResults = false; runsFactory.WriteModalResults = false;
runsFactory.Validate = false; //var runsFactory = new SimulatorFactory(ExecutionMode.Declaration, dataProvider, writer, xmlReport) {
// WriteModalResults = false,
// Validate = false,
//};
jobContainer.AddRuns(runsFactory); jobContainer.AddRuns(runsFactory);
xmlReport.DoWriteReport(); xmlReport.DoWriteReport();
...@@ -287,9 +304,13 @@ namespace TUGraz.VectoCore.Tests.Integration ...@@ -287,9 +304,13 @@ namespace TUGraz.VectoCore.Tests.Integration
File.Delete(writer.SumFileName); File.Delete(writer.SumFileName);
} }
var runsFactory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, dataProvider, writer, xmlReport); var runsFactory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, dataProvider, writer,
xmlReport, validate: false);
runsFactory.WriteModalResults = false; runsFactory.WriteModalResults = false;
runsFactory.Validate = false; //var runsFactory = new SimulatorFactory(ExecutionMode.Declaration, dataProvider, writer, xmlReport) {
// WriteModalResults = false,
// Validate = false,
//};
jobContainer.AddRuns(runsFactory); jobContainer.AddRuns(runsFactory);
// no need to run the simulation, we only check whether the meta-data is correct, no results are considered // no need to run the simulation, we only check whether the meta-data is correct, no results are considered
...@@ -332,9 +353,13 @@ namespace TUGraz.VectoCore.Tests.Integration ...@@ -332,9 +353,13 @@ namespace TUGraz.VectoCore.Tests.Integration
File.Delete(writer.SumFileName); File.Delete(writer.SumFileName);
} }
var runsFactory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, dataProvider, writer, xmlReport); var runsFactory = SimulatorFactory.CreateSimulatorFactory(ExecutionMode.Declaration, dataProvider, writer,
xmlReport, validate: false);
runsFactory.WriteModalResults = false; runsFactory.WriteModalResults = false;
runsFactory.Validate = false; //var runsFactory = new SimulatorFactory(ExecutionMode.Declaration, dataProvider, writer, xmlReport) {
// WriteModalResults = false,
// Validate = false,
//};
jobContainer.AddRuns(runsFactory); jobContainer.AddRuns(runsFactory);
// no need to run the simulation, we only check whether the meta-data is correct, no results are considered // no need to run the simulation, we only check whether the meta-data is correct, no results are considered
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

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