Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -re56b96f63d7f5098e36566ea556f45af5c142320 -r6a0cc80559d1f5dd0476dbe7eba4865cc158e93f
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs)	(revision e56b96f63d7f5098e36566ea556f45af5c142320)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs)	(revision 6a0cc80559d1f5dd0476dbe7eba4865cc158e93f)
@@ -24,7 +24,6 @@
 using System.Linq;
 using Core.Common.Base.Data;
 using Core.Common.TestUtil;
-using Core.Common.Utils;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
@@ -42,6 +41,7 @@
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
 using Ringtoets.Revetment.Data;
 using Ringtoets.Revetment.Service;
+using Ringtoets.Revetment.TestUtil;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Service.Test
 {
@@ -823,37 +823,21 @@
                 WaveConditionsOutput[] waveConditionsOutputs = calculation.Output.Items.ToArray();
                 Assert.AreEqual(3, waveConditionsOutputs.Length);
 
-                double targetNorm = TargetNorm(assessmentSectionStub, failureMechanism);
-                AssertFailedCalculationOutput(waterLevelUpperBoundaryRevetment, targetNorm, waveConditionsOutputs[0]);
+                double targetNorm = CalculateTargetNorm(assessmentSectionStub.FailureMechanismContribution.Norm,
+                                                        failureMechanismContribution,
+                                                        failureMechanism.GeneralInput.N);
+                WaveConditionsOutputTestHelper.AssertFailedOutput(waterLevelUpperBoundaryRevetment,
+                                                                  targetNorm,
+                                                                  waveConditionsOutputs[0]);
             }
             mockRepository.VerifyAll();
         }
 
-        private static double TargetNorm(IAssessmentSection assessmentSectionStub, GrassCoverErosionOutwardsFailureMechanism failureMechanism)
+        private static double CalculateTargetNorm(double norm, double contribution, int N)
         {
-            return assessmentSectionStub.FailureMechanismContribution.Norm
-                   * (failureMechanism.Contribution / 100)
-                   / failureMechanism.GeneralInput.N;
+            return norm * (contribution / 100) / N;
         }
 
-        private static void AssertFailedCalculationOutput(double waterLevel, double targetNorm, WaveConditionsOutput actual)
-        {
-            double targetReliability = StatisticsConverter.ProbabilityToReliability(targetNorm);
-            double targetProbability = StatisticsConverter.ReliabilityToProbability(targetReliability);
-
-            Assert.IsNotNull(actual);
-            Assert.AreEqual(waterLevel, actual.WaterLevel, actual.WaterLevel.GetAccuracy());
-            Assert.IsNaN(actual.WaveHeight);
-            Assert.IsNaN(actual.WavePeakPeriod);
-            Assert.IsNaN(actual.WaveAngle);
-            Assert.IsNaN(actual.WaveDirection);
-            Assert.AreEqual(targetProbability, actual.TargetProbability);
-            Assert.AreEqual(targetReliability, actual.TargetReliability, actual.TargetReliability.GetAccuracy());
-            Assert.IsNaN(actual.CalculatedProbability);
-            Assert.IsNaN(actual.CalculatedReliability);
-            Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, actual.CalculationConvergence);
-        }
-
         private static GrassCoverErosionOutwardsWaveConditionsCalculation GetValidCalculation()
         {
             var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj
===================================================================
diff -u -re56b96f63d7f5098e36566ea556f45af5c142320 -r6a0cc80559d1f5dd0476dbe7eba4865cc158e93f
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj)	(revision e56b96f63d7f5098e36566ea556f45af5c142320)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj)	(revision 6a0cc80559d1f5dd0476dbe7eba4865cc158e93f)
@@ -71,10 +71,6 @@
       <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
-      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
-      <Name>Core.Common.Utils</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
       <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
       <Name>Core.Common.TestUtil</Name>
@@ -111,6 +107,10 @@
       <Project>{2331235f-1e56-4344-acc2-191c22a39594}</Project>
       <Name>Ringtoets.Revetment.Service</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Revetment\test\Ringtoets.Revetment.Data.TestUtil\Ringtoets.Revetment.Data.TestUtil.csproj">
+      <Project>{3706200E-48C6-4B86-B48C-4E45C69ABE95}</Project>
+      <Name>Ringtoets.Revetment.Data.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.GrassCoverErosionOutwards.Data\Ringtoets.GrassCoverErosionOutwards.Data.csproj">
       <Project>{E7225477-577F-4A17-B7EC-6721158E1543}</Project>
       <Name>Ringtoets.GrassCoverErosionOutwards.Data</Name>
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil.Test/Ringtoets.Revetment.Data.TestUtil.Test.csproj
===================================================================
diff -u -rec15ff35b39f333c422b8ca6988c34bd8573f134 -r6a0cc80559d1f5dd0476dbe7eba4865cc158e93f
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil.Test/Ringtoets.Revetment.Data.TestUtil.Test.csproj	(.../Ringtoets.Revetment.Data.TestUtil.Test.csproj)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil.Test/Ringtoets.Revetment.Data.TestUtil.Test.csproj	(.../Ringtoets.Revetment.Data.TestUtil.Test.csproj)	(revision 6a0cc80559d1f5dd0476dbe7eba4865cc158e93f)
@@ -52,6 +52,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TestWaveConditionsCalculationTest.cs" />
     <Compile Include="TestWaveConditionsOutputTest.cs" />
