diff --git a/VectoCommon/VectoHashingTest/VectoHashingTest.csproj b/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
index 8ad7e49f62322c1bd92a3ef9c69b981b25e20852..d54961e3a2523de86469ed91b4b9f771480cc264 100644
--- a/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
+++ b/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
@@ -59,11 +59,7 @@
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
</ItemGroup>
</When>
- <Otherwise>
- <ItemGroup>
- <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
- </ItemGroup>
- </Otherwise>
+ <Otherwise />
</Choose>
<ItemGroup>
<Compile Include="BasicHasingTests.cs" />
diff --git a/VectoCore/ModelbasedTests/ModelbasedTests.csproj b/VectoCore/ModelbasedTests/ModelbasedTests.csproj
index 462af3d9a3789f009a8dcebbc14fe45669a9ebdf..a85692a8c63b0699f6c1e3f6c26dc643f0ff9774 100644
--- a/VectoCore/ModelbasedTests/ModelbasedTests.csproj
+++ b/VectoCore/ModelbasedTests/ModelbasedTests.csproj
@@ -59,11 +59,7 @@
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
</ItemGroup>
</When>
- <Otherwise>
- <ItemGroup>
- <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
- </ItemGroup>
- </Otherwise>
+ <Otherwise />
</Choose>
<ItemGroup>
<Compile Include="DriverStrategy\CoastingTests.cs" />
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class9.cs b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class9.cs
index e4fb26bf92fbb81e19c590130aa08f53da66d334..0970b8fbebfff4c2b875560faa0388a6ef5813a7 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class9.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class9.cs
@@ -29,189 +29,182 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-using System.Linq;
-using NUnit.Framework;
-using TUGraz.VectoCommon.InputData;
-using TUGraz.VectoCommon.Models;
-using TUGraz.VectoCore.InputData.FileIO.JSON;
-using TUGraz.VectoCore.InputData.Reader.Impl;
-using TUGraz.VectoCore.Models.Declaration;
-using TUGraz.VectoCore.Models.Simulation.Data;
-using TUGraz.VectoCore.Models.SimulationComponent.Data;
-using Assert = Microsoft.VisualStudio.TestTools.UnitTesting.Assert;
-
-namespace TUGraz.VectoCore.Tests.Models.Declaration.DataAdapter
-{
- [TestFixture]
- public class DeclarationDataAdapterTest_Class9
- {
- public const string Class9RigidTruckJob =
- @"TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Class9_RigidTruck_DECL.vecto";
-
- public const int CurbWeight = 9300;
- public const double CdxA = 5.2;
-
- [TestCase(Class9RigidTruckJob, 0)]
- public void TestClass9_Vehicle_LongHaul_LowLoad(string file, int runIdx)
- {
- var runData = DeclarationAdapterTestHelper.CreateVectoRunData(file);
-
- Assert.AreEqual(10, runData.Length);
-
- // long haul, min load
- DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData, runData[runIdx].AirdragData,
- vehicleCategory: VehicleCategory.RigidTruck,
- vehicleClass: VehicleClass.Class9,
- axleConfiguration: AxleConfiguration.AxleConfig_6x2,
- wheelsInertia: 196,
- totalVehicleWeight: CurbWeight + 2200 + 5400 + 2600,
- totalRollResistance: 0.0059426,
- aerodynamicDragArea: CdxA + 1.5);
- }
-
-
- [TestCase(Class9RigidTruckJob, 1)]
- public void TestClass9_Vehicle_LongHaul_RefLoad(string file, int runIdx)
- {
- var runData = DeclarationAdapterTestHelper.CreateVectoRunData(file);
-
- // long haul, ref load
- DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData, runData[runIdx].AirdragData,
- vehicleCategory: VehicleCategory.RigidTruck,
- vehicleClass: VehicleClass.Class9,
- axleConfiguration: AxleConfiguration.AxleConfig_6x2,
- wheelsInertia: 196,
- totalVehicleWeight: CurbWeight + 2200 + 5400 + 19300,
- totalRollResistance: 0.00558611,
- aerodynamicDragArea: CdxA + 1.5);
- }
-
- [TestCase(Class9RigidTruckJob, 2)]
- public void TestClass9_Vehicle_LongHaul_EMS_LowLoad(string file, int runIdx)
- {
- var runData = DeclarationAdapterTestHelper.CreateVectoRunData(file);
-
- // long haul, min load
- DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData, runData[runIdx].AirdragData,
- vehicleCategory: VehicleCategory.RigidTruck,
- vehicleClass: VehicleClass.Class9,
- axleConfiguration: AxleConfiguration.AxleConfig_6x2,
- wheelsInertia: 294,
- totalVehicleWeight: CurbWeight + 2200 + 2500 + 7500 + 3500,
- totalRollResistance: 0.0060500,
- aerodynamicDragArea: CdxA + 2.1);
- }
-
- [TestCase(Class9RigidTruckJob, 3)]
- public void TestClass9_Vehicle_LongHaul_EMS_RefLoad(string file, int runIdx)
- {
- var runData = DeclarationAdapterTestHelper.CreateVectoRunData(file);
-
- // long haul, ref load
- DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData, runData[runIdx].AirdragData,
- vehicleCategory: VehicleCategory.RigidTruck,
- vehicleClass: VehicleClass.Class9,
- axleConfiguration: AxleConfiguration.AxleConfig_6x2,
- wheelsInertia: 294,
- totalVehicleWeight: CurbWeight + 2200 + 2500 + 7500 + 26500,
- totalRollResistance: 0.0056680,
- aerodynamicDragArea: CdxA + 2.1);
- }
-
- [TestCase(Class9RigidTruckJob, 4)]
- public void TestClass9_Vehicle_RegionalDel_LowLoad(string file, int runIdx)
- {
- var runData = DeclarationAdapterTestHelper.CreateVectoRunData(file);
-
- // regional del., min load
- DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData, runData[runIdx].AirdragData,
- vehicleCategory: VehicleCategory.RigidTruck,
- vehicleClass: VehicleClass.Class9,
- axleConfiguration: AxleConfiguration.AxleConfig_6x2,
- wheelsInertia: 119.2,
- totalVehicleWeight: CurbWeight + 2200 + 1400,
- totalRollResistance: 0.0059109,
- aerodynamicDragArea: CdxA);
- }
-
- [TestCase(Class9RigidTruckJob, 5)]
- public void TestClass9_Vehicle_RegionalDel_RefLoad(string file, int runIdx)
- {
- var runData = DeclarationAdapterTestHelper.CreateVectoRunData(file);
-
- // regional del., ref load
- DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData, runData[runIdx].AirdragData,
- vehicleCategory: VehicleCategory.RigidTruck,
- vehicleClass: VehicleClass.Class9,
- axleConfiguration: AxleConfiguration.AxleConfig_6x2,
- wheelsInertia: 119.2,
- totalVehicleWeight: CurbWeight + 2200 + 7100,
- totalRollResistance: 0.0056986,
- aerodynamicDragArea: CdxA);
- }
-
- [TestCase(Class9RigidTruckJob, 6)]
- public void TestClass9_Vehicle_RegionalDel_EMS_LowLoad(string file, int runIdx)
- {
- var runData = DeclarationAdapterTestHelper.CreateVectoRunData(file);
-
- // regional del., min load
- DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData, runData[runIdx].AirdragData,
- vehicleCategory: VehicleCategory.RigidTruck,
- vehicleClass: VehicleClass.Class9,
- axleConfiguration: AxleConfiguration.AxleConfig_6x2,
- wheelsInertia: 294,
- totalVehicleWeight: CurbWeight + 2200 + 2500 + 7500 + 3500,
- totalRollResistance: 0.0060425,
- aerodynamicDragArea: CdxA + 2.1);
- }
-
- [TestCase(Class9RigidTruckJob, 7)]
- public void TestClass9_Vehicle_RegionalDel_EMS_RefLoad(string file, int runIdx)
- {
- var runData = DeclarationAdapterTestHelper.CreateVectoRunData(file);
-
- // regional del., ref load
- DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData, runData[runIdx].AirdragData,
- vehicleCategory: VehicleCategory.RigidTruck,
- vehicleClass: VehicleClass.Class9,
- axleConfiguration: AxleConfiguration.AxleConfig_6x2,
- wheelsInertia: 294,
- totalVehicleWeight: CurbWeight + 2200 + 2500 + 7500 + 17500,
- totalRollResistance: 0.0057797,
- aerodynamicDragArea: CdxA + 2.1);
- }
-
- [TestCase(Class9RigidTruckJob, 8)]
- public void TestClass9_Vehicle_Municipal_LowLoad(string file, int runIdx)
- {
- var runData = DeclarationAdapterTestHelper.CreateVectoRunData(file);
-
- // municipal, min load
- DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData, runData[runIdx].AirdragData,
- vehicleCategory: VehicleCategory.RigidTruck,
- vehicleClass: VehicleClass.Class9,
- axleConfiguration: AxleConfiguration.AxleConfig_6x2,
- wheelsInertia: 119.2,
- totalVehicleWeight: CurbWeight + 6750 + 1200,
- totalRollResistance: 0.0057417,
- aerodynamicDragArea: CdxA);
- }
-
- [TestCase(Class9RigidTruckJob, 9)]
- public void TestClass9_Vehicle_Municipal_RefLoad(string file, int runIdx)
- {
- var runData = DeclarationAdapterTestHelper.CreateVectoRunData(file);
-
- // municipal, min load
- DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData, runData[runIdx].AirdragData,
- vehicleCategory: VehicleCategory.RigidTruck,
- vehicleClass: VehicleClass.Class9,
- axleConfiguration: AxleConfiguration.AxleConfig_6x2,
- wheelsInertia: 119.2,
- totalVehicleWeight: CurbWeight + 6750 + 6000,
- totalRollResistance: 0.005602,
- aerodynamicDragArea: CdxA);
- }
- }
-}
\ No newline at end of file
+using NUnit.Framework;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCore.Models.Declaration;
+
+namespace TUGraz.VectoCore.Tests.Models.Declaration.DataAdapter
+{
+ [TestFixture]
+ public class DeclarationDataAdapterTest_Class9
+ {
+ public const string Class9RigidTruckJob =
+ @"TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Class9_RigidTruck_DECL.vecto";
+
+ public const int CurbWeight = 9300;
+ public const double CdxA = 5.2;
+
+ [TestCase(Class9RigidTruckJob, 0)]
+ public void TestClass9_Vehicle_LongHaul_LowLoad(string file, int runIdx)
+ {
+ var runData = DeclarationAdapterTestHelper.CreateVectoRunData(file);
+
+ Assert.AreEqual(10, runData.Length);
+
+ // long haul, min load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData, runData[runIdx].AirdragData,
+ vehicleCategory: VehicleCategory.RigidTruck,
+ vehicleClass: VehicleClass.Class9,
+ axleConfiguration: AxleConfiguration.AxleConfig_6x2,
+ wheelsInertia: 196,
+ totalVehicleWeight: CurbWeight + 2200 + 5400 + 2600,
+ totalRollResistance: 0.0059426,
+ aerodynamicDragArea: CdxA + 1.5);
+ }
+
+
+ [TestCase(Class9RigidTruckJob, 1)]
+ public void TestClass9_Vehicle_LongHaul_RefLoad(string file, int runIdx)
+ {
+ var runData = DeclarationAdapterTestHelper.CreateVectoRunData(file);
+
+ // long haul, ref load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData, runData[runIdx].AirdragData,
+ vehicleCategory: VehicleCategory.RigidTruck,
+ vehicleClass: VehicleClass.Class9,
+ axleConfiguration: AxleConfiguration.AxleConfig_6x2,
+ wheelsInertia: 196,
+ totalVehicleWeight: CurbWeight + 2200 + 5400 + 19300,
+ totalRollResistance: 0.00558611,
+ aerodynamicDragArea: CdxA + 1.5);
+ }
+
+ [TestCase(Class9RigidTruckJob, 2)]
+ public void TestClass9_Vehicle_LongHaul_EMS_LowLoad(string file, int runIdx)
+ {
+ var runData = DeclarationAdapterTestHelper.CreateVectoRunData(file);
+
+ // long haul, min load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData, runData[runIdx].AirdragData,
+ vehicleCategory: VehicleCategory.RigidTruck,
+ vehicleClass: VehicleClass.Class9,
+ axleConfiguration: AxleConfiguration.AxleConfig_6x2,
+ wheelsInertia: 294,
+ totalVehicleWeight: CurbWeight + 2200 + 2500 + 7500 + 3500,
+ totalRollResistance: 0.0060500,
+ aerodynamicDragArea: CdxA + 2.1);
+ }
+
+ [TestCase(Class9RigidTruckJob, 3)]
+ public void TestClass9_Vehicle_LongHaul_EMS_RefLoad(string file, int runIdx)
+ {
+ var runData = DeclarationAdapterTestHelper.CreateVectoRunData(file);
+
+ // long haul, ref load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData, runData[runIdx].AirdragData,
+ vehicleCategory: VehicleCategory.RigidTruck,
+ vehicleClass: VehicleClass.Class9,
+ axleConfiguration: AxleConfiguration.AxleConfig_6x2,
+ wheelsInertia: 294,
+ totalVehicleWeight: CurbWeight + 2200 + 2500 + 7500 + 26500,
+ totalRollResistance: 0.0056680,
+ aerodynamicDragArea: CdxA + 2.1);
+ }
+
+ [TestCase(Class9RigidTruckJob, 4)]
+ public void TestClass9_Vehicle_RegionalDel_LowLoad(string file, int runIdx)
+ {
+ var runData = DeclarationAdapterTestHelper.CreateVectoRunData(file);
+
+ // regional del., min load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData, runData[runIdx].AirdragData,
+ vehicleCategory: VehicleCategory.RigidTruck,
+ vehicleClass: VehicleClass.Class9,
+ axleConfiguration: AxleConfiguration.AxleConfig_6x2,
+ wheelsInertia: 119.2,
+ totalVehicleWeight: CurbWeight + 2200 + 1400,
+ totalRollResistance: 0.0059109,
+ aerodynamicDragArea: CdxA);
+ }
+
+ [TestCase(Class9RigidTruckJob, 5)]
+ public void TestClass9_Vehicle_RegionalDel_RefLoad(string file, int runIdx)
+ {
+ var runData = DeclarationAdapterTestHelper.CreateVectoRunData(file);
+
+ // regional del., ref load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData, runData[runIdx].AirdragData,
+ vehicleCategory: VehicleCategory.RigidTruck,
+ vehicleClass: VehicleClass.Class9,
+ axleConfiguration: AxleConfiguration.AxleConfig_6x2,
+ wheelsInertia: 119.2,
+ totalVehicleWeight: CurbWeight + 2200 + 7100,
+ totalRollResistance: 0.0056986,
+ aerodynamicDragArea: CdxA);
+ }
+
+ [TestCase(Class9RigidTruckJob, 6)]
+ public void TestClass9_Vehicle_RegionalDel_EMS_LowLoad(string file, int runIdx)
+ {
+ var runData = DeclarationAdapterTestHelper.CreateVectoRunData(file);
+
+ // regional del., min load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData, runData[runIdx].AirdragData,
+ vehicleCategory: VehicleCategory.RigidTruck,
+ vehicleClass: VehicleClass.Class9,
+ axleConfiguration: AxleConfiguration.AxleConfig_6x2,
+ wheelsInertia: 294,
+ totalVehicleWeight: CurbWeight + 2200 + 2500 + 7500 + 3500,
+ totalRollResistance: 0.0060425,
+ aerodynamicDragArea: CdxA + 2.1);
+ }
+
+ [TestCase(Class9RigidTruckJob, 7)]
+ public void TestClass9_Vehicle_RegionalDel_EMS_RefLoad(string file, int runIdx)
+ {
+ var runData = DeclarationAdapterTestHelper.CreateVectoRunData(file);
+
+ // regional del., ref load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData, runData[runIdx].AirdragData,
+ vehicleCategory: VehicleCategory.RigidTruck,
+ vehicleClass: VehicleClass.Class9,
+ axleConfiguration: AxleConfiguration.AxleConfig_6x2,
+ wheelsInertia: 294,
+ totalVehicleWeight: CurbWeight + 2200 + 2500 + 7500 + 17500,
+ totalRollResistance: 0.0057797,
+ aerodynamicDragArea: CdxA + 2.1);
+ }
+
+ [TestCase(Class9RigidTruckJob, 8)]
+ public void TestClass9_Vehicle_Municipal_LowLoad(string file, int runIdx)
+ {
+ var runData = DeclarationAdapterTestHelper.CreateVectoRunData(file);
+
+ // municipal, min load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData, runData[runIdx].AirdragData,
+ vehicleCategory: VehicleCategory.RigidTruck,
+ vehicleClass: VehicleClass.Class9,
+ axleConfiguration: AxleConfiguration.AxleConfig_6x2,
+ wheelsInertia: 119.2,
+ totalVehicleWeight: CurbWeight + 6750 + 1200,
+ totalRollResistance: 0.0057417,
+ aerodynamicDragArea: CdxA);
+ }
+
+ [TestCase(Class9RigidTruckJob, 9)]
+ public void TestClass9_Vehicle_Municipal_RefLoad(string file, int runIdx)
+ {
+ var runData = DeclarationAdapterTestHelper.CreateVectoRunData(file);
+
+ // municipal, min load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData, runData[runIdx].AirdragData,
+ vehicleCategory: VehicleCategory.RigidTruck,
+ vehicleClass: VehicleClass.Class9,
+ axleConfiguration: AxleConfiguration.AxleConfig_6x2,
+ wheelsInertia: 119.2,
+ totalVehicleWeight: CurbWeight + 6750 + 6000,
+ totalRollResistance: 0.005602,
+ aerodynamicDragArea: CdxA);
+ }
+ }
+}
diff --git a/VectoCore/VectoCoreTest/Utils/AssertHelper.cs b/VectoCore/VectoCoreTest/Utils/AssertHelper.cs
index a73763d543e876fcdac519c6b80d3ab5d707faa4..c1fbcb0f52aade64a90cb0055bdd8cb97c09893c 100644
--- a/VectoCore/VectoCoreTest/Utils/AssertHelper.cs
+++ b/VectoCore/VectoCoreTest/Utils/AssertHelper.cs
@@ -29,11 +29,11 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
-using Microsoft.VisualStudio.TestTools.UnitTesting;
using System;
using System.Diagnostics;
using System.Globalization;
using TUGraz.VectoCommon.Utils;
+using NUnit.Framework;
namespace TUGraz.VectoCore.Tests.Utils
{
@@ -107,4 +107,4 @@ namespace TUGraz.VectoCore.Tests.Utils
expected, actual, toleranceFactor, expected - actual, message));
}
}
-}
\ No newline at end of file
+}
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 194587440fda0099ad8a5e779d96dfe20847a9b1..189d8317a5433025470dec368f568b3dd3471ed2 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -75,11 +75,7 @@
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
</ItemGroup>
</When>
- <Otherwise>
- <ItemGroup>
- <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
- </ItemGroup>
- </Otherwise>
+ <Otherwise />
</Choose>
<ItemGroup>
<Compile Include="Dummy\EngineFLDTest.cs" />