From 12427ba351a7d88cf582279acf59b64b25c59da1 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Fri, 22 May 2015 12:36:56 +0200
Subject: [PATCH] make tests run, minor adaptations
---
VectoCore/Models/Connector/Ports/IRoadPortProvider.cs | 4 ++--
VectoCore/Models/Simulation/Impl/SimulatorFactory.cs | 4 ++--
VectoCore/Models/SimulationComponent/Impl/Vehicle.cs | 2 +-
VectoCoreTest/Models/SimulationComponent/VehicleTest.cs | 4 ++--
VectoCoreTest/Models/SimulationComponent/WheelsTest.cs | 4 +++-
5 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/VectoCore/Models/Connector/Ports/IRoadPortProvider.cs b/VectoCore/Models/Connector/Ports/IRoadPortProvider.cs
index 4a55c700dd..7bc3047afb 100644
--- a/VectoCore/Models/Connector/Ports/IRoadPortProvider.cs
+++ b/VectoCore/Models/Connector/Ports/IRoadPortProvider.cs
@@ -9,7 +9,7 @@
/// Returns the inport to connect it to another outport.
/// </summary>
/// <returns></returns>
- IFvInPort InShaft();
+ IFvInPort InPort();
}
/// <summary>
@@ -21,6 +21,6 @@
/// Returns the outport to send requests to.
/// </summary>
/// <returns></returns>
- IFvOutPort OutShaft();
+ IFvOutPort OutPort();
}
}
\ No newline at end of file
diff --git a/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs b/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
index 064d70baa2..d56f4ac81b 100644
--- a/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
+++ b/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
@@ -122,7 +122,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
// connect cycle --> driver --> vehicle --> wheels --> axleGear --> gearBox --> retarder --> clutch
cycle.InShaft().Connect(_driver.OutShaft());
_driver.InShaft().Connect(_vehicle.OutShaft());
- _vehicle.InShaft().Connect(_wheels.OutShaft());
+ _vehicle.InPort().Connect(_wheels.OutPort());
_wheels.InShaft().Connect(_axleGear.OutShaft());
_axleGear.InShaft().Connect(_gearBox.OutShaft());
_gearBox.InShaft().Connect(_retarder.OutShaft());
@@ -219,7 +219,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
}
var vehicleData = EngineeringModeSimulationComponentFactory.Instance().CreateVehicleData(vehicleFile);
- //VehicleData.ReadFromFile(vehicleFile);
+ //VehicleData.ReadFromFile(vehicleFile);
_vehicle = new Vehicle(_container, vehicleData);
}
diff --git a/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs b/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
index f2c0419099..4a987148b6 100644
--- a/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
+++ b/VectoCore/Models/SimulationComponent/Impl/Vehicle.cs
@@ -28,7 +28,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
_previousState.Velocity = initialVelocity.SI<MeterPerSecond>();
}
- public IFvInPort InShaft()
+ public IFvInPort InPort()
{
return this;
}
diff --git a/VectoCoreTest/Models/SimulationComponent/VehicleTest.cs b/VectoCoreTest/Models/SimulationComponent/VehicleTest.cs
index 89d14cd359..71fae28a04 100644
--- a/VectoCoreTest/Models/SimulationComponent/VehicleTest.cs
+++ b/VectoCoreTest/Models/SimulationComponent/VehicleTest.cs
@@ -20,13 +20,13 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
var container = new VehicleContainer();
var vehicleData = EngineeringModeSimulationComponentFactory.Instance().CreateVehicleData(VehicleDataFile);
- //VehicleData.ReadFromFile(VehicleDataFile);
+ //VehicleData.ReadFromFile(VehicleDataFile);
//vehicleData.CrossWindCorrection = VehicleData.CrossWindCorrectionMode.NoCorrection;
var vehicle = new Vehicle(container, vehicleData, 17.210535);
var mockPort = new MockFvOutPort();
- vehicle.InShaft().Connect(mockPort);
+ vehicle.InPort().Connect(mockPort);
var requestPort = vehicle.OutShaft();
diff --git a/VectoCoreTest/Models/SimulationComponent/WheelsTest.cs b/VectoCoreTest/Models/SimulationComponent/WheelsTest.cs
index d3c4333fd1..8d5c1056c1 100644
--- a/VectoCoreTest/Models/SimulationComponent/WheelsTest.cs
+++ b/VectoCoreTest/Models/SimulationComponent/WheelsTest.cs
@@ -3,7 +3,9 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Models.SimulationComponent;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using TUGraz.VectoCore.Models.SimulationComponent.Factories;
using TUGraz.VectoCore.Models.SimulationComponent.Impl;
+using TUGraz.VectoCore.Tests.Utils;
using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
@@ -17,7 +19,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
public void WheelsRequestTest()
{
var container = new VehicleContainer();
- var vehicleData = VehicleData.ReadFromFile(VehicleDataFile);
+ var vehicleData = EngineeringModeSimulationComponentFactory.Instance().CreateVehicleData(VehicleDataFile);
IWheels wheels = new Wheels(container, vehicleData.DynamicTyreRadius);
var mockPort = new MockTnOutPort();
--
GitLab