adapt testcases for parallel execution

VectoCommon/VectoHashingTest/BasicHasingTests.cs

@@ -40,7 +40,7 @@ using NUnit.Framework;
 namespace VectoHashingTest
 {
 	[TestFixture]
-	[Parallelizable(ParallelScope.All)]
+	//[Parallelizable(ParallelScope.All)]
 	public class BasicHasingTests
 	{
 		public const string SimpleXML = @"Testdata\XML\simple_document.xml";

VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs

@@ -129,7 +129,7 @@ namespace TUGraz.VectoCore.Tests.Integration
 			TestCase(ExemptedVehicle, false, false, false, "Invalid input: at least one option of ZE-HDV, He-HDV, and DualFuelVehicle has to be set for an exempted vehicle!")]
 		public void TestInvalidExemptedCombination(string filename, bool zeroEmission, bool hybrid, bool dualFuel, string exMsg)
 		{
-			var writer = new FileOutputWriter(GetRandomFilename(filename));
+			var writer = new FileOutputWriter(InputDataHelper.GetRandomFilename(filename));
 
 			var customerFile = writer.XMLCustomerReportName;
 			var manufactuerFile = writer.XMLFullReportName;
@@ -174,14 +174,7 @@ namespace TUGraz.VectoCore.Tests.Integration
 			Assert.IsFalse(File.Exists(monitoringFile));
 		}
 
-		private string GetRandomFilename(string jobFile)
-		{
-			var path = Path.GetDirectoryName( Path.GetFullPath(jobFile));
-			var filename = Path.GetFileNameWithoutExtension(jobFile);
-			var extension = Path.GetExtension(jobFile);
-			var random = Regex.Replace(Convert.ToBase64String(Guid.NewGuid().ToByteArray()), "[^A-Za-z0-9_.]+", "").Substring(0, 5);
-			return Path.Combine(path, $"{filename}-{random}.{extension}");
-		}
+		
 
 
 		[TestCase(ExemptedVehicle, null, 10000),
@@ -189,7 +182,7 @@ namespace TUGraz.VectoCore.Tests.Integration
 		TestCase(ExemptedVehicle, null, null)]
 		public void TestHybridExemptedRequiresMaxNetPower(string filename, double? maxNetPower1, double? maxNetPower2)
 		{
-			var writer = new FileOutputWriter(GetRandomFilename(filename));
+			var writer = new FileOutputWriter(InputDataHelper.GetRandomFilename(filename));
 
 			var customerFile = writer.XMLCustomerReportName;
 			var manufactuerFile = writer.XMLFullReportName;

VectoCore/VectoCoreTest/Integration/XMLReportTest.cs

@@ -48,6 +48,7 @@ using TUGraz.VectoCore.Models.Simulation.Impl;
 using TUGraz.VectoCore.OutputData;
 using TUGraz.VectoCore.OutputData.FileIO;
 using TUGraz.VectoCore.OutputData.XML;
+using TUGraz.VectoCore.Tests.Utils;
 using TUGraz.VectoCore.Tests.XML;
 using TUGraz.VectoCore.Utils;
 using TUGraz.VectoHashing;
@@ -77,7 +78,7 @@ namespace TUGraz.VectoCore.Tests.Integration
 		{
 			var jobfile = @"Testdata\XML\XMLReaderDeclaration\vecto_vehicle-sample.xml";
 			var dataProvider = xmlInputReader.CreateDeclaration(jobfile);
-			var writer = new FileOutputWriter(jobfile);
+			var writer = new FileOutputWriter(InputDataHelper.GetRandomFilename(jobfile));
 			var xmlReport = new XMLDeclarationReport(writer);
 			var sumData = new SummaryDataContainer(writer);
 			var jobContainer = new JobContainer(sumData);
@@ -160,7 +161,7 @@ namespace TUGraz.VectoCore.Tests.Integration
 		public void TestValidationXMLReports(string jobfile)
 		{
 			var dataProvider = xmlInputReader.CreateDeclaration(jobfile);
-			var writer = new FileOutputWriter(jobfile);
+			var writer = new FileOutputWriter(InputDataHelper.GetRandomFilename(jobfile));
 			var xmlReport = new XMLDeclarationReport(writer);
 			var sumData = new SummaryDataContainer(writer);
 			var jobContainer = new JobContainer(sumData);
@@ -249,7 +250,7 @@ namespace TUGraz.VectoCore.Tests.Integration
 
 					var modified = XmlReader.Create(new StringReader(nav.OuterXml));
 
-					var writer = new FileOutputWriter(jobfile);
+					var writer = new FileOutputWriter(InputDataHelper.GetRandomFilename(jobfile));
 					var xmlReport = new XMLDeclarationReport(writer);
 					var sumData = new SummaryDataContainer(writer);
 					var jobContainer = new JobContainer(sumData);
@@ -281,7 +282,7 @@ namespace TUGraz.VectoCore.Tests.Integration
 		{
 			var jobfile = @"Testdata\XML\XMLReaderDeclaration\vecto_vehicle-sample.xml";
 			var dataProvider = xmlInputReader.CreateDeclaration(jobfile);
-			var writer = new FileOutputWriter(jobfile);
+			var writer = new FileOutputWriter(InputDataHelper.GetRandomFilename(jobfile));
 			var xmlReport = new XMLDeclarationReport(writer);
 			var sumData = new SummaryDataContainer(writer);
 			var jobContainer = new JobContainer(sumData);

VectoCore/VectoCoreTest/Utils/InputDataHelper.cs

@@ -29,7 +29,9 @@
 *   Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
 */
 
+using System;
 using System.IO;
+using System.Text.RegularExpressions;
 
 namespace TUGraz.VectoCore.Tests.Utils
 {
@@ -47,5 +49,14 @@ namespace TUGraz.VectoCore.Tests.Utils
 			cycleData.Seek(0, SeekOrigin.Begin);
 			return cycleData;
 		}
+
+		public static string GetRandomFilename(string jobFile)
+		{
+			var path = Path.GetDirectoryName(Path.GetFullPath(jobFile));
+			var filename = Path.GetFileNameWithoutExtension(jobFile);
+			var extension = Path.GetExtension(jobFile);
+			var random = Regex.Replace(Convert.ToBase64String(Guid.NewGuid().ToByteArray()), "[^A-Za-z0-9_.]+", "").Substring(0, 5);
+			return Path.Combine(path, $"{filename}-{random}.{extension}");
+		}
 	}
 }
\ No newline at end of file