diff --git a/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj b/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj index 5def99aa483c7d4fa3898ba9bba8b87094683607..0a447b85ac5b404a58d0f57c23af169d787d73d3 100644 --- a/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj +++ b/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj @@ -20,6 +20,13 @@ <ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" /> </ItemGroup> + <ItemGroup> + <Reference Include="PresentationFramework"> + <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\PresentationFramework.dll</HintPath> + </Reference> + </ItemGroup> + + <ItemGroup> <Folder Include="HelperTests\" /> <Folder Include="Testdata\bugreports\" /> @@ -119,10 +126,6 @@ </None> </ItemGroup> - <ItemGroup> - <Reference Include="PresentationFramework"> - <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\PresentationFramework.dll</HintPath> - </Reference> - </ItemGroup> + </Project> diff --git a/VectoCore/VectoCoreTest/Reports/ModDataTest.cs b/VectoCore/VectoCoreTest/Reports/ModDataTest.cs index fa280cfa5e8151fca853005234ae0d066d2057ca..ce852349cf92b83f6440b1b6923d7914d487ff0c 100644 --- a/VectoCore/VectoCoreTest/Reports/ModDataTest.cs +++ b/VectoCore/VectoCoreTest/Reports/ModDataTest.cs @@ -642,7 +642,7 @@ namespace TUGraz.VectoCore.Tests.Reports var pClutchOut = row[ModalResultField.P_clutch_out.GetName()]; if (pClutchOut != DBNull.Value) { Assert.AreEqual(pGbxIn.Value(), (pClutchOut as Watt).Value(), 1E-3, "time: {0} distance: {1}", time, distance); - Assert.AreEqual(pEngOut.Value(), (pClutchOut as Watt + pClutchLoss).Value(), 1E-3, "time: {0} distance: {1}", + Assert.AreEqual(pEngOut.Value(), ((pClutchOut as Watt) + pClutchLoss).Value(), 1E-3, "time: {0} distance: {1}", time, distance); } @@ -794,7 +794,7 @@ namespace TUGraz.VectoCore.Tests.Reports //if (pClutchOut != DBNull.Value) { Assert.AreEqual(pGbxIn.Value(), (pClutchOut as Watt).Value(), 1E-3, "time: {0} distance: {1}", time, distance); var pP1Out = row[p1OutColumn] as Watt; - Assert.AreEqual(pP1Out.Value(), (pClutchOut as Watt + pClutchLoss).Value(), 1E-3, "time: {0} distance: {1}", + Assert.AreEqual(pP1Out.Value(), ((pClutchOut as Watt) + pClutchLoss).Value(), 1E-3, "time: {0} distance: {1}", time, distance); var pP1Loss = row[p1LossColumn] as Watt;