From dc322d983561f91f155cbbbd3a42b0ea97bafc64 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Wed, 30 Aug 2017 16:43:41 +0200
Subject: [PATCH] made compileable again
---
VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb | 4 ++--
VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj | 1 -
VectoCommon/VectoCommon/VectoCommon.csproj | 1 +
VectoCore/VectoCoreTest/Utils/SITest.cs | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
index 349ad34dfb..c18a62a928 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
@@ -64,8 +64,8 @@ Namespace UnitTests
Assert.AreEqual(target.SmartElectricalTotalCycleElectricalEnergyGeneratedDuringOverrunOnly.Value(), OUT1, 0.00001)
Assert.AreEqual(target.SmartElectricalTotalCycleEletricalEnergyGenerated.Value(), OUT2, 0.00001)
Assert.AreEqual(target.TotalCycleElectricalDemand.Value(), OUT3, 0.00001)
- Assert.AreEqual(target.TotalCycleFuelConsumptionSmartElectricalLoad.ConvertTo().Gramm.Value(), OUT4, 0.00001)
- Assert.AreEqual(target.TotalCycleFuelConsumptionZeroElectricalLoad.Value(), OUT5.SI().Gramm.Value(), 0.00001)
+ Assert.AreEqual(target.TotalCycleFuelConsumptionSmartElectricalLoad.ConvertTo(Unit.SI.Gramm), OUT4, 0.00001)
+ Assert.AreEqual(target.TotalCycleFuelConsumptionZeroElectricalLoad.Value(), OUT5.SI().Gramm.Value(), 0.00001)
Assert.AreEqual(target.StopStartSensitiveTotalCycleElectricalDemand.Value(), OUT6, 0.00001)
End Sub
diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
index 3c8ea02e6a..052500b6b2 100644
--- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
+++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
@@ -68,7 +68,6 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
- <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Moq">
<HintPath>..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
diff --git a/VectoCommon/VectoCommon/VectoCommon.csproj b/VectoCommon/VectoCommon/VectoCommon.csproj
index 54c52e051b..2fb4d00582 100644
--- a/VectoCommon/VectoCommon/VectoCommon.csproj
+++ b/VectoCommon/VectoCommon/VectoCommon.csproj
@@ -98,6 +98,7 @@
<Compile Include="Utils\EnumHelper.cs" />
<Compile Include="Utils\IntExtensionMethods.cs" />
<Compile Include="Utils\SI.cs" />
+ <Compile Include="Utils\SIUtils.cs" />
<Compile Include="Utils\StringExtensionMethods.cs" />
<Compile Include="Utils\Validation.cs" />
<Compile Include="Utils\VectoMath.cs" />
diff --git a/VectoCore/VectoCoreTest/Utils/SITest.cs b/VectoCore/VectoCoreTest/Utils/SITest.cs
index 3e76a71791..74eeaeb4ee 100644
--- a/VectoCore/VectoCoreTest/Utils/SITest.cs
+++ b/VectoCore/VectoCoreTest/Utils/SITest.cs
@@ -416,7 +416,7 @@ namespace TUGraz.VectoCore.Tests.Utils
AssertHelper.AreRelativeEqual(3.SI(), (-3).SI().Abs());
}
- [TestMethod]
+ [TestCase]
public void SI_Hash()
{
3.SI().GetHashCode();
--
GitLab