diff --git a/VectoCore/VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs b/VectoCore/VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
index 8222145df9622d7eea1fd2ae8be40f65ec456132..798b6af731955d509109ee2e48bc5a35160ca262 100644
--- a/VectoCore/VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
@@ -85,7 +85,8 @@ namespace TUGraz.VectoCore.Tests.Integration.EngineOnlyCycle
var absTime = 0.SI<Second>();
var dt = 1.SI<Second>();
- var modFile = Path.GetFileNameWithoutExtension(Path.GetRandomFileName()); // + ".vmod";
+ var modFile = Path.GetFileNameWithoutExtension(modalResultFile);
+ //Path.GetFileNameWithoutExtension(Path.GetRandomFileName()); // + ".vmod";
var fileWriter = new FileOutputWriter(modFile);
var modData = new ModalDataContainer(modFile, fileWriter, ExecutionMode.EngineOnly);
@@ -103,7 +104,7 @@ namespace TUGraz.VectoCore.Tests.Integration.EngineOnlyCycle
}
modData.Finish(VectoRun.Status.Success);
- ResultFileHelper.TestModFile(modalResultFile, modFile + Constants.FileExtensions.ModDataFile);
+ ResultFileHelper.TestModFile(modalResultFile, modFile + Constants.FileExtensions.ModDataFile, testVelocity: false);
}
[TestCase]
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs b/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs
index d90703f178edb694f1086d391c72ade03ba369ab..ebd013e2e2da5ac5cb2ec4b0599f33375516931c 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/AuxTests.cs
@@ -104,7 +104,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
var testColumns = new[] { "P_aux_FAN", "P_aux_STP", "P_aux_AC", "P_aux_ES", "P_aux_PS", "P_aux" };
ResultFileHelper.TestModFile(@"TestData\Results\EngineOnlyCycles\40t_Long_Haul_Truck_Long_Haul_Empty Loading.vmod",
- @"AuxWriteModFileSumFile.vmod", testColumns);
+ @"AuxWriteModFileSumFile.vmod", testColumns, testVelocity:false);
ResultFileHelper.TestSumFile(@"TestData\Results\EngineOnlyCycles\AuxWriteModFileSumFile.vsum",
@"AuxWriteModFileSumFile.vsum");
}
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs b/VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs
index 05648832c83ae16e72c301260fadc6b9fd2dc3b7..dca4f533a713c5996a015971a8f487eb427a6d1e 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/PwheelModeTests.cs
@@ -166,7 +166,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
ResultFileHelper.TestSumFile(@"TestData\Pwheel\Results\Pwheel.vsum", @"TestData\Pwheel\Pwheel.vsum");
ResultFileHelper.TestModFile(@"TestData\Pwheel\Results\Pwheel_Gear2_pt1_rep1_actual.vmod",
- @"TestData\Pwheel\Pwheel_Gear2_pt1_rep1_actual.vmod");
+ @"TestData\Pwheel\Pwheel_Gear2_pt1_rep1_actual.vmod", testVelocity: false);
}
/// <summary>
@@ -194,7 +194,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
ResultFileHelper.TestSumFile(@"TestData\Pwheel\Results\Pwheel_ultimate.vsum", @"TestData\Pwheel\Pwheel_ultimate.vsum");
ResultFileHelper.TestModFile(@"TestData\Pwheel\Results\Pwheel_ultimate_RD_#1_Pwheel_AuxStd.vmod",
- @"TestData\Pwheel\Pwheel_ultimate_RD_#1_Pwheel_AuxStd.vmod");
+ @"TestData\Pwheel\Pwheel_ultimate_RD_#1_Pwheel_AuxStd.vmod", testVelocity: false);
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/SimulationTests.cs b/VectoCore/VectoCoreTest/Models/Simulation/SimulationTests.cs
index 4cf8eac9a94df8e82214a68753306216be13abcc..ed64a12e5e910ae809b519318664e475a32638d1 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/SimulationTests.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/SimulationTests.cs
@@ -62,21 +62,21 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
public void TestEngineOnly_JobRun()
{
var actual = @"TestData\Jobs\EngineOnlyJob_Coach Engine Only short.vmod";
- var expected = @"TestData\Results\EngineOnlyCycles\24tCoach_EngineOnly short.vmod";
+ var expected = @"TestData\Results\EngineOnlyCycles\EngineOnlyJob_Coach Engine Only short.vmod";
var job = CreateRun(actual);
job.Run();
Assert.IsTrue(job.FinishedWithoutErrors);
- ResultFileHelper.TestModFile(expected, actual);
+ ResultFileHelper.TestModFile(expected, actual, testVelocity: false);
}
[TestMethod]
public void TestEngineOnly_SimulatorRun()
{
var actual = @"TestData\Jobs\EngineOnlyJob_Coach Engine Only short.vmod";
- var expected = @"TestData\Results\EngineOnlyCycles\24tCoach_EngineOnly short.vmod";
+ var expected = @"TestData\Results\EngineOnlyCycles\EngineOnlyJob_Coach Engine Only short.vmod";
var run = CreateRun(actual);
@@ -89,7 +89,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
Assert.IsTrue(r.Run.FinishedWithoutErrors, string.Format("{0}", r.ExecException));
}
- ResultFileHelper.TestModFile(expected, actual);
+ ResultFileHelper.TestModFile(expected, actual, testVelocity: false);
}
public IVectoRun CreateRun(string resultFileName)
@@ -130,14 +130,14 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
@"TestData\Jobs\24t Coach EngineOnly.vsum");
ResultFileHelper.TestModFiles(new[] {
- @"TestData\Results\EngineOnlyCycles\24t Coach_Engine Only1.vmod",
- @"TestData\Results\EngineOnlyCycles\24t Coach_Engine Only2.vmod",
- @"TestData\Results\EngineOnlyCycles\24t Coach_Engine Only3.vmod"
+ @"TestData\Results\EngineOnlyCycles\24t Coach EngineOnly_Engine Only1.vmod",
+ @"TestData\Results\EngineOnlyCycles\24t Coach EngineOnly_Engine Only2.vmod",
+ @"TestData\Results\EngineOnlyCycles\24t Coach EngineOnly_Engine Only3.vmod"
}, new[] {
@"TestData\Jobs\24t Coach EngineOnly_Engine Only1.vmod",
@"TestData\Jobs\24t Coach EngineOnly_Engine Only2.vmod",
@"TestData\Jobs\24t Coach EngineOnly_Engine Only3.vmod"
- })
+ }, testVelocity: false)
;
}
}
diff --git a/VectoCore/VectoCoreTest/Utils/ResultFileHelper.cs b/VectoCore/VectoCoreTest/Utils/ResultFileHelper.cs
index 0409dc9d6e100b6740ee0b2df776085d52c3226a..442b3c699c1ba295e41f51ea62a7098393e966c4 100644
--- a/VectoCore/VectoCoreTest/Utils/ResultFileHelper.cs
+++ b/VectoCore/VectoCoreTest/Utils/ResultFileHelper.cs
@@ -43,13 +43,13 @@ namespace TUGraz.VectoCore.Tests.Utils
public static class ResultFileHelper
{
public static void TestModFile(string expectedFile, string actualFile, string[] testColumns = null,
- bool testRowCount = true)
+ bool testRowCount = true, bool testVelocity = true)
{
- TestModFiles(new[] { expectedFile }, new[] { actualFile }, testColumns, testRowCount);
+ TestModFiles(new[] { expectedFile }, new[] { actualFile }, testColumns, testRowCount, testVelocity);
}
public static void TestModFiles(IEnumerable<string> expectedFiles, IEnumerable<string> actualFiles,
- string[] testColumns = null, bool testRowcount = true)
+ string[] testColumns = null, bool testRowcount = true, bool testVelocity = true)
{
var resultFiles = expectedFiles.ZipAll(actualFiles, (expectedFile, actualFile) => new { expectedFile, actualFile });
foreach (var result in resultFiles) {
@@ -59,14 +59,16 @@ namespace TUGraz.VectoCore.Tests.Utils
var expected = VectoCSVFile.Read(result.expectedFile);
var actual = VectoCSVFile.Read(result.actualFile);
- Assert.IsTrue(
- actual.Rows.Cast<DataRow>()
- .All(r => r.ParseDouble(ModalResultField.v_act.GetShortCaption()).IsGreaterOrEqual(0)),
- "v_act must not be negative.");
- Assert.IsTrue(
- actual.Rows.Cast<DataRow>()
- .All(r => r.ParseDouble(ModalResultField.v_targ.GetShortCaption()).IsGreaterOrEqual(0)),
- "v_targ must not be negative.");
+ if (testVelocity) {
+ Assert.IsTrue(
+ actual.Rows.Cast<DataRow>()
+ .All(r => r.ParseDouble(ModalResultField.v_act.GetShortCaption()).IsGreaterOrEqual(0)),
+ "v_act must not be negative.");
+ Assert.IsTrue(
+ actual.Rows.Cast<DataRow>()
+ .All(r => r.ParseDouble(ModalResultField.v_targ.GetShortCaption()).IsGreaterOrEqual(0)),
+ "v_targ must not be negative.");
+ }
if (testRowcount) {
Assert.AreEqual(expected.Rows.Count, actual.Rows.Count,