Removed reference to VECTO project from VectoCoreTest

VectoCore/VectoCoreTest/Models/SimulationComponent/ATGearboxTest.cs

@@ -33,7 +33,6 @@ using System.Collections.Generic;
 using NUnit.Framework;
 using System.IO;
 using System.Linq;
-using TUGraz.VECTO;
 using TUGraz.VectoCommon.Exceptions;
 using TUGraz.VectoCommon.InputData;
 using TUGraz.VectoCommon.Models;
@@ -277,7 +276,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 				vehicleInput, engineInput.EngineModes.First(),
 				mission); //(engineInput, null, gearboxInput, new List<ITorqueLimitInputData>());
 			return dao.CreateGearboxData(
-				new MockVehicleInputData() {
+				new MockDeclarationVehicleInputData() {
 					Components = new MockComponents() {
 						GearboxInputData = gearboxInput,
 						TorqueConverterInputData = (ITorqueConverterDeclarationInputData)gearboxInput,

VectoCore/VectoCoreTest/Models/SimulationComponent/BatteryTest.cs

@@ -3,8 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using NUnit.Framework;
-using TUGraz.VECTO;
-using TUGraz.VectoCommon.InputData;
 using TUGraz.VectoCommon.Utils;
 using TUGraz.VectoCore.InputData.FileIO.JSON;
 using TUGraz.VectoCore.InputData.Reader.ComponentData;

VectoCore/VectoCoreTest/Utils/MockBatteryInputData.cs

 using System.Collections.Generic;
 using System.Linq;
-using TUGraz.VECTO;
 using TUGraz.VectoCommon.InputData;
 
 namespace TUGraz.VectoCore.Tests.Utils {

VectoCore/VectoCoreTest/Utils/MockComponents.cs

+using TUGraz.VectoCommon.InputData;
+
+namespace TUGraz.VectoCore.Tests.Utils
+{
+	public class MockComponents : IVehicleComponentsDeclaration
+	{
+		public IAirdragDeclarationInputData AirdragInputData { get; set; }
+
+		public IGearboxDeclarationInputData GearboxInputData { get; set; }
+
+		public ITorqueConverterDeclarationInputData TorqueConverterInputData { get; set; }
+
+		public IAxleGearInputData AxleGearInputData { get; set; }
+
+		public IAngledriveInputData AngledriveInputData { get; set; }
+
+		public IEngineDeclarationInputData EngineInputData { get; set; }
+
+		public IAuxiliariesDeclarationInputData AuxiliaryInputData { get; set; }
+
+		public IRetarderInputData RetarderInputData { get; set; }
+
+		public IPTOTransmissionInputData PTOTransmissionInputData { get; set; }
+
+		public IAxlesDeclarationInputData AxleWheels { get; set; }
+
+		public IBusAuxiliariesDeclarationData BusAuxiliaries { get; }
+
+		public IElectricStorageSystemDeclarationInputData ElectricStorage { get; }
+
+		public IElectricMachinesDeclarationInputData ElectricMachines { get; }
+
+		public IIEPCDeclarationInputData IEPC { get; }
+	}
+}
\ No newline at end of file

VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs

@@ -8,7 +8,7 @@ using TUGraz.VectoCommon.Utils;
 using TUGraz.VectoCore.Models.SimulationComponent.Impl;
 
 namespace TUGraz.VectoCore.Tests.Utils {
-	public class MockDeclarationVehicleInputData : IVehicleDeclarationInputData, IVehicleComponentsDeclaration
+	public class MockDeclarationVehicleInputData : IVehicleDeclarationInputData
 	{
 		#region Implementation of IComponentInputData
 
@@ -34,7 +34,13 @@ namespace TUGraz.VectoCore.Tests.Utils {
 		public AxleConfiguration AxleConfiguration { get; }
 		public Kilogram CurbMassChassis { get; }
 		public Kilogram GrossVehicleMassRating { get; }
-		public IList<ITorqueLimitInputData> TorqueLimits => new List<ITorqueLimitInputData>();
+
+		private IList<ITorqueLimitInputData> _torqueLimits;
+		public IList<ITorqueLimitInputData> TorqueLimits {
+			get => _torqueLimits ??= new List<ITorqueLimitInputData>();
+			init => _torqueLimits = value;
+		}
+
 		public string ManufacturerAddress { get; }
 		public PerSecond EngineIdleSpeed { get; }
 		public bool VocationalVehicle { get; }
@@ -67,7 +73,7 @@ namespace TUGraz.VectoCore.Tests.Utils {
 		public Dictionary<PowertrainPosition, List<Tuple<Volt, TableData>>> ElectricMotorTorqueLimits { get; }
 		public TableData BoostingLimitations { get; }
 
-		public IVehicleComponentsDeclaration Components => this;
+		public IVehicleComponentsDeclaration Components { get; set; }
 		public XmlNode XMLSource { get; }
 		public string VehicleTypeApprovalNumber { get; }
 		public ArchitectureID ArchitectureID { get; }

VectoCore/VectoCoreTest/VectoCoreTest.csproj

@@ -19,7 +19,6 @@
     <ProjectReference Include="..\..\VectoCommon\VectoCommon\VectoCommon.csproj" />
     <ProjectReference Include="..\..\VectoCommon\VectoHashing\VectoHashing.csproj" />
     <ProjectReference Include="..\VectoCore\VectoCore.csproj" />
-    <ProjectReference Include="..\..\VECTO\VECTO.vbproj" />
   </ItemGroup>
 
   <ItemGroup>