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 12427ba3 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

make tests run, minor adaptations

parent 84cb3ee0
Branches
Tags
No related merge requests found
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
/// Returns the inport to connect it to another outport. /// Returns the inport to connect it to another outport.
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
IFvInPort InShaft(); IFvInPort InPort();
} }
/// <summary> /// <summary>
...@@ -21,6 +21,6 @@ ...@@ -21,6 +21,6 @@
/// Returns the outport to send requests to. /// Returns the outport to send requests to.
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
IFvOutPort OutShaft(); IFvOutPort OutPort();
} }
} }
\ No newline at end of file
...@@ -122,7 +122,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl ...@@ -122,7 +122,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
// connect cycle --> driver --> vehicle --> wheels --> axleGear --> gearBox --> retarder --> clutch // connect cycle --> driver --> vehicle --> wheels --> axleGear --> gearBox --> retarder --> clutch
cycle.InShaft().Connect(_driver.OutShaft()); cycle.InShaft().Connect(_driver.OutShaft());
_driver.InShaft().Connect(_vehicle.OutShaft()); _driver.InShaft().Connect(_vehicle.OutShaft());
_vehicle.InShaft().Connect(_wheels.OutShaft()); _vehicle.InPort().Connect(_wheels.OutPort());
_wheels.InShaft().Connect(_axleGear.OutShaft()); _wheels.InShaft().Connect(_axleGear.OutShaft());
_axleGear.InShaft().Connect(_gearBox.OutShaft()); _axleGear.InShaft().Connect(_gearBox.OutShaft());
_gearBox.InShaft().Connect(_retarder.OutShaft()); _gearBox.InShaft().Connect(_retarder.OutShaft());
......
...@@ -28,7 +28,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl ...@@ -28,7 +28,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
_previousState.Velocity = initialVelocity.SI<MeterPerSecond>(); _previousState.Velocity = initialVelocity.SI<MeterPerSecond>();
} }
public IFvInPort InShaft() public IFvInPort InPort()
{ {
return this; return this;
} }
......
...@@ -26,7 +26,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent ...@@ -26,7 +26,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var mockPort = new MockFvOutPort(); var mockPort = new MockFvOutPort();
vehicle.InShaft().Connect(mockPort); vehicle.InPort().Connect(mockPort);
var requestPort = vehicle.OutShaft(); var requestPort = vehicle.OutShaft();
......
...@@ -3,7 +3,9 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; ...@@ -3,7 +3,9 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
using TUGraz.VectoCore.Models.Simulation.Impl; using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Models.SimulationComponent; using TUGraz.VectoCore.Models.SimulationComponent;
using TUGraz.VectoCore.Models.SimulationComponent.Data; using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Factories;
using TUGraz.VectoCore.Models.SimulationComponent.Impl; using TUGraz.VectoCore.Models.SimulationComponent.Impl;
using TUGraz.VectoCore.Tests.Utils;
using TUGraz.VectoCore.Utils; using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Tests.Models.SimulationComponent namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
...@@ -17,7 +19,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent ...@@ -17,7 +19,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
public void WheelsRequestTest() public void WheelsRequestTest()
{ {
var container = new VehicleContainer(); var container = new VehicleContainer();
var vehicleData = VehicleData.ReadFromFile(VehicleDataFile); var vehicleData = EngineeringModeSimulationComponentFactory.Instance().CreateVehicleData(VehicleDataFile);
IWheels wheels = new Wheels(container, vehicleData.DynamicTyreRadius); IWheels wheels = new Wheels(container, vehicleData.DynamicTyreRadius);
var mockPort = new MockTnOutPort(); var mockPort = new MockTnOutPort();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment