From 2e2ccbd9f234accf52f608c71b3430d69b38b943 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 9 Nov 2017 16:14:10 +0100
Subject: [PATCH] use new SI methods, add tolerance to testcase
---
VectoCore/VectoCoreTest/FileIO/SimulationDataReaderTest.cs | 2 +-
VectoCore/VectoCoreTest/Reports/SumWriterTest.cs | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/VectoCore/VectoCoreTest/FileIO/SimulationDataReaderTest.cs b/VectoCore/VectoCoreTest/FileIO/SimulationDataReaderTest.cs
index 9199907b68..73718e8c14 100644
--- a/VectoCore/VectoCoreTest/FileIO/SimulationDataReaderTest.cs
+++ b/VectoCore/VectoCoreTest/FileIO/SimulationDataReaderTest.cs
@@ -98,7 +98,7 @@ namespace TUGraz.VectoCore.Tests.FileIO
Assert.AreEqual(DeclarationData.Driver.OverSpeedEcoRoll.UnderSpeed.Value(),
runData.DriverData.OverSpeedEcoRoll.UnderSpeed.Value(), Tolerance);
- Assert.AreEqual(3.7890, runData.EngineData.Inertia.Value());
+ Assert.AreEqual(3.7890, runData.EngineData.Inertia.Value(), 1e-6);
var downshiftSpeeds = new[] { 660, 660, 1679.9982 };
var downshiftTorque = new[] { -163.9, 257.9742, 988.9 };
diff --git a/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs b/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
index 8f8b0ba57d..5730cb9139 100644
--- a/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
+++ b/VectoCore/VectoCoreTest/Reports/SumWriterTest.cs
@@ -193,13 +193,13 @@ namespace TUGraz.VectoCore.Tests.Reports
Assert.AreEqual(dataProvider.JobInputData.Vehicle.EngineInputData.Manufacturer,
sumRow[SummaryDataContainer.ENGINE_MANUFACTURER]);
Assert.AreEqual(dataProvider.JobInputData.Vehicle.EngineInputData.Model, sumRow[SummaryDataContainer.ENGINE_MODEL]);
- Assert.AreEqual(dataProvider.EngineInputData.RatedPowerDeclared.ConvertToKiloWatt(),
+ Assert.AreEqual(dataProvider.JobInputData.Vehicle.EngineInputData.RatedPowerDeclared.ConvertToKiloWatt(),
sumRow[SummaryDataContainer.ENGINE_FUEL_TYPE]);
- Assert.AreEqual((dataProvider.JobInputData.Vehicle.EngineInputData.RatedPowerDeclared.ConvertTo().Kilo.Watt.Value()),
+ Assert.AreEqual((dataProvider.JobInputData.Vehicle.EngineInputData.RatedPowerDeclared.ConvertToKiloWatt()),
((SI)sumRow[SummaryDataContainer.ENGINE_RATED_POWER]).Value());
Assert.AreEqual(dataProvider.JobInputData.Vehicle.EngineInputData.RatedSpeedDeclared.AsRPM,
((SI)sumRow[SummaryDataContainer.ENGINE_RATED_SPEED]).Value());
- Assert.AreEqual(dataProvider.EngineInputData.Displacement.ConvertToCubicCentiMeter(),
+ Assert.AreEqual(dataProvider.JobInputData.Vehicle.EngineInputData.Displacement.ConvertToCubicCentiMeter(),
((SI)sumRow[SummaryDataContainer.ENGINE_DISPLACEMENT]).Value());
Assert.AreEqual(dataProvider.JobInputData.Vehicle.GearboxInputData.Manufacturer,
sumRow[SummaryDataContainer.GEARBOX_MANUFACTURER]);
--
GitLab