make tests run, minor adaptations

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

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);
 			}
 

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;
 		}

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();
 

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();