+    <Compile Include="WaveConditionsOutputTestHelperTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
@@ -64,6 +65,10 @@
       <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
       <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
       <Name>Ringtoets.Common.Data</Name>
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil.Test/WaveConditionsOutputTestHelperTest.cs
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil.Test/WaveConditionsOutputTestHelperTest.cs	(revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil.Test/WaveConditionsOutputTestHelperTest.cs	(revision 6a0cc80559d1f5dd0476dbe7eba4865cc158e93f)
@@ -0,0 +1,296 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using Core.Common.Utils;
+using NUnit.Framework;
+using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Revetment.Data;
+
+namespace Ringtoets.Revetment.TestUtil.Test
+{
+    [TestFixture]
+    public class WaveConditionsOutputTestHelperTest
+    {
+        [Test]
+        public void AssertFailedOutput_AllValuesMatch_DoesNotThrowException()
+        {
+            // Setup
+            var random = new Random(21);
+            double norm = random.NextDouble();
+            double waterLevel = random.NextDouble();
+
+            double targetReliability = StatisticsConverter.ProbabilityToReliability(norm);
+            double targetProbability = StatisticsConverter.ReliabilityToProbability(targetReliability);
+
+            var output = new WaveConditionsOutput(waterLevel,
+                                                  double.NaN,
+                                                  double.NaN,
+                                                  double.NaN,
+                                                  double.NaN,
+                                                  targetProbability,
+                                                  targetReliability,
+                                                  double.NaN,
+                                                  double.NaN,
+                                                  CalculationConvergence.CalculatedNotConverged);
+
+            // Call
+            TestDelegate call = () =>
+                WaveConditionsOutputTestHelper.AssertFailedOutput(waterLevel, norm, output);
+
+            // Assert
+            Assert.DoesNotThrow(call);
+        }
+
+        [Test]
+        public void AssertFailedOutput_ActualOutputNull_ThrowsAssertionException()
+        {
+            // Setup
+            var random = new Random(21);
+            double norm = random.NextDouble();
+            double waterLevel = random.NextDouble();
+
+            // Call
+            TestDelegate call = () =>
+                WaveConditionsOutputTestHelper.AssertFailedOutput(waterLevel, norm, null);
+
+            // Assert
+            Assert.Throws<AssertionException>(call);
+        }
+
+        [Test]
+        public void AssertFailedOutput_DifferentWaterLevel_ThrowsAssertionException()
+        {
+            // Setup
+            var random = new Random(21);
+            double norm = random.NextDouble();
+            double waterLevel = random.NextDouble();
+
+            double targetReliability = StatisticsConverter.ProbabilityToReliability(norm);
+            double targetProbability = StatisticsConverter.ReliabilityToProbability(targetReliability);
+
+            var output = new WaveConditionsOutput(waterLevel + random.NextDouble(),
+                                                  double.NaN,
+                                                  double.NaN,
+                                                  double.NaN,
+                                                  double.NaN,
+                                                  targetProbability,
+                                                  targetReliability,
+                                                  double.NaN,
+                                                  double.NaN,
+                                                  CalculationConvergence.CalculatedNotConverged);
+
+            // Call
+            TestDelegate call = () =>
+                WaveConditionsOutputTestHelper.AssertFailedOutput(waterLevel, norm, output);
+
+            // Assert
+            Assert.Throws<AssertionException>(call);
+        }
+
+        [Test]
+        public void AssertFailedOutput_DifferentTargetProbability_ThrowsAssertionException()
+        {
+            // Setup
+            var random = new Random(21);
+            double norm = random.NextDouble();
+            double waterLevel = random.NextDouble();
+
+            double targetReliability = StatisticsConverter.ProbabilityToReliability(norm);
+
+            var output = new WaveConditionsOutput(waterLevel,
+                                                  double.NaN,
+                                                  double.NaN,
+                                                  double.NaN,
+                                                  double.NaN,
+                                                  random.NextDouble(),
+                                                  targetReliability,
+                                                  double.NaN,
+                                                  double.NaN,
+                                                  CalculationConvergence.CalculatedNotConverged);
+
+            // Call
+            TestDelegate call = () =>
+                WaveConditionsOutputTestHelper.AssertFailedOutput(waterLevel, norm, output);
+
+            // Assert
+            Assert.Throws<AssertionException>(call);
+        }
+
+        [Test]
+        public void AssertFailedOutput_DifferentTargetReliability_ThrowsAssertionException()
+        {
+            // Setup
+            var random = new Random(21);
+            double norm = random.NextDouble();
+            double waterLevel = random.NextDouble();
+
+            double targetReliability = StatisticsConverter.ProbabilityToReliability(norm);
+            double targetProbability = StatisticsConverter.ReliabilityToProbability(targetReliability);
+
+            var output = new WaveConditionsOutput(waterLevel,
+                                                  double.NaN,
+                                                  double.NaN,
+                                                  double.NaN,
+                                                  double.NaN,
+                                                  targetProbability,
+                                                  targetReliability + random.NextDouble(),
+                                                  double.NaN,
+                                                  double.NaN,
+                                                  CalculationConvergence.CalculatedNotConverged);
+
+            // Call
+            TestDelegate call = () =>
+                WaveConditionsOutputTestHelper.AssertFailedOutput(waterLevel, norm, output);
+
+            // Assert
+            Assert.Throws<AssertionException>(call);
+        }
+
+        [Test]
+        [TestCase(CalculationConvergence.CalculatedConverged)]
+        [TestCase(CalculationConvergence.NotCalculated)]
+        public void AssertFailedOutput_DifferentCalculationConvergence_ThrowsAssertionException(
+            CalculationConvergence convergence)
+        {
+            // Setup
+            var random = new Random(21);
+            double norm = random.NextDouble();
+            double waterLevel = random.NextDouble();
+
+            double targetReliability = StatisticsConverter.ProbabilityToReliability(norm);
+            double targetProbability = StatisticsConverter.ReliabilityToProbability(targetReliability);
+
+            var output = new WaveConditionsOutput(waterLevel,
+                                                  double.NaN,
+                                                  double.NaN,
+                                                  double.NaN,
+                                                  double.NaN,
+                                                  targetProbability,
+                                                  targetReliability,
+                                                  double.NaN,
+                                                  double.NaN,
+                                                  convergence);
+
+            // Call
+            TestDelegate call = () =>
+                WaveConditionsOutputTestHelper.AssertFailedOutput(waterLevel, norm, output);
+
+            // Assert
+            Assert.Throws<AssertionException>(call);
+        }
+
+        [Test]
+        [TestCaseSource(nameof(GetVariousWaveConditionsOutputs))]
+        public void AssertFailedOutput_PropertyHasDifferentValue_ThrowsAssertionException(
+            WaveConditionsOutput output)
+        {
+            // Setup
+            const double waterLevel = 0.7;
+            const double norm = 0.5;
+
+            // Call
+            TestDelegate call = () =>
+                WaveConditionsOutputTestHelper.AssertFailedOutput(waterLevel, norm, output);
+
+            // Assert
+            Assert.Throws<AssertionException>(call);
+        }
+
+        private static IEnumerable<TestCaseData> GetVariousWaveConditionsOutputs()
+        {
+            const double waterLevel = 0.7;
+            const double norm = 0.5;
+            const CalculationConvergence convergence = CalculationConvergence.CalculatedNotConverged;
+
+            double targetReliability = StatisticsConverter.ProbabilityToReliability(norm);
+            double targetProbability = StatisticsConverter.ReliabilityToProbability(targetReliability);
+
+            yield return new TestCaseData(new WaveConditionsOutput(waterLevel,
+                                                                   1,
+                                                                   double.NaN,
+                                                                   double.NaN,
+                                                                   double.NaN,
+                                                                   targetProbability,
+                                                                   targetReliability,
+                                                                   double.NaN,
+                                                                   double.NaN,
+                                                                   convergence))
+                .SetName("WaveHeightDifferent");
+            yield return new TestCaseData(new WaveConditionsOutput(waterLevel,
+                                                                   double.NaN,
+                                                                   2,
+                                                                   double.NaN,
+                                                                   double.NaN,
+                                                                   targetProbability,
+                                                                   targetReliability,
+                                                                   double.NaN,
+                                                                   double.NaN,
+                                                                   convergence))
+                .SetName("WavePeakPeriodDifferent");
+            yield return new TestCaseData(new WaveConditionsOutput(waterLevel,
+                                                                   double.NaN,
+                                                                   double.NaN,
+                                                                   3,
+                                                                   double.NaN,
+                                                                   targetProbability,
+                                                                   targetReliability,
+                                                                   double.NaN,
+                                                                   double.NaN,
+                                                                   convergence))
+                .SetName("WaveAngleDifferent");
+            yield return new TestCaseData(new WaveConditionsOutput(waterLevel,
+                                                                   double.NaN,
+                                                                   double.NaN,
+                                                                   double.NaN,
+                                                                   4,
+                                                                   targetProbability,
+                                                                   targetReliability,
+                                                                   double.NaN,
+                                                                   double.NaN,
+                                                                   convergence))
+                .SetName("DifferentWaveDirection");
+            yield return new TestCaseData(new WaveConditionsOutput(waterLevel,
+                                                                   double.NaN,
+                                                                   double.NaN,
+                                                                   double.NaN,
+                                                                   double.NaN,
+                                                                   targetProbability,
+                                                                   targetReliability,
+                                                                   0.5,
+                                                                   double.NaN,
+                                                                   convergence))
+                .SetName("CalculatedProbabilityDifferent");
+            yield return new TestCaseData(new WaveConditionsOutput(waterLevel,
+                                                                   double.NaN,
+                                                                   double.NaN,
+                                                                   double.NaN,
+                                                                   double.NaN,
+                                                                   targetProbability,
+                                                                   targetReliability,
+                                                                   double.NaN,
+                                                                   6,
+                                                                   convergence))
+                .SetName("CalculatedReliabilityDifferent");
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/Ringtoets.Revetment.Data.TestUtil.csproj
===================================================================
diff -u -r6c049c504e7f599a8cebb26ae37fcd82b03782f2 -r6a0cc80559d1f5dd0476dbe7eba4865cc158e93f
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/Ringtoets.Revetment.Data.TestUtil.csproj	(.../Ringtoets.Revetment.Data.TestUtil.csproj)	(revision 6c049c504e7f599a8cebb26ae37fcd82b03782f2)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/Ringtoets.Revetment.Data.TestUtil.csproj	(.../Ringtoets.Revetment.Data.TestUtil.csproj)	(revision 6a0cc80559d1f5dd0476dbe7eba4865cc158e93f)
@@ -38,6 +38,10 @@
     <DebugType>pdbonly</DebugType>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
@@ -48,16 +52,25 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TestWaveConditionsCalculation.cs" />
     <Compile Include="TestWaveConditionsOutput.cs" />
+    <Compile Include="WaveConditionsOutputTestHelper.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
       <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
       <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
       <Name>Ringtoets.Common.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\test\Ringtoets.Common.Data.TestUtil\Ringtoets.Common.Data.TestUtil.csproj">
+      <Project>{4843D6E5-066F-4795-94F5-1D53932DD03C}</Project>
+      <Name>Ringtoets.Common.Data.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.Revetment.Data\Ringtoets.Revetment.Data.csproj">
       <Project>{87c2c553-c0bc-40bf-b1ea-b83bff357f27}</Project>
       <Name>Ringtoets.Revetment.Data</Name>
@@ -67,6 +80,7 @@
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/WaveConditionsOutputTestHelper.cs
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/WaveConditionsOutputTestHelper.cs	(revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/WaveConditionsOutputTestHelper.cs	(revision 6a0cc80559d1f5dd0476dbe7eba4865cc158e93f)
@@ -0,0 +1,63 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Core.Common.Utils;
+using NUnit.Framework;
+using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Revetment.Data;
+
+namespace Ringtoets.Revetment.TestUtil
+{
+    /// <summary>
+    /// A test helper to assert <see cref="WaveConditionsOutput"/>.
+    /// </summary>
+    public static class WaveConditionsOutputTestHelper
+    {
+        /// <summary>
+        /// Asserts the <see cref="WaveConditionsOutput"/> after a calculation has failed.
+        /// </summary>
+        /// <param name="waterLevel">The water level for which the calculation was performed for.</param>
+        /// <param name="targetNorm">The norm for which the calculation was calculated for.</param>
+        /// <param name="actualOutput">The actual <see cref="WaveConditionsOutput"/>.</param>
+        /// <exception cref="AssertionException">Thrown when differences are found between 
+        /// the expected output and the actual output.</exception>
+        public static void AssertFailedOutput(double waterLevel,
+                                              double targetNorm,
+                                              WaveConditionsOutput actualOutput)
+        {
+            double targetReliability = StatisticsConverter.ProbabilityToReliability(targetNorm);
+            double targetProbability = StatisticsConverter.ReliabilityToProbability(targetReliability);
+
+            Assert.IsNotNull(actualOutput);
+            Assert.AreEqual(waterLevel, actualOutput.WaterLevel, actualOutput.WaterLevel.GetAccuracy());
+            Assert.IsNaN(actualOutput.WaveHeight);
+            Assert.IsNaN(actualOutput.WavePeakPeriod);
+            Assert.IsNaN(actualOutput.WaveAngle);
+            Assert.IsNaN(actualOutput.WaveDirection);
+            Assert.AreEqual(targetProbability, actualOutput.TargetProbability);
+            Assert.AreEqual(targetReliability, actualOutput.TargetReliability, actualOutput.TargetReliability.GetAccuracy());
+            Assert.IsNaN(actualOutput.CalculatedProbability);
+            Assert.IsNaN(actualOutput.CalculatedReliability);
+            Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, actualOutput.CalculationConvergence);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 6c049c504e7f599a8cebb26ae37fcd82b03782f2 refers to a dead (removed) revision in file `Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/packages.config'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsOutputPropertiesTest.cs
===================================================================
diff -u -re56b96f63d7f5098e36566ea556f45af5c142320 -r6a0cc80559d1f5dd0476dbe7eba4865cc158e93f
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsOutputPropertiesTest.cs	(.../WaveConditionsOutputPropertiesTest.cs)	(revision e56b96f63d7f5098e36566ea556f45af5c142320)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsOutputPropertiesTest.cs	(.../WaveConditionsOutputPropertiesTest.cs)	(revision 6a0cc80559d1f5dd0476dbe7eba4865cc158e93f)
@@ -59,30 +59,20 @@
         }
 
         [Test]
-        public void GetProperties_ValidDataOfFailedCalculation_ReturnsExpectedValues()
+        public void GetProperties_ValuesNaN_ReturnsExpectedValues()
         {
             // Setup
-            var random = new Random(12);
-            double waterLevel = random.NextDouble();
-            const double waveHeight = double.NaN;
-            const double wavePeakPeriod = double.NaN;
-            const double waveAngle = double.NaN;
-            const double waveDirection = double.NaN;
-            double targetProbability = random.NextDouble();
-            double targetReliability = random.NextDouble();
-            const double calculatedProbability = double.NaN;
-            const double calculatedReliability = double.NaN;
             var convergence = new Random().NextEnumValue<CalculationConvergence>();
 
             // Call
             var properties = new WaveConditionsOutputProperties
             {
-                Data = new WaveConditionsOutput(waterLevel, waveHeight, wavePeakPeriod, waveAngle, waveDirection, targetProbability,
-                                                targetReliability, calculatedProbability, calculatedReliability, convergence)
+                Data = new WaveConditionsOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN,
+                                                double.NaN, double.NaN, double.NaN, convergence)
             };
 
             // Assert
-            Assert.AreEqual(waterLevel, properties.WaterLevel, properties.WaterLevel.GetAccuracy());
+            Assert.IsNaN(properties.WaterLevel);
             TestHelper.AssertTypeConverter<WaveConditionsOutputProperties, NoValueRoundedDoubleConverter>(
                 nameof(WaveConditionsOutputProperties.WaterLevel));
 
@@ -102,11 +92,11 @@
             TestHelper.AssertTypeConverter<WaveConditionsOutputProperties, NoValueRoundedDoubleConverter>(
                 nameof(WaveConditionsOutputProperties.WaveAngle));
 
-            Assert.AreEqual(targetProbability, properties.TargetProbability, properties.TargetProbability);
+            Assert.IsNaN(properties.TargetProbability);
             TestHelper.AssertTypeConverter<WaveConditionsOutputProperties, NoProbabilityValueDoubleConverter>(
                 nameof(WaveConditionsOutputProperties.TargetProbability));
 
-            Assert.AreEqual(targetReliability, properties.TargetReliability, properties.TargetReliability.GetAccuracy());
+            Assert.IsNaN(properties.TargetReliability);
             TestHelper.AssertTypeConverter<WaveConditionsOutputProperties, NoValueRoundedDoubleConverter>
                 (nameof(WaveConditionsOutputProperties.TargetReliability));
 
@@ -146,40 +136,14 @@
 
             // Assert
             Assert.AreEqual(waterLevel, properties.WaterLevel, properties.WaterLevel.GetAccuracy());
-            TestHelper.AssertTypeConverter<WaveConditionsOutputProperties, NoValueRoundedDoubleConverter>(
-                nameof(WaveConditionsOutputProperties.WaterLevel));
-
             Assert.AreEqual(waveHeight, properties.WaveHeight, properties.WaveHeight.GetAccuracy());
-            TestHelper.AssertTypeConverter<WaveConditionsOutputProperties, NoValueRoundedDoubleConverter>(
-                nameof(WaveConditionsOutputProperties.WaveHeight));
-
             Assert.AreEqual(wavePeakPeriod, properties.WavePeakPeriod, properties.WavePeakPeriod.GetAccuracy());
-            TestHelper.AssertTypeConverter<WaveConditionsOutputProperties, NoValueRoundedDoubleConverter>(
-                nameof(WaveConditionsOutputProperties.WavePeakPeriod));
-
             Assert.AreEqual(waveDirection, properties.WaveDirection, properties.WaveDirection.GetAccuracy());
-            TestHelper.AssertTypeConverter<WaveConditionsOutputProperties, NoValueRoundedDoubleConverter>(
-                nameof(WaveConditionsOutputProperties.WaveAngle));
-
             Assert.AreEqual(waveAngle, properties.WaveAngle, properties.WaveAngle.GetAccuracy());
-            TestHelper.AssertTypeConverter<WaveConditionsOutputProperties, NoValueRoundedDoubleConverter>(
-                nameof(WaveConditionsOutputProperties.WaveAngle));
-
             Assert.AreEqual(targetProbability, properties.TargetProbability);
-            TestHelper.AssertTypeConverter<WaveConditionsOutputProperties, NoProbabilityValueDoubleConverter>(
-                nameof(WaveConditionsOutputProperties.TargetProbability));
-
             Assert.AreEqual(targetReliability, properties.TargetReliability, properties.TargetReliability.GetAccuracy());
-            TestHelper.AssertTypeConverter<WaveConditionsOutputProperties, NoProbabilityValueDoubleConverter>(
-                nameof(WaveConditionsOutputProperties.TargetProbability));
-
             Assert.AreEqual(calculatedProbability, properties.CalculatedProbability);
-            TestHelper.AssertTypeConverter<WaveConditionsOutputProperties, NoProbabilityValueDoubleConverter>(
-                nameof(WaveConditionsOutputProperties.CalculatedProbability));
-
             Assert.AreEqual(calculatedReliability, properties.CalculatedReliability, properties.CalculatedReliability.GetAccuracy());
-            TestHelper.AssertTypeConverter<WaveConditionsOutputProperties, NoValueRoundedDoubleConverter>(
-                nameof(WaveConditionsOutputProperties.CalculatedReliability));
 
             string convergenceValue = new EnumDisplayWrapper<CalculationConvergence>(convergence).DisplayName;
             Assert.AreEqual(convergenceValue, properties.Convergence);
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/Ringtoets.Revetment.Service.Test.csproj
===================================================================
diff -u -re56b96f63d7f5098e36566ea556f45af5c142320 -r6a0cc80559d1f5dd0476dbe7eba4865cc158e93f
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/Ringtoets.Revetment.Service.Test.csproj	(.../Ringtoets.Revetment.Service.Test.csproj)	(revision e56b96f63d7f5098e36566ea556f45af5c142320)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/Ringtoets.Revetment.Service.Test.csproj	(.../Ringtoets.Revetment.Service.Test.csproj)	(revision 6a0cc80559d1f5dd0476dbe7eba4865cc158e93f)
@@ -68,10 +68,6 @@
       <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
-      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
-      <Name>Core.Common.Utils</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
       <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
       <Name>Core.Common.TestUtil</Name>
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs
===================================================================
diff -u -re56b96f63d7f5098e36566ea556f45af5c142320 -r6a0cc80559d1f5dd0476dbe7eba4865cc158e93f
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs	(.../WaveConditionsCalculationServiceBaseTest.cs)	(revision e56b96f63d7f5098e36566ea556f45af5c142320)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs	(.../WaveConditionsCalculationServiceBaseTest.cs)	(revision 6a0cc80559d1f5dd0476dbe7eba4865cc158e93f)
@@ -25,7 +25,6 @@
 using System.Linq;
 using Core.Common.Base.Data;
 using Core.Common.TestUtil;
-using Core.Common.Utils;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.DikeProfiles;
@@ -39,6 +38,7 @@
 using Ringtoets.HydraRing.Calculation.TestUtil;
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
 using Ringtoets.Revetment.Data;
+using Ringtoets.Revetment.TestUtil;
 
 namespace Ringtoets.Revetment.Service.Test
 {
@@ -650,7 +650,9 @@
                 WaveConditionsOutput[] waveConditionsOutputs = service.Outputs.ToArray();
                 Assert.AreEqual(3, waveConditionsOutputs.Length);
 
-                AssertFailedCalculationOutput(waterLevelUpperBoundary, norm, waveConditionsOutputs[0]);
+                WaveConditionsOutputTestHelper.AssertFailedOutput(waterLevelUpperBoundary,
+                                                                  norm,
+                                                                  waveConditionsOutputs[0]);
             }
             mockRepository.VerifyAll();
         }
@@ -696,24 +698,6 @@
             mockRepository.VerifyAll();
         }
 
-        private static void AssertFailedCalculationOutput(double waterLevel, double targetNorm, WaveConditionsOutput actual)
-        {
-            double targetReliability = StatisticsConverter.ProbabilityToReliability(targetNorm);
-            double targetProbability = StatisticsConverter.ReliabilityToProbability(targetReliability);
-
-            Assert.IsNotNull(actual);
-            Assert.AreEqual(waterLevel, actual.WaterLevel, actual.WaterLevel.GetAccuracy());
-            Assert.IsNaN(actual.WaveHeight);
-            Assert.IsNaN(actual.WavePeakPeriod);
-            Assert.IsNaN(actual.WaveAngle);
-            Assert.IsNaN(actual.WaveDirection);
-            Assert.AreEqual(targetProbability, actual.TargetProbability);
-            Assert.AreEqual(targetReliability, actual.TargetReliability, actual.TargetReliability.GetAccuracy());
-            Assert.IsNaN(actual.CalculatedProbability);
-            Assert.IsNaN(actual.CalculatedReliability);
-            Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, actual.CalculationConvergence);
-        }
-
         private static WaveConditionsInput GetDefaultValidationInput()
         {
             var input = new WaveConditionsInput
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/Ringtoets.StabilityStoneCover.Service.Test.csproj
===================================================================
diff -u -re56b96f63d7f5098e36566ea556f45af5c142320 -r6a0cc80559d1f5dd0476dbe7eba4865cc158e93f
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/Ringtoets.StabilityStoneCover.Service.Test.csproj	(.../Ringtoets.StabilityStoneCover.Service.Test.csproj)	(revision e56b96f63d7f5098e36566ea556f45af5c142320)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/Ringtoets.StabilityStoneCover.Service.Test.csproj	(.../Ringtoets.StabilityStoneCover.Service.Test.csproj)	(revision 6a0cc80559d1f5dd0476dbe7eba4865cc158e93f)
@@ -69,10 +69,6 @@
       <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
-      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
-      <Name>Core.Common.Utils</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
       <Project>{d749ee4c-ce50-4c17-bf01-9a953028c126}</Project>
       <Name>Core.Common.TestUtil</Name>
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -re56b96f63d7f5098e36566ea556f45af5c142320 -r6a0cc80559d1f5dd0476dbe7eba4865cc158e93f
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs)	(revision e56b96f63d7f5098e36566ea556f45af5c142320)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs)	(revision 6a0cc80559d1f5dd0476dbe7eba4865cc158e93f)
@@ -24,12 +24,10 @@
 using System.Linq;
 using Core.Common.Base.Data;
 using Core.Common.TestUtil;
-using Core.Common.Utils;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.DikeProfiles;
-using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
@@ -40,6 +38,7 @@
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
 using Ringtoets.Revetment.Data;
 using Ringtoets.Revetment.Service;
+using Ringtoets.Revetment.TestUtil;
 using Ringtoets.StabilityStoneCover.Data;
 
 namespace Ringtoets.StabilityStoneCover.Service.Test
@@ -896,7 +895,9 @@
                 Assert.AreEqual(3, blocksWaveConditionsOutputs.Length);
 
                 double targetNorm = assessmentSectionStub.FailureMechanismContribution.Norm;
-                AssertFailedCalculationOutput(waterLevelUpperBoundaryRevetment, targetNorm, blocksWaveConditionsOutputs[0]);
+                WaveConditionsOutputTestHelper.AssertFailedOutput(waterLevelUpperBoundaryRevetment,
+                                                                  targetNorm,
+                                                                  blocksWaveConditionsOutputs[0]);
 
                 WaveConditionsOutput[] columnsWaveConditionsOutputs = calculation.Output.ColumnsOutput.ToArray();
                 Assert.AreEqual(3, columnsWaveConditionsOutputs.Length);
@@ -1002,29 +1003,13 @@
                 Assert.AreEqual(3, columnsWaveConditionsOutputs.Length);
 
                 double targetNorm = assessmentSectionStub.FailureMechanismContribution.Norm;
-                AssertFailedCalculationOutput(waterLevelUpperBoundaryRevetment, targetNorm, columnsWaveConditionsOutputs[0]);
+                WaveConditionsOutputTestHelper.AssertFailedOutput(waterLevelUpperBoundaryRevetment,
+                                                                  targetNorm,
+                                                                  columnsWaveConditionsOutputs[0]);
             }
             mockRepository.VerifyAll();
         }
 
-        private static void AssertFailedCalculationOutput(double waterLevel, double targetNorm, WaveConditionsOutput actual)
-        {
-            double targetReliability = StatisticsConverter.ProbabilityToReliability(targetNorm);
-            double targetProbability = StatisticsConverter.ReliabilityToProbability(targetReliability);
-
-            Assert.IsNotNull(actual);
-            Assert.AreEqual(waterLevel, actual.WaterLevel, actual.WaterLevel.GetAccuracy());
-            Assert.IsNaN(actual.WaveHeight);
-            Assert.IsNaN(actual.WavePeakPeriod);
-            Assert.IsNaN(actual.WaveAngle);
-            Assert.IsNaN(actual.WaveDirection);
-            Assert.AreEqual(targetProbability, actual.TargetProbability);
-            Assert.AreEqual(targetReliability, actual.TargetReliability, actual.TargetReliability.GetAccuracy());
-            Assert.IsNaN(actual.CalculatedProbability);
-            Assert.IsNaN(actual.CalculatedReliability);
-            Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, actual.CalculationConvergence);
-        }
-
         private static StabilityStoneCoverWaveConditionsCalculation GetValidCalculation()
         {
             return new StabilityStoneCoverWaveConditionsCalculation
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/Ringtoets.WaveImpactAsphaltCover.Service.Test.csproj
===================================================================
diff -u -re56b96f63d7f5098e36566ea556f45af5c142320 -r6a0cc80559d1f5dd0476dbe7eba4865cc158e93f
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/Ringtoets.WaveImpactAsphaltCover.Service.Test.csproj	(.../Ringtoets.WaveImpactAsphaltCover.Service.Test.csproj)	(revision e56b96f63d7f5098e36566ea556f45af5c142320)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/Ringtoets.WaveImpactAsphaltCover.Service.Test.csproj	(.../Ringtoets.WaveImpactAsphaltCover.Service.Test.csproj)	(revision 6a0cc80559d1f5dd0476dbe7eba4865cc158e93f)
@@ -69,10 +69,6 @@
       <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
-      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
-      <Name>Core.Common.Utils</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
       <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
       <Name>Core.Common.TestUtil</Name>
@@ -109,6 +105,10 @@
       <Project>{2331235f-1e56-4344-acc2-191c22a39594}</Project>
       <Name>Ringtoets.Revetment.Service</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Revetment\test\Ringtoets.Revetment.Data.TestUtil\Ringtoets.Revetment.Data.TestUtil.csproj">
+      <Project>{3706200E-48C6-4B86-B48C-4E45C69ABE95}</Project>
+      <Name>Ringtoets.Revetment.Data.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.WaveImpactAsphaltCover.Data\Ringtoets.WaveImpactAsphaltCover.Data.csproj">
       <Project>{567E0B69-5280-41CE-ADD6-443725A61C86}</Project>
       <Name>Ringtoets.WaveImpactAsphaltCover.Data</Name>
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -re56b96f63d7f5098e36566ea556f45af5c142320 -r6a0cc80559d1f5dd0476dbe7eba4865cc158e93f
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs)	(revision e56b96f63d7f5098e36566ea556f45af5c142320)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs)	(revision 6a0cc80559d1f5dd0476dbe7eba4865cc158e93f)
@@ -24,12 +24,10 @@
 using System.Linq;
 using Core.Common.Base.Data;
 using Core.Common.TestUtil;
-using Core.Common.Utils;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.DikeProfiles;
-using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
@@ -40,6 +38,7 @@
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
 using Ringtoets.Revetment.Data;
 using Ringtoets.Revetment.Service;
+using Ringtoets.Revetment.TestUtil;
 using Ringtoets.WaveImpactAsphaltCover.Data;
 
 namespace Ringtoets.WaveImpactAsphaltCover.Service.Test
@@ -810,29 +809,13 @@
                 Assert.AreEqual(3, waveConditionsOutputs.Length);
 
                 double targetNorm = assessmentSectionStub.FailureMechanismContribution.Norm;
-                AssertFailedCalculationOutput(waterLevelUpperBoundaryRevetment, targetNorm, waveConditionsOutputs[0]);
+                WaveConditionsOutputTestHelper.AssertFailedOutput(waterLevelUpperBoundaryRevetment,
+                                                                  targetNorm,
+                                                                  waveConditionsOutputs[0]);
             }
             mockRepository.VerifyAll();
         }
 
-        private static void AssertFailedCalculationOutput(double waterLevel, double targetNorm, WaveConditionsOutput actual)
-        {
-            double targetReliability = StatisticsConverter.ProbabilityToReliability(targetNorm);
-            double targetProbability = StatisticsConverter.ReliabilityToProbability(targetReliability);
-
-            Assert.IsNotNull(actual);
-            Assert.AreEqual(waterLevel, actual.WaterLevel, actual.WaterLevel.GetAccuracy());
-            Assert.IsNaN(actual.WaveHeight);
-            Assert.IsNaN(actual.WavePeakPeriod);
-            Assert.IsNaN(actual.WaveAngle);
-            Assert.IsNaN(actual.WaveDirection);
-            Assert.AreEqual(targetProbability, actual.TargetProbability);
-            Assert.AreEqual(targetReliability, actual.TargetReliability, actual.TargetReliability.GetAccuracy());
-            Assert.IsNaN(actual.CalculatedProbability);
-            Assert.IsNaN(actual.CalculatedReliability);
-            Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, actual.CalculationConvergence);
-        }
-
         private static WaveImpactAsphaltCoverWaveConditionsCalculation GetValidCalculation()
         {
             var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation