Merge pull request #697 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:develop to develop

* commit '79b02089':
  adding category attributes to test

VectoCore/VectoCoreTest/FileIO/SimulationDataReaderTest.cs

@@ -56,6 +56,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
             Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
         }
 
+		[Category("LongRunning")]
         [TestCase]
 		public void ReadDeclarationJobFile()
 		{

VectoCore/VectoCoreTest/Integration/BusAuxiliaries/AAuxTests.cs

@@ -73,6 +73,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
 			return slopeStr;
 		}
 
+		[Category("LongRunning")]
 		[Category("ComparisonAAUX"),
 		TestCase(0, 20, -5), TestCase(0, 20, 0),
 		TestCase(0, 40, 25), TestCase(0, 40, 20), TestCase(0, 40, 15),
@@ -119,6 +120,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
 				string.Format(CultureInfo.InvariantCulture, "24t Coach_AAux_Cycle_Accelerate_{0}_{1}_{2}.vmod", v1, v2, slopeStr));
 		}
 
+		[Category("LongRunning")]
 		[Category("ComparisonAAUX"),
 		TestCase(40, 0, 20), TestCase(40, 0, 15),
 		TestCase(40, 0, 10), TestCase(40, 0, 5), TestCase(40, 0, 1),
@@ -167,6 +169,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
 				false);
 		}
 
+		[Category("LongRunning")]
 		[Category("ComparisonAAUX"),
 		TestCase(10, 10, 20), TestCase(10, 10, 15),
 		TestCase(10, 10, 10), TestCase(10, 10, 5), TestCase(10, 10, 1),
@@ -240,6 +243,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BusAuxiliaries
 				false);
 		}
 
