diff --git a/VectoCommon/VectoHashingTest/BasicHasingTests.cs b/VectoCommon/VectoHashingTest/BasicHasingTests.cs index e679d22e908952b73e9a799360208be7b10df372..a7d164d7c126596be8b1624c063a65630a7651ec 100644 --- a/VectoCommon/VectoHashingTest/BasicHasingTests.cs +++ b/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"; diff --git a/VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs b/VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs index b76a21792628a40069afe7599aff90243cb97428..55c16062fca25ffbcff80f0ce22a9ebf917d6e51 100644 --- a/VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs +++ b/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; diff --git a/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs b/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs index 3b1f31dfc2e6f1edab03ca1cbb62a8638c31f5cb..85794472e1e55d3736aa3f3b867e21141ddb9e4c 100644 --- a/VectoCore/VectoCoreTest/Integration/XMLReportTest.cs +++ b/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); diff --git a/VectoCore/VectoCoreTest/Utils/InputDataHelper.cs b/VectoCore/VectoCoreTest/Utils/InputDataHelper.cs index 8f2d25b1f40f18fa1e4fa3f221c5944f55401a33..905af2800d517e4268ee87c3da97bf290ed4b6c4 100644 --- a/VectoCore/VectoCoreTest/Utils/InputDataHelper.cs +++ b/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