make testcases run after some refactoring

VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs

@@ -29,6 +29,7 @@
 *   Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
 */
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using TUGraz.VectoCommon.InputData;
@@ -66,16 +67,21 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 		private RetarderData _retarderData;
 		private PTOData _ptoTransmissionData;
 		private PTOData _municipalPtoTransmissionData;
+		private Exception InitException;
 
 		internal DeclarationModeVectoRunDataFactory(IDeclarationInputDataProvider dataProvider, IDeclarationReport report)
 		{
 			InputDataProvider = dataProvider;
 			Report = report;
 
+			try {
 				Initialize();
 				if (Report != null) {
 					InitializeReport();
 				}
+			} catch (Exception e) {
+				InitException = e;
+			}
 		}
 
 		private void Initialize()
@@ -124,6 +130,10 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 
 		public IEnumerable<VectoRunData> NextRun()
 		{
+			if (InitException != null) {
+				throw InitException;
+			}
+
 			foreach (var mission in _segment.Missions) {
 				if (mission.MissionType.IsEMS() &&
 					_engineData.RatedPowerDeclared.IsSmaller(DeclarationData.MinEnginePowerForEMS)) {

VectoCore/VectoCore/Utils/VectoCSVFile.cs

@@ -115,11 +115,12 @@ namespace TUGraz.VectoCore.Utils
 
 			try {
 				var fields = p.ReadFields();
-				if (fields != null) {
+				if (fields == null) {
+					throw new CSVReadException("CSV Read Error: File was empty.");
+				}
 				colsWithoutComment = fields
 					.Select(l => l.Contains(Comment) ? l.Substring(0, l.IndexOf(Comment, StringComparison.Ordinal)) : l)
 					.ToArray();
-				}
 			} catch (ArgumentNullException) {
 				throw new CSVReadException("CSV Read Error: File was empty.");
 			}

VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxShiftLossesTest.cs

@@ -108,6 +108,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			gbx.IdleController = new MockIdleController();
 
 			var init = gbx.Initialize(0.SI<NewtonMeter>(), preShiftRpm.RPMtoRad());
+			axleGear.Initialize(0.SI<NewtonMeter>(), preShiftRpm.RPMtoRad());
 
 			gbx.Gear = gear;
 
@@ -116,6 +117,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			var response = gbx.Request(absTime, dt, 0.SI<NewtonMeter>(), preShiftRpm.RPMtoRad());
 			axleGear.Request(absTime, dt, 0.SI<NewtonMeter>(), preShiftRpm.RPMtoRad());
 
+
 			Assert.IsInstanceOf<ResponseSuccess>(response);
 			container.CommitSimulationStep(absTime, dt);
 			absTime += dt;

VectoCore/VectoCoreTest/Models/SimulationComponentData/GearboxDataTest.cs

@@ -322,12 +322,13 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
 		public void TestFullLoadSorting()
 		{
 			var gbxFldString = new[] {
-				"600, 1000",
-				"2400, 2000",
-				"1000, 500"
+				"600, 1000, -100",
+				"2400, 2000, -120",
+				"1000, 500, -110"
 			};
 
-			var dataGbx = VectoCSVFile.ReadStream(InputDataHelper.InputDataAsStream("n [U/min],Mfull [Nm]", gbxFldString));
+			var dataGbx =
+				VectoCSVFile.ReadStream(InputDataHelper.InputDataAsStream("n [U/min],Mfull [Nm], Mdrag [Nm]", gbxFldString));
 			var gbxFld = FullLoadCurveReader.Create(dataGbx, true);
 
 			var maxTorque = gbxFld.FullLoadStationaryTorque(800.RPMtoRad());