+		[Category("LongRunning")]
 		[Category("ComparisonAAUX"),
 		TestCase(SimpleDrivingCycles.CycleDrive_80_Increasing_Slope,
 			"Coach_AAux_Drive_80_slope_inc.vmod", "24t Coach_AAux_Cycle_Drive_80_Increasing_Slope.vmod",

VectoCore/VectoCoreTest/Integration/Declaration/EngineInputDataTests.cs

@@ -58,6 +58,8 @@ namespace TUGraz.VectoCore.Tests.Integration.Declaration
 			Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
 		}
 
+		[Category("LongRunning")]
+		[Category("Integration")]
 		[TestCase(null, 1.0, 45.5323),
 		TestCase("CFRegPer", 1.2, 45.5323 * 1.2),
 		TestCase("BFColdHot", 1.2, 45.5323 * 1.2),

VectoCore/VectoCoreTest/Integration/Declaration/NaturalGasVehicles.cs

@@ -31,8 +31,9 @@ namespace TUGraz.VectoCore.Tests.Integration.Declaration
 		}
 
 
-		[
-		 TestCase(Class5NG, 2, TankSystem.Liquefied, 253.7, 702.8),
+		[Category("LongRunning")]
+		[Category("Integration")]
+		[TestCase(Class5NG, 2, TankSystem.Liquefied, 253.7, 702.8),
 		 TestCase(Class5NG, 2, TankSystem.Compressed, 259.5, 698.1),
 		 TestCase(Class5NG, 6, TankSystem.Liquefied, 252.9, 700.7),
 		 TestCase(Class5NG, 6, TankSystem.Compressed, 258.7, 696.0),

VectoCore/VectoCoreTest/Integration/Declaration/VocationalVehicleTest.cs

@@ -25,6 +25,7 @@ namespace TUGraz.VectoCore.Tests.Integration
 		}
 
 
+		[Category("LongRunning")]
 		[TestCase(Class4Vocational, 4),
 			TestCase(Class5Vocational, 2)]
 		public void VocationalTest(string filename, int numRuns)

VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs

@@ -53,6 +53,9 @@ namespace TUGraz.VectoCore.Tests.Integration
 			Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
 		}
 
+
+		[Category("LongRunning")]
+		[Category("Integration")]
 		[TestCase(FuelType.DieselCI, null,
 			@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 0, 
 			0.0002199424, 0.0002199424, 26.308901, 0.0006886, 9391.5411,

VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs

@@ -69,6 +69,7 @@ namespace TUGraz.VectoCore.Tests.Integration
 			Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
 		}
 
+		[Category("LongRunning")]
 		[TestCase]
 		public void Truck40t_LongHaulCycle_RefLoad()
 		{
@@ -80,6 +81,7 @@ namespace TUGraz.VectoCore.Tests.Integration
 			Assert.IsTrue(run.FinishedWithoutErrors);
 		}
 
+		[Category("LongRunning")]
 		[TestCase]
 		public void Truck40t_RegionalDeliveryCycle_RefLoad()
 		{
@@ -91,6 +93,7 @@ namespace TUGraz.VectoCore.Tests.Integration
 			Assert.IsTrue(run.FinishedWithoutErrors);
 		}
 
+		[Category("LongRunning")]
 		[TestCase]
 		public void Truck40t_UrbanDeliveryCycle_RefLoad()
 		{
@@ -102,6 +105,7 @@ namespace TUGraz.VectoCore.Tests.Integration
 			Assert.IsTrue(run.FinishedWithoutErrors);
 		}
 
+		[Category("LongRunning")]
 		[TestCase]
 		public void Truck40t_MunicipalCycle_RefLoad()
 		{
@@ -113,6 +117,7 @@ namespace TUGraz.VectoCore.Tests.Integration
 			Assert.IsTrue(run.FinishedWithoutErrors);
 		}
 
+		[Category("LongRunning")]
 		[TestCase]
 		public void Truck40t_ConstructionCycle_RefLoad()
 		{
@@ -124,6 +129,7 @@ namespace TUGraz.VectoCore.Tests.Integration
 			Assert.IsTrue(run.FinishedWithoutErrors);
 		}
 
+		[Category("LongRunning")]
 		[TestCase]
 		public void Truck40t_HeavyUrbanCycle_RefLoad()
 		{

VectoCore/VectoCoreTest/Integration/SimulationRuns/FullPowertrain.cs

@@ -141,6 +141,7 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
 			Assert.IsInstanceOf<ResponseCycleFinished>(response);
 		}
 
+		[Category("LongRunning")]
 		[TestCase]
 		public void Test_FullPowertrain()
 		{
@@ -303,6 +304,7 @@ namespace TUGraz.VectoCore.Tests.Integration.SimulationRuns
 			Assert.IsInstanceOf<ResponseCycleFinished>(response);
 		}
 
+		[Category("LongRunning")]
 		[TestCase]
 		public void Test_FullPowerTrain_JobFile()
 		{

VectoCore/VectoCoreTest/Integration/VTP/VTPTest.cs

@@ -77,6 +77,8 @@ namespace TUGraz.VectoCore.Tests.Integration.VTP
 			
 		}
 
+		[Category("LongRunning")]
+		[Category("Integration")]
 		[TestCase(@"TestData\Integration\VTPMode\GenericVehicle\class_5_generic vehicle_DECL.vecto")]
 		public void RunVTP_Declaration(string jobFile)
 		{
@@ -104,7 +106,8 @@ namespace TUGraz.VectoCore.Tests.Integration.VTP
 			Assert.AreEqual(true, jobContainer.AllCompleted);
 		}
 
-
+		[Category("LongRunning")]
+		[Category("Integration")]
 		[TestCase(@"TestData\Integration\VTPMode\GenericVehicle\VTP_AT-gbx.vecto")]
 		public void RunVTPWithAT(string jobFile)
 		{

VectoCore/VectoCoreTest/Integration/XMLReportTest.cs

@@ -151,6 +151,7 @@ namespace TUGraz.VectoCore.Tests.Integration
 			return new XMLValidator(new XmlTextReader(mrfStream));
 		}
 
+		[Category("LongRunning")]
 		[TestCase()]
 		public void TestXMLReportPTO()
 		{

VectoCore/VectoCoreTest/Models/Declaration/ShiftPolygonTest.cs

@@ -661,6 +661,9 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
 	{
 		const string BasePath = @"E:\QUAM\Workspace\Daten_INTERN\Testfahrzeuge\";
 
+
+		[Category("LongRunning")]
+		[Ignore("No Assertions - only plotting shift polygons")]
 		[
 			TestCase(@"class2_12t_baseline\175kW_Diesel_example.vfld", @"class2_12t_baseline\delivery_12t_example.vgbx", 0.421,
 				4.18, 600),

VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs

@@ -337,6 +337,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 			}, "Auxiliary file not found: NOT_EXISTING_AUX_FILE.vaux");
 		}
 
+		[Category("LongRunning")]
 		[TestCase]
 		public void AuxReadJobFileDeclarationMode()
 		{
@@ -351,6 +352,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 			jobContainer.AddRuns(runsFactory);
 		}
 
+		[Category("LongRunning")]
 		[TestCase]
 		public void AuxReadJobFileEngineeringMode()
 		{

VectoCore/VectoCoreTest/Models/Simulation/FactoryTest.cs

@@ -130,6 +130,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 			Assert.IsInstanceOf<Vehicle>(vehicleContainer.Vehicle,  "vehicle not installed");
 		}
 
+		[Category("LongRunning")]
 		[TestCase]
 		public void TestDistanceCycleInVTPEngineering()
 		{
@@ -139,6 +140,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 			AssertHelper.Exception<VectoException>(() => factory.SimulationRuns().ToArray(), "Distance-based cycle can not be simulated in VerificationTest mode");
 		}
 
+		[Category("LongRunning")]
 		[TestCase]
 		public void TestDistanceCycleInEngineOnly()
 		{

VectoCore/VectoCoreTest/Models/Simulation/MeasuredSpeedModeTest.cs

@@ -410,6 +410,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 				@"TestData\MeasuredSpeed\Results\MeasuredSpeedVairBack.vsum", @"TestData\MeasuredSpeed\MeasuredSpeedVairBack.vsum");
 		}
 
+		[Category("LongRunning")]
 		[TestCase]
 		public void MeasuredSpeedVair_NoWind_Run()
 		{

VectoCore/VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs

@@ -54,6 +54,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 		public const string JobFileDeclNoAngular = @"TestData\Jobs\40t_Long_Haul_Truck_NoAng.vecto";
 		public const string JobFileDeclAngEfficiency = @"TestData\Jobs\40t_Long_Haul_Truck with AngleEfficiency.vecto";
 
+		[Category("LongRunning")]
 		[TestCase(JobFile, 12),
 		TestCase(JobFileNoAngular, 11),
 		TestCase(JobFileAngEfficiency, 12)]

VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs

@@ -203,6 +203,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
 		/// Tests if the simulation works and the modfile and sumfile are correct in P_wheel_in mode.
 		/// </summary>
 		/// <remarks>VECTO-177</remarks>
+		[Category("LongRunning")]
 		[TestCase]
 		public void Pwheel_ultimate_Run_Test()
 		{

VectoCore/VectoCoreTest/Models/SimulationComponent/ATGearboxTest.cs

@@ -145,6 +145,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 		}
 
 
+		[Category("LongRunning")]
 		[Test,
 		TestCase("Urban", GearboxType.ATSerial),
 		TestCase("Suburban", GearboxType.ATSerial),

VectoCore/VectoCoreTest/Reports/ActualModalSimulationDataTest.cs

@@ -44,6 +44,8 @@ namespace TUGraz.VectoCore.Tests.Reports
 	[TestFixture]
 	public class ActualModalSimulationDataTest
 	{
+
+		[Category("LongRunning")]
 		[Test]
 		public void TestWriteActualModData()
 		{

VectoCore/VectoCoreTest/Reports/ModDataTest.cs

@@ -118,6 +118,7 @@ namespace TUGraz.VectoCore.Tests.Reports
 			AssertModDataIntegrity(modData, auxKeys, cycle.Entries.Last().Distance.Value(), engineData.ConsumptionMap, true);
 		}
 
+		[Category("LongRunning")]
 		[TestCase(@"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto")]
 		public void TestFullCycleModDataIntegrityDeclMT(string jobName)
 		{
@@ -135,6 +136,7 @@ namespace TUGraz.VectoCore.Tests.Reports
 			AssertSumDataFormat(tmpWriter.SumFileName);
 		}
 
+		[Category("LongRunning")]
 		[TestCase(@"TestData\Integration\EngineeringMode\Class2_RigidTruck_4x2\Class2_RigidTruck_ENG.vecto"),
 		TestCase(@"TestData\Integration\EngineeringMode\Class5_Tractor_4x2\Class5_Tractor_ENG.vecto"),
 		TestCase(@"TestData\Integration\EngineeringMode\Class9_RigidTruck_6x2_PTO\Class9_RigidTruck_ENG_PTO.vecto"),]
@@ -144,6 +146,7 @@ namespace TUGraz.VectoCore.Tests.Reports
 		}
 
 
+		[Category("LongRunning")]
 		[TestCase(@"TestData\Integration\VTPMode\GenericVehicle\class_5_generic vehicle.vecto")]
 		public void TestVTPModeDataIntegrity(string jobName)
 		{
@@ -494,6 +497,7 @@ namespace TUGraz.VectoCore.Tests.Reports
 			}
 		}
 
+		[Category("LongRunning")]
 		[
 			TestCase(@"TestData\Integration\EngineeringMode\CityBus_AT\CityBus_AT_Ser.vecto"),
 			TestCase(@"TestData\Integration\EngineeringMode\CityBus_AT\CityBus_AT_PS.vecto")]

VectoCore/VectoCoreTest/Reports/SumWriterTest.cs

@@ -169,6 +169,7 @@ namespace TUGraz.VectoCore.Tests.Reports
 			Assert.AreEqual(0.934722222, sumData.Rows[0].ParseDouble("E_brake [kWh]"), 1e-3);
 		}
 
+		[Category("LongRunning")]
 		[TestCase]
 		public void TestSumDataMetaInformation()
 		{