From d7ebf55d39b93c6f1046646cf832755841bf9559 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Mon, 6 Jun 2016 13:46:41 +0200
Subject: [PATCH] added order of parameters in AssertHelper.AreRelativeEqual to
be uniform with other methods
---
.../VectoCoreTest/Models/Simulation/DrivingCycleTests.cs | 2 +-
.../Models/SimulationComponent/GearboxPowertrainTest.cs | 2 +-
VectoCore/VectoCoreTest/Utils/AssertHelper.cs | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs b/VectoCore/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs
index 450061d769..ee80cf4dc6 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/DrivingCycleTests.cs
@@ -135,7 +135,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
if (absTime < 5) {
Assert.AreEqual(600.RPMtoRad(), outPort.AngularVelocity);
- AssertHelper.AreRelativeEqual(0.SI<NewtonMeter>(), outPort.Torque, 1e-3);
+ AssertHelper.AreRelativeEqual(0.SI<NewtonMeter>(), outPort.Torque, toleranceFactor: 1e-3);
} else if (absTime.IsBetween(12.75, 13.25) || absTime.IsBetween(14, 15)) {
Assert.IsTrue(outPort.AngularVelocity > 600.RPMtoRad());
Assert.IsTrue(outPort.Torque < 0);
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxPowertrainTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxPowertrainTest.cs
index 993094236c..786876332e 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxPowertrainTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/GearboxPowertrainTest.cs
@@ -116,7 +116,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
Assert.AreEqual(11u, container.Gear);
Assert.IsInstanceOfType(retVal, typeof(ResponseSuccess));
- AssertHelper.AreRelativeEqual(1530.263.RPMtoRad(), container.EngineSpeed, 0.001);
+ AssertHelper.AreRelativeEqual(1530.263.RPMtoRad(), container.EngineSpeed, toleranceFactor: 1e-3);
var absTime = 0.SI<Second>();
var ds = 1.SI<Meter>();
diff --git a/VectoCore/VectoCoreTest/Utils/AssertHelper.cs b/VectoCore/VectoCoreTest/Utils/AssertHelper.cs
index c527d7eb5e..5e3a448700 100644
--- a/VectoCore/VectoCoreTest/Utils/AssertHelper.cs
+++ b/VectoCore/VectoCoreTest/Utils/AssertHelper.cs
@@ -56,8 +56,8 @@ namespace TUGraz.VectoCore.Tests.Utils
}
[DebuggerHidden]
- public static void AreRelativeEqual(SI expected, SI actual,
- double toleranceFactor = DoubleExtensionMethods.ToleranceFactor, string message = null)
+ public static void AreRelativeEqual(SI expected, SI actual, string message = null,
+ double toleranceFactor = DoubleExtensionMethods.ToleranceFactor)
{
Assert.IsTrue(actual.HasEqualUnit(expected),
string.Format("Wrong SI Units: expected: {0}, actual: {1}", expected.ToBasicUnits(), actual.ToBasicUnits()));
--
GitLab