Index: Ringtoets/Common/src/Ringtoets.Common.Service/IDesignWaterLevelCalculationService.cs
===================================================================
diff -u -rc78a5b1d66fba1148ab5880357ce3c20a042c9ed -r1e533850c7711172462df1e8f569b9f3ff950045
--- Ringtoets/Common/src/Ringtoets.Common.Service/IDesignWaterLevelCalculationService.cs	(.../IDesignWaterLevelCalculationService.cs)	(revision c78a5b1d66fba1148ab5880357ce3c20a042c9ed)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/IDesignWaterLevelCalculationService.cs	(.../IDesignWaterLevelCalculationService.cs)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -25,6 +25,9 @@
 
 namespace Ringtoets.Common.Service
 {
+    /// <summary>
+    /// Interface that provides methods for performing Hydra-Ring calculations for design water level.
+    /// </summary>
     public interface IDesignWaterLevelCalculationService
     {
         /// <summary>
Index: Ringtoets/Common/src/Ringtoets.Common.Service/IWaveHeightCalculationService.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Service/IWaveHeightCalculationService.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/IWaveHeightCalculationService.cs	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -0,0 +1,57 @@
+// Copyright (C) Stichting Deltares 2016. 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 Ringtoets.Common.Service.MessageProviders;
+using Ringtoets.HydraRing.Calculation.Data.Output;
+using Ringtoets.HydraRing.Data;
+
+namespace Ringtoets.Common.Service
+{
+    /// <summary>
+    /// Interface that provides methods for performing Hydra-Ring calculations for design water level.
+    /// </summary>
+    public interface IWaveHeightCalculationService
+    {
+        /// <summary>
+        /// Performs validation of the values in the given <paramref name="hydraulicBoundaryDatabaseFilePath"/>. Error information is logged during
+        /// the execution of the operation.
+        /// </summary>
+        /// <param name="name">The name to use in the validation logs.</param>
+        /// <param name="hydraulicBoundaryDatabaseFilePath">The HLCD file that should be used for performing the calculation.</param>
+        /// <returns><c>False</c> if the connection to <paramref name="hydraulicBoundaryDatabaseFilePath"/> contains validation errors; <c>True</c> otherwise.</returns>
+        bool Validate(string name, string hydraulicBoundaryDatabaseFilePath);
+
+        /// <summary>
+        /// Performs a wave height calculation based on the supplied <see cref="IHydraulicBoundaryLocation"/> and returns the result
+        /// if the calculation was successful. Error and status information is logged during the execution of the operation.
+        /// </summary>
+        /// <param name="messageProvider">The message provider for the services.</param>
+        /// <param name="hydraulicBoundaryLocation">The <see cref="IHydraulicBoundaryLocation"/> to perform the calculation for.</param>
+        /// <param name="hydraulicBoundaryDatabaseFilePath">The HLCD file that should be used for performing the calculation.</param>
+        /// <param name="ringId">The id of the ring to perform the calculation for.</param>
+        /// <param name="norm">The norm to use during the calculation.</param>
+        /// <returns>A <see cref="ReliabilityIndexCalculationOutput"/> on a successful calculation, <c>null</c> otherwise.</returns>
+        ReliabilityIndexCalculationOutput Calculate(ICalculationMessageProvider messageProvider,
+                                                    IHydraulicBoundaryLocation hydraulicBoundaryLocation,
+                                                    string hydraulicBoundaryDatabaseFilePath,
+                                                    string ringId, double norm);
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj
===================================================================
diff -u -rc78a5b1d66fba1148ab5880357ce3c20a042c9ed -r1e533850c7711172462df1e8f569b9f3ff950045
--- Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj	(.../Ringtoets.Common.Service.csproj)	(revision c78a5b1d66fba1148ab5880357ce3c20a042c9ed)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj	(.../Ringtoets.Common.Service.csproj)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -52,6 +52,7 @@
     <Compile Include="DesignWaterLevelCalculationActivity.cs" />
     <Compile Include="DesignWaterLevelCalculationService.cs" />
     <Compile Include="IDesignWaterLevelCalculationService.cs" />
+    <Compile Include="IWaveHeightCalculationService.cs" />
     <Compile Include="MessageProviders\ICalculationMessageProvider.cs" />
     <Compile Include="ProbabilityAssessmentService.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs
===================================================================
diff -u -r8aea6e032ff8aeb4a4f1b85210fd0e2fbbce3a4a -r1e533850c7711172462df1e8f569b9f3ff950045
--- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs	(.../WaveHeightCalculationActivity.cs)	(revision 8aea6e032ff8aeb4a4f1b85210fd0e2fbbce3a4a)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs	(.../WaveHeightCalculationActivity.cs)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -82,11 +82,11 @@
                 return;
             }
 
-            PerformRun(() => WaveHeightCalculationService.Validate(
+            PerformRun(() => WaveHeightCalculationService.Instance.Validate(
                 messageProvider.GetCalculationName(hydraulicBoundaryLocation.Name),
                 hydraulicBoundaryDatabaseFilePath),
                        () => hydraulicBoundaryLocation.WaveHeight = (RoundedDouble) double.NaN,
-                       () => WaveHeightCalculationService.Calculate(
+                       () => WaveHeightCalculationService.Instance.Calculate(
                            messageProvider, hydraulicBoundaryLocation, hydraulicBoundaryDatabaseFilePath,
                            ringId, norm));
         }
Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs
===================================================================
diff -u -r3d6eb89c816218f1cb062f0ad3b0d944942f62e3 -r1e533850c7711172462df1e8f569b9f3ff950045
--- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision 3d6eb89c816218f1cb062f0ad3b0d944942f62e3)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -36,19 +36,28 @@
     /// <summary>
     /// Service that provides methods for performing Hydra-Ring calculations for marginal wave statistics.
     /// </summary>
-    internal static class WaveHeightCalculationService
+    public class WaveHeightCalculationService : IWaveHeightCalculationService
     {
         private static readonly ILog log = LogManager.GetLogger(typeof(WaveHeightCalculationService));
+        private static IWaveHeightCalculationService instance;
 
         /// <summary>
-        /// Performs validation of the values in the given <paramref name="hydraulicBoundaryDatabaseFilePath"/>. Error information is logged during
-        /// the execution of the operation.
+        /// Gets or sets an instance of <see cref="IWaveHeightCalculationService"/>.
         /// </summary>
-        /// <param name="name">The name to use in the validation logs.</param>
-        /// <param name="hydraulicBoundaryDatabaseFilePath">The HLCD file that should be used for performing the calculation.</param>
-        /// <returns><c>False</c> if the connection to <paramref name="hydraulicBoundaryDatabaseFilePath"/> contains validation errors; <c>True</c> otherwise.</returns>
-        internal static bool Validate(string name, string hydraulicBoundaryDatabaseFilePath)
+        public static IWaveHeightCalculationService Instance
         {
+            get
+            {
+                return instance ?? (instance = new WaveHeightCalculationService());
+            }
+            set
+            {
+                instance = value;
+            }
+        }
+
+        public bool Validate(string name, string hydraulicBoundaryDatabaseFilePath)
+        {
             CalculationServiceHelper.LogValidationBeginTime(name);
 
             string validationProblem = HydraulicDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabaseFilePath);
@@ -65,20 +74,10 @@
             return isValid;
         }
 
-        /// <summary>
-        /// Performs a wave height calculation based on the supplied <see cref="IHydraulicBoundaryLocation"/> and returns the result
-        /// if the calculation was successful. Error and status information is logged during the execution of the operation.
-        /// </summary>
-        /// <param name="messageProvider">The message provider for the services.</param>
-        /// <param name="hydraulicBoundaryLocation">The <see cref="IHydraulicBoundaryLocation"/> to perform the calculation for.</param>
-        /// <param name="hydraulicBoundaryDatabaseFilePath">The HLCD file that should be used for performing the calculation.</param>
-        /// <param name="ringId">The id of the ring to perform the calculation for.</param>
-        /// <param name="norm">The norm to use during the calculation.</param>
-        /// <returns>A <see cref="ReliabilityIndexCalculationOutput"/> on a successful calculation, <c>null</c> otherwise.</returns>
-        internal static ReliabilityIndexCalculationOutput Calculate(ICalculationMessageProvider messageProvider,
-                                                                    IHydraulicBoundaryLocation hydraulicBoundaryLocation,
-                                                                    string hydraulicBoundaryDatabaseFilePath,
-                                                                    string ringId, double norm)
+        public ReliabilityIndexCalculationOutput Calculate(ICalculationMessageProvider messageProvider,
+                                                           IHydraulicBoundaryLocation hydraulicBoundaryLocation,
+                                                           string hydraulicBoundaryDatabaseFilePath,
+                                                           string ringId, double norm)
         {
             var hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath);
             var input = CreateInput(hydraulicBoundaryLocation, norm);
Index: Ringtoets/Common/src/Ringtoets.Common.Service/packages.config
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -r1e533850c7711172462df1e8f569b9f3ff950045
--- Ringtoets/Common/src/Ringtoets.Common.Service/packages.config	(.../packages.config)	(revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/packages.config	(.../packages.config)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (C) Stichting Deltares 2016. All rights reserved.
 
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs
===================================================================
diff -u -rc78a5b1d66fba1148ab5880357ce3c20a042c9ed -r1e533850c7711172462df1e8f569b9f3ff950045
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision c78a5b1d66fba1148ab5880357ce3c20a042c9ed)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -303,7 +303,7 @@
             calculationMessageProviderMock.Expect(calc => calc.GetCalculatedNotConvergedMessage(locationName)).Return(calculationNotConvergedMessage);
             mockRepository.ReplayAll();
 
-            string validFilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite");
+            string validFilePath = Path.Combine(testDataPath, validFile);
             const int norm = 300;
             var activity = new DesignWaterLevelCalculationActivity(calculationMessageProviderMock, hydraulicBoundaryLocationMock,
                                                                    validFilePath, "", norm);
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs
===================================================================
diff -u -rc399d2d0b6ce75c643c256bf605b748fc1dea88b -r1e533850c7711172462df1e8f569b9f3ff950045
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision c399d2d0b6ce75c643c256bf605b748fc1dea88b)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -28,6 +28,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Service.MessageProviders;
+using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.HydraRing.Data;
 
 namespace Ringtoets.Common.Service.Test
@@ -150,12 +151,11 @@
         {
             // Setup
             string validFilePath = Path.Combine(testDataPath, validFile);
-            const string locationName = "punt_flw_";
+            const string locationName = "locationName";
             const string activityName = "GetActivityName";
             const string calculationName = "locationName";
 
             var hydraulicBoundaryLocationMock = mockRepository.Stub<IHydraulicBoundaryLocation>();
-            hydraulicBoundaryLocationMock.Expect(hbl => hbl.Id).Return(1300001).Repeat.AtLeastOnce();
             hydraulicBoundaryLocationMock.Expect(hbl => hbl.Name).Return(locationName).Repeat.AtLeastOnce();
             hydraulicBoundaryLocationMock.WaveHeight = new RoundedDouble(2, double.NaN);
 
@@ -168,65 +168,17 @@
                                                              hydraulicBoundaryLocationMock,
                                                              validFilePath, "", 30);
 
-            // Call
-            Action call = () => activity.Run();
-
-            // Assert
-            TestHelper.AssertLogMessages(call, messages =>
+            using (new WaveHeightCalculationServiceConfig())
             {
-                var msgs = messages.ToArray();
-                Assert.AreEqual(5, msgs.Length);
-                StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculationName), msgs[0]);
-                StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculationName), msgs[1]);
-                StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), msgs[2]);
-                StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", msgs[3]);
-                StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[4]);
-            });
-            Assert.AreEqual(ActivityState.Executed, activity.State);
-            mockRepository.VerifyAll();
-        }
+                var testService = (TestWaveHeightCalculationService) WaveHeightCalculationService.Instance;
 
-        [Test]
-        public void Run_InvalidHydraulicBoundaryLocation_PerformValidationAndCalculationAndLogStartAndEndAndError()
-        {
-            // Setup
-            string validFilePath = Path.Combine(testDataPath, validFile);
-            const string locationName = "locationName";
-            const string activityName = "GetActivityName";
-            const string calculationName = "locationName";
-            const string calculationFailedMessage = "calculationFailedMessage";
+                // Call
+                activity.Run();
 
-            var hydraulicBoundaryLocationMock = mockRepository.Stub<IHydraulicBoundaryLocation>();
-            hydraulicBoundaryLocationMock.Expect(hbl => hbl.Id).Return(1).Repeat.AtLeastOnce();
-            hydraulicBoundaryLocationMock.Expect(hbl => hbl.Name).Return(locationName).Repeat.AtLeastOnce();
-            hydraulicBoundaryLocationMock.WaveHeight = new RoundedDouble(2, double.NaN);
-
-            var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
-            calculationMessageProviderMock.Expect(calc => calc.GetActivityName(locationName)).Return(activityName);
-            calculationMessageProviderMock.Expect(calc => calc.GetCalculationName(locationName)).Return(calculationName).Repeat.AtLeastOnce();
-            calculationMessageProviderMock.Expect(calc => calc.GetCalculationFailedMessage(locationName)).Return(calculationFailedMessage);
-            mockRepository.ReplayAll();
-
-            var activity = new WaveHeightCalculationActivity(calculationMessageProviderMock,
-                                                             hydraulicBoundaryLocationMock,
-                                                             validFilePath, "", 30);
-
-            // Call
-            Action call = () => activity.Run();
-
-            // Assert
-            TestHelper.AssertLogMessages(call, messages =>
-            {
-                var msgs = messages.ToArray();
-                Assert.AreEqual(6, msgs.Length);
-                StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculationName), msgs[0]);
-                StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculationName), msgs[1]);
-                StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), msgs[2]);
-                StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", msgs[3]);
-                StringAssert.StartsWith(calculationFailedMessage, msgs[4]);
-                StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[5]);
-            });
-            Assert.AreEqual(ActivityState.Failed, activity.State);
+                // Assert
+                Assert.AreSame(calculationMessageProviderMock, testService.MessageProvider);
+            }
+            Assert.AreEqual(ActivityState.Executed, activity.State);
             mockRepository.VerifyAll();
         }
 
@@ -266,9 +218,8 @@
         public void Finish_ValidCalculationAndRun_SetsProperties()
         {
             // Setup
-            const string locationName = "punt_flw_ 1";
+            const string locationName = "locationName";
             var hydraulicBoundaryLocationMock = mockRepository.Stub<IHydraulicBoundaryLocation>();
-            hydraulicBoundaryLocationMock.Expect(hbl => hbl.Id).Return(1300001).Repeat.AtLeastOnce();
             hydraulicBoundaryLocationMock.Expect(hbl => hbl.Name).Return(locationName).Repeat.AtLeastOnce();
             hydraulicBoundaryLocationMock.WaveHeight = new RoundedDouble(2, double.NaN);
             hydraulicBoundaryLocationMock.WaveHeightCalculationConvergence = CalculationConvergence.CalculatedNotConverged;
@@ -283,7 +234,10 @@
             var activity = new WaveHeightCalculationActivity(calculationMessageProviderMock, hydraulicBoundaryLocationMock,
                                                              validFilePath, "", 30);
 
-            activity.Run();
+            using (new WaveHeightCalculationServiceConfig())
+            {
+                activity.Run();
+            }
 
             // Call
             activity.Finish();
@@ -302,10 +256,8 @@
             const string locationName = "locationName";
             calculationMessageProviderMock.Expect(calc => calc.GetActivityName(locationName)).Return("");
             calculationMessageProviderMock.Expect(calc => calc.GetCalculationName(locationName)).Return("").Repeat.AtLeastOnce();
-            calculationMessageProviderMock.Expect(calc => calc.GetCalculationFailedMessage(locationName)).Return("");
 
             var hydraulicBoundaryLocationMock = mockRepository.Stub<IHydraulicBoundaryLocation>();
-            hydraulicBoundaryLocationMock.Expect(hbl => hbl.Id).Return(1).Repeat.AtLeastOnce();
             hydraulicBoundaryLocationMock.Expect(hbl => hbl.Name).Return(locationName).Repeat.AtLeastOnce();
             hydraulicBoundaryLocationMock.WaveHeight = new RoundedDouble(2, double.NaN);
             hydraulicBoundaryLocationMock.WaveHeightCalculationConvergence = CalculationConvergence.CalculatedConverged;
@@ -316,8 +268,14 @@
             var activity = new WaveHeightCalculationActivity(calculationMessageProviderMock, hydraulicBoundaryLocationMock,
                                                              validFilePath, "", 30);
 
-            activity.Run();
+            using (new WaveHeightCalculationServiceConfig())
+            {
+                var testService = (TestWaveHeightCalculationService) WaveHeightCalculationService.Instance;
+                testService.SetCalculationConvergenceOutput = CalculationConvergence.NotCalculated;
 
+                activity.Run();
+            }
+
             // Call
             activity.Finish();
 
@@ -331,12 +289,11 @@
         public void Finish_ValidCalculationAndRun_LogWarningNoConvergence()
         {
             // Setup
-            const string locationName = "HRbasis_ijsslm_1000";
+            const string locationName = "locationName";
             const string activityName = "getActivityName";
             const string calculationNotConvergedMessage = "GetCalculatedNotConvergedMessage";
 
             var hydraulicBoundaryLocationMock = mockRepository.Stub<IHydraulicBoundaryLocation>();
-            hydraulicBoundaryLocationMock.Expect(hbl => hbl.Id).Return(700002).Repeat.AtLeastOnce();
             hydraulicBoundaryLocationMock.Expect(hbl => hbl.Name).Return(locationName).Repeat.AtLeastOnce();
             hydraulicBoundaryLocationMock.WaveHeight = new RoundedDouble(2, double.NaN);
             hydraulicBoundaryLocationMock.WaveHeightCalculationConvergence = CalculationConvergence.CalculatedConverged;
@@ -347,12 +304,17 @@
             calculationMessageProviderMock.Expect(calc => calc.GetCalculatedNotConvergedMessage(locationName)).Return(calculationNotConvergedMessage);
             mockRepository.ReplayAll();
 
-            string validFilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite");
+            string validFilePath = Path.Combine(testDataPath, validFile);
             const int norm = 300;
             var activity = new WaveHeightCalculationActivity(calculationMessageProviderMock, hydraulicBoundaryLocationMock,
                                                              validFilePath, "", norm);
 
-            activity.Run();
+            using (new WaveHeightCalculationServiceConfig())
+            {
+                var testService = (TestWaveHeightCalculationService) WaveHeightCalculationService.Instance;
+                testService.SetCalculationConvergenceOutput = CalculationConvergence.CalculatedNotConverged;
+                activity.Run();
+            }
 
             // Call
             Action call = () => activity.Finish();
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs
===================================================================
diff -u -r8aea6e032ff8aeb4a4f1b85210fd0e2fbbce3a4a -r1e533850c7711172462df1e8f569b9f3ff950045
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision 8aea6e032ff8aeb4a4f1b85210fd0e2fbbce3a4a)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -27,7 +27,13 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Service.MessageProviders;
+using Ringtoets.HydraRing.Calculation.Data;
+using Ringtoets.HydraRing.Calculation.Data.Input;
+using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics;
 using Ringtoets.HydraRing.Calculation.Data.Output;
+using Ringtoets.HydraRing.Calculation.Parsers;
+using Ringtoets.HydraRing.Calculation.Services;
+using Ringtoets.HydraRing.Calculation.TestUtil;
 using Ringtoets.HydraRing.Data;
 
 namespace Ringtoets.Common.Service.Test
@@ -47,7 +53,7 @@
             bool valid = false;
 
             // Call
-            Action call = () => valid = WaveHeightCalculationService.Validate(calculationName, validFilePath);
+            Action call = () => valid = WaveHeightCalculationService.Instance.Validate(calculationName, validFilePath);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -69,7 +75,7 @@
             bool valid = false;
 
             // Call
-            Action call = () => valid = WaveHeightCalculationService.Validate(calculationName, notValidFilePath);
+            Action call = () => valid = WaveHeightCalculationService.Instance.Validate(calculationName, notValidFilePath);
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -84,13 +90,16 @@
         }
 
         [Test]
-        public void CalculateWaveHeight_ValidHydraulicBoundaryDatabaseAndLocation_LogStartAndEndAndReturnOutput()
+        public void Calculate_ValidHydraulicBoundaryLocation_StartsCalculationWithRightParameters()
         {
             // Setup
             string validFilePath = Path.Combine(testDataPath, validFile);
 
             const string locationName = "punt_flw_ 1";
             const string calculationName = "locationName";
+            const string calculationFailedMessage = "calculationFailedMessage";
+            const string ringId = "ringId";
+            const double norm = 30;
 
             var mockRepository = new MockRepository();
             var hydraulicBoundaryLocationMock = mockRepository.Stub<IHydraulicBoundaryLocation>();
@@ -99,40 +108,43 @@
             hydraulicBoundaryLocationMock.DesignWaterLevel = new RoundedDouble(2, double.NaN);
 
             var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
-            calculationMessageProviderMock.Expect(calc => calc.GetCalculationName(locationName)).Return(calculationName).Repeat.AtLeastOnce();
-
+            calculationMessageProviderMock.Expect(calc => calc.GetCalculationName(locationName)).Return(calculationName);
+            calculationMessageProviderMock.Expect(calc => calc.GetCalculationFailedMessage(locationName)).Return(calculationFailedMessage);
             mockRepository.ReplayAll();
 
-            ReliabilityIndexCalculationOutput output = null;
+            using (new HydraRingCalculationServiceConfig())
+            {
+                var testService = (TestHydraRingCalculationService) HydraRingCalculationService.Instance;
 
-            // Call
-            Action call = () => output = WaveHeightCalculationService.Calculate(
-                calculationMessageProviderMock,
-                hydraulicBoundaryLocationMock,
-                validFilePath, "",
-                300000);
+                WaveHeightCalculationService.Instance.Calculate(
+                    calculationMessageProviderMock,
+                    hydraulicBoundaryLocationMock,
+                    validFilePath, ringId,
+                    norm);
 
-            // Assert
-            TestHelper.AssertLogMessages(call, messages =>
-            {
-                var msgs = messages.ToArray();
-                Assert.AreEqual(3, msgs.Length);
-                StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), msgs[0]);
-                StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", msgs[1]);
-                StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[2]);
-            });
-            Assert.IsNotNull(output);
+                // Assert
+                Assert.AreEqual(testDataPath, testService.HlcdDirectory);
+                Assert.AreEqual(ringId, testService.RingId);
+                Assert.AreEqual(HydraRingUncertaintiesType.All, testService.UncertaintiesType);
+                var parsers = testService.Parsers.ToArray();
+                Assert.AreEqual(1, parsers.Length);
+                Assert.IsInstanceOf<ReliabilityIndexCalculationParser>(parsers[0]);
+                var expectedInput = CreateInput(hydraulicBoundaryLocationMock, norm);
+                AssertInput(expectedInput, testService.HydraRingCalculationInput);
+            }
             mockRepository.VerifyAll();
         }
 
         [Test]
-        public void CalculateWaveHeight_ValidHydraulicBoundaryDatabaseInvalidHydraulicBoundaryLocation_LogStartAndEndAndErrorMessageAndReturnNull()
+        public void Calculate_CalculationOutputNull_LogError()
         {
             // Setup
             string validFilePath = Path.Combine(testDataPath, validFile);
             const string locationName = "locationName";
             const string calculationName = "locationName";
             const string calculationFailedMessage = "calculationFailedMessage";
+            const string ringId = "ringId";
+            const double norm = 30;
 
             var mockRepository = new MockRepository();
             var hydraulicBoundaryLocationMock = mockRepository.Stub<IHydraulicBoundaryLocation>();
@@ -141,30 +153,43 @@
             hydraulicBoundaryLocationMock.DesignWaterLevel = new RoundedDouble(2, double.NaN);
 
             var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
-            calculationMessageProviderMock.Expect(calc => calc.GetCalculationName(locationName)).Return(calculationName).Repeat.AtLeastOnce();
+            calculationMessageProviderMock.Expect(calc => calc.GetCalculationName(locationName)).Return(calculationName);
             calculationMessageProviderMock.Expect(calc => calc.GetCalculationFailedMessage(locationName)).Return(calculationFailedMessage).Repeat.AtLeastOnce();
             mockRepository.ReplayAll();
 
             ReliabilityIndexCalculationOutput output = null;
-
-            // Call
-            Action call = () => output = WaveHeightCalculationService.Calculate(
-                calculationMessageProviderMock,
-                hydraulicBoundaryLocationMock,
-                validFilePath, "", 30000);
-
-            // Assert
-            TestHelper.AssertLogMessages(call, messages =>
+            using (new HydraRingCalculationServiceConfig())
             {
-                var msgs = messages.ToArray();
-                Assert.AreEqual(4, msgs.Length);
-                StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), msgs[0]);
-                StringAssert.StartsWith("Hydra-Ring berekeningsverslag. Klik op details voor meer informatie.", msgs[1]);
-                StringAssert.StartsWith(calculationFailedMessage, msgs[2]);
-                StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[3]);
-            });
-            Assert.IsNull(output);
+                // Call
+                Action call = () => output = WaveHeightCalculationService.Instance.Calculate(
+                    calculationMessageProviderMock,
+                    hydraulicBoundaryLocationMock,
+                    validFilePath, ringId, norm);
+
+                // Assert
+                TestHelper.AssertLogMessages(call, messages =>
+                {
+                    var msgs = messages.ToArray();
+                    Assert.AreEqual(3, msgs.Length);
+                    StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), msgs[0]);
+                    StringAssert.StartsWith(calculationFailedMessage, msgs[1]);
+                    StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[2]);
+                });
+                Assert.IsNull(output);
+            }
             mockRepository.VerifyAll();
         }
+
+        private static void AssertInput(AssessmentLevelCalculationInput expectedInput, HydraRingCalculationInput hydraRingCalculationInput)
+        {
+            Assert.AreEqual(expectedInput.Section.SectionId, hydraRingCalculationInput.Section.SectionId);
+            Assert.AreEqual(expectedInput.HydraulicBoundaryLocationId, hydraRingCalculationInput.HydraulicBoundaryLocationId);
+            Assert.AreEqual(expectedInput.Beta, hydraRingCalculationInput.Beta);
+        }
+
+        private static AssessmentLevelCalculationInput CreateInput(IHydraulicBoundaryLocation hydraulicBoundaryLocation, double norm)
+        {
+            return new AssessmentLevelCalculationInput(1, hydraulicBoundaryLocation.Id, norm);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/Ringtoets.Common.Service.TestUtil.Test.csproj
===================================================================
diff -u -rc6176d50a690c3ff5ee1c4b2902dcabc2e270201 -r1e533850c7711172462df1e8f569b9f3ff950045
--- Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/Ringtoets.Common.Service.TestUtil.Test.csproj	(.../Ringtoets.Common.Service.TestUtil.Test.csproj)	(revision c6176d50a690c3ff5ee1c4b2902dcabc2e270201)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/Ringtoets.Common.Service.TestUtil.Test.csproj	(.../Ringtoets.Common.Service.TestUtil.Test.csproj)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -57,6 +57,8 @@
     <Compile Include="DesignWaterLevelCalculationServiceConfigTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TestDesignWaterLevelCalculationServiceTest.cs" />
+    <Compile Include="TestWaveHeightCalculationServiceTest.cs" />
+    <Compile Include="WaveHeightCalculationServiceConfigTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/TestDesignWaterLevelCalculationServiceTest.cs
===================================================================
diff -u -rc6176d50a690c3ff5ee1c4b2902dcabc2e270201 -r1e533850c7711172462df1e8f569b9f3ff950045
--- Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/TestDesignWaterLevelCalculationServiceTest.cs	(.../TestDesignWaterLevelCalculationServiceTest.cs)	(revision c6176d50a690c3ff5ee1c4b2902dcabc2e270201)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/TestDesignWaterLevelCalculationServiceTest.cs	(.../TestDesignWaterLevelCalculationServiceTest.cs)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using Core.Common.Utils;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -39,7 +38,7 @@
             var service = new TestDesignWaterLevelCalculationService();
 
             // Call
-            bool validated = service.Validate(string.Empty, String.Empty);
+            bool validated = service.Validate(string.Empty, string.Empty);
 
             // Assert
             Assert.IsTrue(validated);
Index: Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/TestWaveHeightCalculationServiceTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/TestWaveHeightCalculationServiceTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/TestWaveHeightCalculationServiceTest.cs	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -0,0 +1,160 @@
+// Copyright (C) Stichting Deltares 2016. 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 Rhino.Mocks;
+using Ringtoets.Common.Service.MessageProviders;
+using Ringtoets.HydraRing.Calculation.Data.Output;
+using Ringtoets.HydraRing.Data;
+
+namespace Ringtoets.Common.Service.TestUtil.Test
+{
+    [TestFixture]
+    public class TestWaveHeightCalculationServiceTest
+    {
+        [Test]
+        public void Validate_Always_ReturnTrue()
+        {
+            // Setup
+            var service = new TestWaveHeightCalculationService();
+
+            // Call
+            bool validated = service.Validate(string.Empty, string.Empty);
+
+            // Assert
+            Assert.IsTrue(validated);
+        }
+
+        [Test]
+        public void Calculate_SetCalculationConvergenceOutputDefault_ReturnsExpectedValue()
+        {
+            // Setup
+            var mockRepository = new MockRepository();
+            var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
+            var hydraulicBoundaryLocationMock = mockRepository.StrictMock<IHydraulicBoundaryLocation>();
+
+            mockRepository.ReplayAll();
+            var service = new TestWaveHeightCalculationService();
+            const double norm = 12.34;
+
+            // Call
+            ReliabilityIndexCalculationOutput output = service.Calculate(calculationMessageProviderMock,
+                                                                         hydraulicBoundaryLocationMock,
+                                                                         string.Empty,
+                                                                         string.Empty, norm);
+
+            // Assert
+            var expectedOutput = new ReliabilityIndexCalculationOutput(norm, StatisticsConverter.NormToBeta(norm));
+            AssertReliabilityIndexCalculationOutput(expectedOutput, output);
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void Calculate_SetCalculationConvergenceOutputCalculatedConverged_ReturnsExpectedValue()
+        {
+            // Setup
+            var mockRepository = new MockRepository();
+            var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
+            var hydraulicBoundaryLocationMock = mockRepository.StrictMock<IHydraulicBoundaryLocation>();
+
+            mockRepository.ReplayAll();
+            var service = new TestWaveHeightCalculationService
+            {
+                SetCalculationConvergenceOutput = CalculationConvergence.CalculatedConverged
+            };
+            const double norm = 12.34;
+
+            // Call
+            ReliabilityIndexCalculationOutput output = service.Calculate(calculationMessageProviderMock,
+                                                                         hydraulicBoundaryLocationMock,
+                                                                         string.Empty,
+                                                                         string.Empty, norm);
+
+            // Assert
+            Assert.AreSame(calculationMessageProviderMock, service.MessageProvider);
+            var expectedOutput = new ReliabilityIndexCalculationOutput(norm, StatisticsConverter.NormToBeta(norm));
+            AssertReliabilityIndexCalculationOutput(expectedOutput, output);
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void Calculate_SetCalculationConvergenceOutputNotCalculated_ReturnsNull()
+        {
+            // Setup
+            var mockRepository = new MockRepository();
+            var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
+            var hydraulicBoundaryLocationMock = mockRepository.StrictMock<IHydraulicBoundaryLocation>();
+
+            mockRepository.ReplayAll();
+            var service = new TestWaveHeightCalculationService
+            {
+                SetCalculationConvergenceOutput = CalculationConvergence.NotCalculated
+            };
+            const double norm = 12.34;
+
+            // Call
+            ReliabilityIndexCalculationOutput output = service.Calculate(calculationMessageProviderMock,
+                                                                         hydraulicBoundaryLocationMock,
+                                                                         string.Empty,
+                                                                         string.Empty, norm);
+
+            // Assert
+            Assert.AreSame(calculationMessageProviderMock, service.MessageProvider);
+            Assert.IsNull(output);
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void Calculate_SetCalculationConvergenceOutputCalculatedNotConverged_ReturnsExpectedValue()
+        {
+            // Setup
+            var mockRepository = new MockRepository();
+            var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
+            var hydraulicBoundaryLocationMock = mockRepository.StrictMock<IHydraulicBoundaryLocation>();
+
+            mockRepository.ReplayAll();
+            var service = new TestWaveHeightCalculationService
+            {
+                SetCalculationConvergenceOutput = CalculationConvergence.CalculatedNotConverged
+            };
+            const double norm = 12.34;
+
+            // Call
+            ReliabilityIndexCalculationOutput output = service.Calculate(calculationMessageProviderMock,
+                                                                         hydraulicBoundaryLocationMock,
+                                                                         string.Empty,
+                                                                         string.Empty, norm);
+
+            // Assert
+            Assert.AreSame(calculationMessageProviderMock, service.MessageProvider);
+            var expectedOutput = new ReliabilityIndexCalculationOutput(norm, norm);
+            AssertReliabilityIndexCalculationOutput(expectedOutput, output);
+            mockRepository.VerifyAll();
+        }
+
+        private static void AssertReliabilityIndexCalculationOutput(ReliabilityIndexCalculationOutput expected, ReliabilityIndexCalculationOutput actual)
+        {
+            Assert.AreEqual(expected.CalculatedReliabilityIndex, actual.CalculatedReliabilityIndex);
+            Assert.AreEqual(expected.Result, actual.Result, 1e-6);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/WaveHeightCalculationServiceConfigTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/WaveHeightCalculationServiceConfigTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/WaveHeightCalculationServiceConfigTest.cs	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -0,0 +1,160 @@
+// Copyright (C) Stichting Deltares 2016. 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 Rhino.Mocks;
+using Ringtoets.Common.Service.MessageProviders;
+using Ringtoets.HydraRing.Calculation.Data.Output;
+using Ringtoets.HydraRing.Data;
+
+namespace Ringtoets.Common.Service.TestUtil.Test
+{
+    [TestFixture]
+    public class WaveHeightCalculationServiceConfigTest
+    {
+        [Test]
+        public void Validate_Always_ReturnTrue()
+        {
+            // Setup
+            var service = new TestWaveHeightCalculationService();
+
+            // Call
+            bool validated = service.Validate(string.Empty, string.Empty);
+
+            // Assert
+            Assert.IsTrue(validated);
+        }
+
+        [Test]
+        public void Calculate_SetCalculationConvergenceOutputDefault_ReturnsExpectedValue()
+        {
+            // Setup
+            var mockRepository = new MockRepository();
+            var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
+            var hydraulicBoundaryLocationMock = mockRepository.StrictMock<IHydraulicBoundaryLocation>();
+
+            mockRepository.ReplayAll();
+            var service = new TestWaveHeightCalculationService();
+            const double norm = 12.34;
+
+            // Call
+            ReliabilityIndexCalculationOutput output = service.Calculate(calculationMessageProviderMock,
+                                                                         hydraulicBoundaryLocationMock,
+                                                                         string.Empty,
+                                                                         string.Empty, norm);
+
+            // Assert
+            var expectedOutput = new ReliabilityIndexCalculationOutput(norm, StatisticsConverter.NormToBeta(norm));
+            AssertReliabilityIndexCalculationOutput(expectedOutput, output);
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void Calculate_SetCalculationConvergenceOutputCalculatedConverged_ReturnsExpectedValue()
+        {
+            // Setup
+            var mockRepository = new MockRepository();
+            var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
+            var hydraulicBoundaryLocationMock = mockRepository.StrictMock<IHydraulicBoundaryLocation>();
+
+            mockRepository.ReplayAll();
+            var service = new TestWaveHeightCalculationService
+            {
+                SetCalculationConvergenceOutput = CalculationConvergence.CalculatedConverged
+            };
+            const double norm = 12.34;
+
+            // Call
+            ReliabilityIndexCalculationOutput output = service.Calculate(calculationMessageProviderMock,
+                                                                         hydraulicBoundaryLocationMock,
+                                                                         string.Empty,
+                                                                         string.Empty, norm);
+
+            // Assert
+            Assert.AreSame(calculationMessageProviderMock, service.MessageProvider);
+            var expectedOutput = new ReliabilityIndexCalculationOutput(norm, StatisticsConverter.NormToBeta(norm));
+            AssertReliabilityIndexCalculationOutput(expectedOutput, output);
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void Calculate_SetCalculationConvergenceOutputNotCalculated_ReturnsNull()
+        {
+            // Setup
+            var mockRepository = new MockRepository();
+            var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
+            var hydraulicBoundaryLocationMock = mockRepository.StrictMock<IHydraulicBoundaryLocation>();
+
+            mockRepository.ReplayAll();
+            var service = new TestWaveHeightCalculationService
+            {
+                SetCalculationConvergenceOutput = CalculationConvergence.NotCalculated
+            };
+            const double norm = 12.34;
+
+            // Call
+            ReliabilityIndexCalculationOutput output = service.Calculate(calculationMessageProviderMock,
+                                                                         hydraulicBoundaryLocationMock,
+                                                                         string.Empty,
+                                                                         string.Empty, norm);
+
+            // Assert
+            Assert.AreSame(calculationMessageProviderMock, service.MessageProvider);
+            Assert.IsNull(output);
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void Calculate_SetCalculationConvergenceOutputCalculatedNotConverged_ReturnsExpectedValue()
+        {
+            // Setup
+            var mockRepository = new MockRepository();
+            var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
+            var hydraulicBoundaryLocationMock = mockRepository.StrictMock<IHydraulicBoundaryLocation>();
+
+            mockRepository.ReplayAll();
+            var service = new TestWaveHeightCalculationService
+            {
+                SetCalculationConvergenceOutput = CalculationConvergence.CalculatedNotConverged
+            };
+            const double norm = 12.34;
+
+            // Call
+            ReliabilityIndexCalculationOutput output = service.Calculate(calculationMessageProviderMock,
+                                                                         hydraulicBoundaryLocationMock,
+                                                                         string.Empty,
+                                                                         string.Empty, norm);
+
+            // Assert
+            Assert.AreSame(calculationMessageProviderMock, service.MessageProvider);
+            var expectedOutput = new ReliabilityIndexCalculationOutput(norm, norm);
+            AssertReliabilityIndexCalculationOutput(expectedOutput, output);
+            mockRepository.VerifyAll();
+        }
+
+        private static void AssertReliabilityIndexCalculationOutput(ReliabilityIndexCalculationOutput expected, ReliabilityIndexCalculationOutput actual)
+        {
+            Assert.AreEqual(expected.CalculatedReliabilityIndex, actual.CalculatedReliabilityIndex);
+            Assert.AreEqual(expected.Result, actual.Result, 1e-6);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil/Ringtoets.Common.Service.TestUtil.csproj
===================================================================
diff -u -rc78a5b1d66fba1148ab5880357ce3c20a042c9ed -r1e533850c7711172462df1e8f569b9f3ff950045
--- Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil/Ringtoets.Common.Service.TestUtil.csproj	(.../Ringtoets.Common.Service.TestUtil.csproj)	(revision c78a5b1d66fba1148ab5880357ce3c20a042c9ed)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil/Ringtoets.Common.Service.TestUtil.csproj	(.../Ringtoets.Common.Service.TestUtil.csproj)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -49,6 +49,8 @@
     <Compile Include="DesignWaterLevelCalculationServiceConfig.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TestDesignWaterLevelCalculationService.cs" />
+    <Compile Include="TestWaveHeightCalculationService.cs" />
+    <Compile Include="WaveHeightCalculationServiceConfig.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil/TestWaveHeightCalculationService.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil/TestWaveHeightCalculationService.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil/TestWaveHeightCalculationService.cs	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -0,0 +1,74 @@
+// Copyright (C) Stichting Deltares 2016. 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 Ringtoets.Common.Service.MessageProviders;
+using Ringtoets.HydraRing.Calculation.Data.Output;
+using Ringtoets.HydraRing.Data;
+
+namespace Ringtoets.Common.Service.TestUtil
+{
+    /// <summary>
+    /// This class allows mocking an actual wave height calculation, 
+    /// so that tests can be performed upon them.
+    /// </summary>
+    public class TestWaveHeightCalculationService : IWaveHeightCalculationService
+    {
+        private CalculationConvergence returnValidOutput = CalculationConvergence.CalculatedConverged;
+
+        /// <summary>
+        /// Set the expected output for <see cref="Calculate"/>.
+        /// </summary>
+        public CalculationConvergence SetCalculationConvergenceOutput
+        {
+            set
+            {
+                returnValidOutput = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the used <see cref="ICalculationMessageProvider"/>.
+        /// </summary>
+        public ICalculationMessageProvider MessageProvider { get; private set; }
+
+        public bool Validate(string name, string hydraulicBoundaryDatabaseFilePath)
+        {
+            return true;
+        }
+
+        public ReliabilityIndexCalculationOutput Calculate(ICalculationMessageProvider messageProvider,
+                                                           IHydraulicBoundaryLocation hydraulicBoundaryLocation, string hydraulicBoundaryDatabaseFilePath,
+                                                           string ringId, double norm)
+        {
+            MessageProvider = messageProvider;
+            switch (returnValidOutput)
+            {
+                case CalculationConvergence.NotCalculated:
+                    return null;
+                case CalculationConvergence.CalculatedNotConverged:
+                    return new ReliabilityIndexCalculationOutput(norm, norm);
+                default:
+                    return new ReliabilityIndexCalculationOutput(norm, StatisticsConverter.NormToBeta(norm));
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil/WaveHeightCalculationServiceConfig.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil/WaveHeightCalculationServiceConfig.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil/WaveHeightCalculationServiceConfig.cs	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -0,0 +1,67 @@
+// Copyright (C) Stichting Deltares 2016. 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;
+
+namespace Ringtoets.Common.Service.TestUtil
+{
+    /// <summary>
+    /// This class can be used to set a temporary <see cref="IWaveHeightCalculationService"/>
+    /// for <see cref="WaveHeightCalculationService.Instance"/> while testing.
+    /// Disposing an instance of this class will revert the
+    /// <see cref="DesignWaterLevelCalculationService.Instance"/>.
+    /// </summary>
+    /// <example>
+    /// The following is an example for how to use this class:
+    /// <code>
+    /// using(new WaveHeightCalculationServiceConfig())
+    /// {
+    ///     var testService = (TestWaveHeightCalculationService) WaveHeightCalculationService.Instance;
+    /// 
+    ///     // Perform test with service
+    /// }
+    /// </code>
+    /// </example>
+    public class WaveHeightCalculationServiceConfig : IDisposable
+    {
+        private readonly IWaveHeightCalculationService previousInstance;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="WaveHeightCalculationServiceConfig"/>.
+        /// Sets a <see cref="TestWaveHeightCalculationService"/> to
+        /// <see cref="WaveHeightCalculationService.Instance"/>.
+        /// </summary>
+        public WaveHeightCalculationServiceConfig()
+        {
+            previousInstance = WaveHeightCalculationService.Instance;
+            WaveHeightCalculationService.Instance = new TestWaveHeightCalculationService();
+        }
+
+        /// <summary>
+        /// Reverts the <see cref="WaveHeightCalculationService.Instance"/> to the value
+        /// it had at time of construction of the <see cref="WaveHeightCalculationServiceConfig"/>.
+        /// </summary>
+        public void Dispose()
+        {
+            WaveHeightCalculationService.Instance = previousInstance;
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -rc399d2d0b6ce75c643c256bf605b748fc1dea88b -r1e533850c7711172462df1e8f569b9f3ff950045
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision c399d2d0b6ce75c643c256bf605b748fc1dea88b)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -324,19 +324,46 @@
 
         private ContextMenuStrip GrassCoverErosionOutwardsWaveHeightLocationsContextMenuStrip(GrassCoverErosionOutwardsWaveHeightLocationsContext nodeData, object parentData, TreeViewControl treeViewControl)
         {
-            var designWaterLevelItem = new StrictContextMenuItem(
+            var waveHeightItem = new StrictContextMenuItem(
                 RingtoetsCommonFormsResources.Calculate_all,
                 nodeData.AssessmentSection.HydraulicBoundaryDatabase == null
                     ? Resources.GrassCoverErosionOutwards_WaveHeight_No_HRD_To_Calculate
                     : Resources.GrassCoverErosionOutwards_WaveHeight_Calculate_All_ToolTip,
                 RingtoetsCommonFormsResources.CalculateAllIcon,
-                null)
+                (sender, args) =>
+                {
+                    if (hydraulicBoundaryLocationCalculationGuiService == null)
+                    {
+                        return;
+                    }
+
+                    IAssessmentSection assessmentSection = nodeData.AssessmentSection;
+                    GrassCoverErosionOutwardsFailureMechanism failureMechanism = assessmentSection.GetFailureMechanisms().OfType<GrassCoverErosionOutwardsFailureMechanism>().FirstOrDefault();
+                    if (failureMechanism == null)
+                    {
+                        return;
+                    }
+
+                    var correctedNormFactor = assessmentSection.FailureMechanismContribution.Norm*
+                                              (failureMechanism.Contribution/100)/
+                                              failureMechanism.GeneralInput.N;
+
+                    hydraulicBoundaryLocationCalculationGuiService.CalculateWaveHeights(
+                        new GrassCoverErosionOutwardsWaveHeightCalculationMessageProvider(),
+                        assessmentSection.HydraulicBoundaryDatabase.FilePath,
+                        nodeData.WrappedData,
+                        nodeData.WrappedData,
+                        assessmentSection.Id,
+                        correctedNormFactor);
+                });
+
+            if (nodeData.AssessmentSection.HydraulicBoundaryDatabase == null)
             {
-                Enabled = false
-            };
+                waveHeightItem.Enabled = false;
+            }
 
             return Gui.Get(nodeData, treeViewControl)
-                      .AddCustomItem(designWaterLevelItem)
+                      .AddCustomItem(waveHeightItem)
                       .AddSeparator()
                       .AddPropertiesItem()
                       .Build();
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/MessageProviders/GrassCoverErosionOutwardsWaveHeightCalculationMessageProvider.cs
===================================================================
diff -u
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/MessageProviders/GrassCoverErosionOutwardsWaveHeightCalculationMessageProvider.cs	(revision 0)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/MessageProviders/GrassCoverErosionOutwardsWaveHeightCalculationMessageProvider.cs	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -0,0 +1,53 @@
+// Copyright (C) Stichting Deltares 2016. 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 Ringtoets.Common.Service.MessageProviders;
+using Ringtoets.GrassCoverErosionOutwards.Data;
+using Ringtoets.GrassCoverErosionOutwards.Service.Properties;
+
+namespace Ringtoets.GrassCoverErosionOutwards.Service.MessageProviders
+{
+    /// <summary>
+    /// This class provides messages used during the wave height calculation for the <see cref="GrassCoverErosionOutwardsFailureMechanism"/>.
+    /// </summary>
+    public class GrassCoverErosionOutwardsWaveHeightCalculationMessageProvider : ICalculationMessageProvider
+    {
+        public string GetCalculationName(string locationName)
+        {
+            return string.Format(Resources.GrassCoverErosionOutwardsPlugin_Name_WaveHeight_for_location_0_, locationName);
+        }
+
+        public string GetActivityName(string locationName)
+        {
+            return string.Format(Resources.GrassCoverErosionOutwardsPlugin_Name_Calculate_WaveHeight_for_location_0_, locationName);
+        }
+
+        public string GetCalculationFailedMessage(string locationName)
+        {
+            return string.Format(Resources.GrassCoverErosionOutwardsPlugin_Calculate_Error_in_WaveHeight_0_calculation, locationName);
+        }
+
+        public string GetCalculatedNotConvergedMessage(string locationName)
+        {
+            return string.Format(Resources.GrassCoverErosionOutwardsPlugin_WaveHeight_calculation_for_location_0_not_converged, locationName);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/Properties/Resources.Designer.cs
===================================================================
diff -u -r50ecb5a95c088a636ec38ce3c5f2fc8addcd67e3 -r1e533850c7711172462df1e8f569b9f3ff950045
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 50ecb5a95c088a636ec38ce3c5f2fc8addcd67e3)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -22,7 +22,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17929
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -92,6 +92,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Er is een fout opgetreden tijdens de Golfhoogte bij doorsnede-eis berekening &apos;{0}&apos;: inspecteer het logbestand..
+        /// </summary>
+        public static string GrassCoverErosionOutwardsPlugin_Calculate_Error_in_WaveHeight_0_calculation {
+            get {
+                return ResourceManager.GetString("GrassCoverErosionOutwardsPlugin_Calculate_Error_in_WaveHeight_0_calculation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Waterstand bij doorsnede-eis berekening voor locatie {0} is niet geconvergeerd..
         /// </summary>
         public static string GrassCoverErosionOutwardsPlugin_DesignWaterLevel_calculation_for_location_0_not_converged {
@@ -111,6 +120,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Golfhoogte bij doorsnede-eis berekenen voor locatie &apos;{0}&apos;.
+        /// </summary>
+        public static string GrassCoverErosionOutwardsPlugin_Name_Calculate_WaveHeight_for_location_0_ {
+            get {
+                return ResourceManager.GetString("GrassCoverErosionOutwardsPlugin_Name_Calculate_WaveHeight_for_location_0_", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Waterstand bij doorsnede-eis voor locatie {0}.
         /// </summary>
         public static string GrassCoverErosionOutwardsPlugin_Name_DesignWaterLevel_for_location_0_ {
@@ -120,6 +138,25 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Golfhoogte bij doorsnede-eis voor locatie {0}.
+        /// </summary>
+        public static string GrassCoverErosionOutwardsPlugin_Name_WaveHeight_for_location_0_ {
+            get {
+                return ResourceManager.GetString("GrassCoverErosionOutwardsPlugin_Name_WaveHeight_for_location_0_", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Golfhoogte bij doorsnede-eis berekening voor locatie {0} is niet geconvergeerd..
+        /// </summary>
+        public static string GrassCoverErosionOutwardsPlugin_WaveHeight_calculation_for_location_0_not_converged {
+            get {
+                return ResourceManager.GetString("GrassCoverErosionOutwardsPlugin_WaveHeight_calculation_for_location_0_not_converg" +
+                        "ed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Waterstand {0} berekenen..
         /// </summary>
         public static string GrassCoverErosionOutwardsWaveConditionsCalculationActivity_OnRun_Calculate_waterlevel_0_ {
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/Properties/Resources.resx
===================================================================
diff -u -r50ecb5a95c088a636ec38ce3c5f2fc8addcd67e3 -r1e533850c7711172462df1e8f569b9f3ff950045
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/Properties/Resources.resx	(.../Resources.resx)	(revision 50ecb5a95c088a636ec38ce3c5f2fc8addcd67e3)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/Properties/Resources.resx	(.../Resources.resx)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -120,12 +120,18 @@
   <data name="GrassCoverErosionOutwardsPlugin_Calculate_Error_in_DesignWaterLevel_0_calculation" xml:space="preserve">
     <value>Er is een fout opgetreden tijdens de Waterstand bij doorsnede-eis berekening '{0}': inspecteer het logbestand.</value>
   </data>
+  <data name="GrassCoverErosionOutwardsPlugin_Calculate_Error_in_WaveHeight_0_calculation" xml:space="preserve">
+    <value>Er is een fout opgetreden tijdens de Golfhoogte bij doorsnede-eis berekening '{0}': inspecteer het logbestand.</value>
+  </data>
   <data name="GrassCoverErosionOutwardsPlugin_DesignWaterLevel_calculation_for_location_0_not_converged" xml:space="preserve">
     <value>Waterstand bij doorsnede-eis berekening voor locatie {0} is niet geconvergeerd.</value>
   </data>
   <data name="GrassCoverErosionOutwardsPlugin_Name_Calculate_DesignWaterLevel_for_location_0_" xml:space="preserve">
     <value>Waterstand bij doorsnede-eis berekenen voor locatie '{0}'</value>
   </data>
+  <data name="GrassCoverErosionOutwardsPlugin_Name_Calculate_WaveHeight_for_location_0_" xml:space="preserve">
+    <value>Golfhoogte bij doorsnede-eis berekenen voor locatie '{0}'</value>
+  </data>
   <data name="GrassCoverErosionOutwardsPlugin_Name_DesignWaterLevel_for_location_0_" xml:space="preserve">
     <value>Waterstand bij doorsnede-eis voor locatie {0}</value>
   </data>
@@ -138,4 +144,10 @@
   <data name="GrassCoverErosionOutwardsWaveConditionsCalculationActivity_OnRun_Subject_0_for_waterlevel_1_started_time_2_" xml:space="preserve">
     <value>Berekening '{0}' voor waterstand '{1}' gestart om: {2}</value>
   </data>
+  <data name="GrassCoverErosionOutwardsPlugin_Name_WaveHeight_for_location_0_" xml:space="preserve">
+    <value>Golfhoogte bij doorsnede-eis voor locatie {0}</value>
+  </data>
+  <data name="GrassCoverErosionOutwardsPlugin_WaveHeight_calculation_for_location_0_not_converged" xml:space="preserve">
+    <value>Golfhoogte bij doorsnede-eis berekening voor locatie {0} is niet geconvergeerd.</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/Ringtoets.GrassCoverErosionOutwards.Service.csproj
===================================================================
diff -u -r50ecb5a95c088a636ec38ce3c5f2fc8addcd67e3 -r1e533850c7711172462df1e8f569b9f3ff950045
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/Ringtoets.GrassCoverErosionOutwards.Service.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Service.csproj)	(revision 50ecb5a95c088a636ec38ce3c5f2fc8addcd67e3)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/Ringtoets.GrassCoverErosionOutwards.Service.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Service.csproj)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -46,6 +46,7 @@
     <Compile Include="GrassCoverErosionOutwardsDataSynchronizationService.cs" />
     <Compile Include="GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs" />
     <Compile Include="MessageProviders\GrassCoverErosionOutwardsDesignWaterLevelCalculationMessageProvider.cs" />
+    <Compile Include="MessageProviders\GrassCoverErosionOutwardsWaveHeightCalculationMessageProvider.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -100,6 +101,7 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/packages.config
===================================================================
diff -u -r50ecb5a95c088a636ec38ce3c5f2fc8addcd67e3 -r1e533850c7711172462df1e8f569b9f3ff950045
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/packages.config	(.../packages.config)	(revision 50ecb5a95c088a636ec38ce3c5f2fc8addcd67e3)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/packages.config	(.../packages.config)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 Copyright (C) Stichting Deltares 2016. All rights reserved.
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r675467f7dd6a785cc879f1ff00781332a0a5f60c -r1e533850c7711172462df1e8f569b9f3ff950045
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision 675467f7dd6a785cc879f1ff00781332a0a5f60c)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -144,31 +144,30 @@
             var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
 
             using (var treeViewControl = new TreeViewControl())
+            using (var plugin = new GrassCoverErosionOutwardsPlugin())
             {
-                using (var plugin = new GrassCoverErosionOutwardsPlugin())
-                {
-                    TreeNodeInfo info = GetInfo(plugin);
+                TreeNodeInfo info = GetInfo(plugin);
 
-                    var context = new GrassCoverErosionOutwardsDesignWaterLevelLocationsContext(
-                        new ObservableList<GrassCoverErosionOutwardsHydraulicBoundaryLocation>(),
-                        assessmentSectionMock);
+                var context = new GrassCoverErosionOutwardsDesignWaterLevelLocationsContext(
+                    new ObservableList<GrassCoverErosionOutwardsHydraulicBoundaryLocation>(),
+                    assessmentSectionMock);
 
-                    var menuBuilder = mockRepository.StrictMock<IContextMenuBuilder>();
-                    menuBuilder.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder);
-                    menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder);
-                    menuBuilder.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilder);
-                    menuBuilder.Expect(mb => mb.Build()).Return(null);
+                var menuBuilder = mockRepository.StrictMock<IContextMenuBuilder>();
+                menuBuilder.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder);
+                menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder);
+                menuBuilder.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilder);
+                menuBuilder.Expect(mb => mb.Build()).Return(null);
 
-                    var gui = mockRepository.StrictMock<IGui>();
-                    gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
+                var gui = mockRepository.StrictMock<IGui>();
+                gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
 
-                    mockRepository.ReplayAll();
+                mockRepository.ReplayAll();
 
-                    plugin.Gui = gui;
+                plugin.Gui = gui;
 
-                    // Call
-                    using (info.ContextMenuStrip(context, null, treeViewControl)) {}
-                }
+                // Call
+                using (info.ContextMenuStrip(context, null, treeViewControl)) {}
+                
             }
 
             // Assert
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -ra60557733c51605766a491d4fcac7aea6d5d5a27 -r1e533850c7711172462df1e8f569b9f3ff950045
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision a60557733c51605766a491d4fcac7aea6d5d5a27)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -20,21 +20,29 @@
 // All rights reserved.
 
 using System.Drawing;
+using System.IO;
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui;
 using Core.Common.Gui.Commands;
 using Core.Common.Gui.ContextMenu;
+using Core.Common.Gui.Forms.MainWindow;
+using Core.Common.Gui.TestUtil.ContextMenu;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Contribution;
+using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Service;
+using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionOutwards.Forms.Properties;
 using Ringtoets.GrassCoverErosionOutwards.Plugin;
+using Ringtoets.GrassCoverErosionOutwards.Service.MessageProviders;
 using Ringtoets.HydraRing.Data;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
@@ -44,46 +52,40 @@
     [TestFixture]
     public class GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest
     {
+        private const int contextMenuRunWaveHeightCalculationsIndex = 0;
         private MockRepository mockRepository;
-        private GrassCoverErosionOutwardsPlugin plugin;
-        private TreeNodeInfo info;
+        private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
 
         [SetUp]
         public void SetUp()
         {
             mockRepository = new MockRepository();
-            plugin = new GrassCoverErosionOutwardsPlugin();
-            info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(GrassCoverErosionOutwardsWaveHeightLocationsContext));
         }
 
-        [TearDown]
-        public void TearDown()
-        {
-            plugin.Dispose();
-            mockRepository.VerifyAll();
-        }
-
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Setup
-            mockRepository.ReplayAll();
+            using (var plugin = new GrassCoverErosionOutwardsPlugin())
+            {
+                TreeNodeInfo info = GetInfo(plugin);
 
-            // Assert
-            Assert.AreEqual(typeof(GrassCoverErosionOutwardsWaveHeightLocationsContext), info.TagType);
+                // Assert
+                Assert.AreEqual(typeof(GrassCoverErosionOutwardsWaveHeightLocationsContext), info.TagType);
 
-            Assert.IsNull(info.EnsureVisibleOnCreate);
-            Assert.IsNull(info.CanRename);
-            Assert.IsNull(info.OnNodeRenamed);
-            Assert.IsNull(info.CanRemove);
-            Assert.IsNull(info.OnNodeRemoved);
-            Assert.IsNull(info.CanCheck);
-            Assert.IsNull(info.IsChecked);
-            Assert.IsNull(info.OnNodeChecked);
-            Assert.IsNull(info.CanDrag);
-            Assert.IsNull(info.CanDrop);
-            Assert.IsNull(info.CanInsert);
-            Assert.IsNull(info.OnDrop);
+                Assert.IsNull(info.EnsureVisibleOnCreate);
+                Assert.IsNull(info.CanRename);
+                Assert.IsNull(info.OnNodeRenamed);
+                Assert.IsNull(info.CanRemove);
+                Assert.IsNull(info.OnNodeRemoved);
+                Assert.IsNull(info.CanCheck);
+                Assert.IsNull(info.IsChecked);
+                Assert.IsNull(info.OnNodeChecked);
+                Assert.IsNull(info.CanDrag);
+                Assert.IsNull(info.CanDrop);
+                Assert.IsNull(info.CanInsert);
+                Assert.IsNull(info.OnDrop);
+            }
         }
 
         [Test]
@@ -93,14 +95,19 @@
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
             mockRepository.ReplayAll();
             var context = new GrassCoverErosionOutwardsWaveHeightLocationsContext(
-                new ObservableList<GrassCoverErosionOutwardsHydraulicBoundaryLocation>(), 
+                new ObservableList<GrassCoverErosionOutwardsHydraulicBoundaryLocation>(),
                 assessmentSectionMock);
 
-            // Call
-            string nodeText = info.Text(context);
+            using (var plugin = new GrassCoverErosionOutwardsPlugin())
+            {
+                TreeNodeInfo info = GetInfo(plugin);
+                // Call
+                string nodeText = info.Text(context);
 
-            // Assert
-            Assert.AreEqual("Golfhoogtes bij doorsnede-eis", nodeText);
+                // Assert
+                Assert.AreEqual("Golfhoogtes bij doorsnede-eis", nodeText);
+            }
+            mockRepository.VerifyAll();
         }
 
         [Test]
@@ -110,14 +117,19 @@
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
             mockRepository.ReplayAll();
             var context = new GrassCoverErosionOutwardsWaveHeightLocationsContext(
-                new ObservableList<GrassCoverErosionOutwardsHydraulicBoundaryLocation>(), 
+                new ObservableList<GrassCoverErosionOutwardsHydraulicBoundaryLocation>(),
                 assessmentSectionMock);
+            using (var plugin = new GrassCoverErosionOutwardsPlugin())
+            {
+                TreeNodeInfo info = GetInfo(plugin);
 
-            // Call
-            Image icon = info.Image(context);
+                // Call
+                Image icon = info.Image(context);
 
-            // Assert
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, icon);
+                // Assert
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, icon);
+            }
+            mockRepository.VerifyAll();
         }
 
         [Test]
@@ -128,29 +140,33 @@
 
             using (var treeViewControl = new TreeViewControl())
             {
-                var context = new GrassCoverErosionOutwardsWaveHeightLocationsContext(
-                    new ObservableList<GrassCoverErosionOutwardsHydraulicBoundaryLocation>(), 
-                    assessmentSectionMock);
+                using (var plugin = new GrassCoverErosionOutwardsPlugin())
+                {
+                    TreeNodeInfo info = GetInfo(plugin);
+                    var context = new GrassCoverErosionOutwardsWaveHeightLocationsContext(
+                        new ObservableList<GrassCoverErosionOutwardsHydraulicBoundaryLocation>(),
+                        assessmentSectionMock);
 
-                var menuBuilder = mockRepository.StrictMock<IContextMenuBuilder>();
-                menuBuilder.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder);
-                menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder);
-                menuBuilder.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilder);
-                menuBuilder.Expect(mb => mb.Build()).Return(null);
+                    var menuBuilder = mockRepository.StrictMock<IContextMenuBuilder>();
+                    menuBuilder.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilder);
+                    menuBuilder.Expect(mb => mb.AddSeparator()).Return(menuBuilder);
+                    menuBuilder.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilder);
+                    menuBuilder.Expect(mb => mb.Build()).Return(null);
 
-                var gui = mockRepository.StrictMock<IGui>();
-                gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
+                    var gui = mockRepository.StrictMock<IGui>();
+                    gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
 
-                mockRepository.ReplayAll();
+                    mockRepository.ReplayAll();
 
-                plugin.Gui = gui;
+                    plugin.Gui = gui;
 
-                // Call
-                using (info.ContextMenuStrip(context, null, treeViewControl)) {}
+                    // Call
+                    using (info.ContextMenuStrip(context, null, treeViewControl)) {}
+                }
             }
 
             // Assert
-            // Part of TearDown
+            mockRepository.VerifyAll();
         }
 
         [Test]
@@ -166,53 +182,57 @@
 
             using (var treeViewControl = new TreeViewControl())
             {
-                var context = new GrassCoverErosionOutwardsWaveHeightLocationsContext(
-                    new ObservableList<GrassCoverErosionOutwardsHydraulicBoundaryLocation>(), 
-                    assessmentSectionMock);
+                using (var plugin = new GrassCoverErosionOutwardsPlugin())
+                {
+                    TreeNodeInfo info = GetInfo(plugin);
+                    var context = new GrassCoverErosionOutwardsWaveHeightLocationsContext(
+                        new ObservableList<GrassCoverErosionOutwardsHydraulicBoundaryLocation>(),
+                        assessmentSectionMock);
 
-                var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler,
-                                                         importCommandHandler,
-                                                         exportCommandHandler,
-                                                         viewCommandsHandler,
-                                                         context,
-                                                         treeViewControl);
+                    var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler,
+                                                             importCommandHandler,
+                                                             exportCommandHandler,
+                                                             viewCommandsHandler,
+                                                             context,
+                                                             treeViewControl);
 
-                var gui = mockRepository.StrictMock<IGui>();
-                gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
+                    var gui = mockRepository.StrictMock<IGui>();
+                    gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
 
-                mockRepository.ReplayAll();
+                    mockRepository.ReplayAll();
 
-                plugin.Gui = gui;
+                    plugin.Gui = gui;
 
-                // Call
-                using (ContextMenuStrip menu = info.ContextMenuStrip(context, null, treeViewControl))
-                {
-                    // Assert
-                    Assert.AreEqual(3, menu.Items.Count);
+                    // Call
+                    using (ContextMenuStrip menu = info.ContextMenuStrip(context, null, treeViewControl))
+                    {
+                        // Assert
+                        Assert.AreEqual(3, menu.Items.Count);
 
-                    TestHelper.AssertContextMenuStripContainsItem(menu,
-                                                                  0,
-                                                                  RingtoetsCommonFormsResources.Calculate_all,
-                                                                  Resources.GrassCoverErosionOutwards_WaveHeight_No_HRD_To_Calculate,
-                                                                  RingtoetsCommonFormsResources.CalculateAllIcon,
-                                                                  false);
-                    TestHelper.AssertContextMenuStripContainsItem(menu,
-                                                                  2,
-                                                                  CoreCommonGuiResources.Properties,
-                                                                  CoreCommonGuiResources.Properties_ToolTip,
-                                                                  CoreCommonGuiResources.PropertiesHS,
-                                                                  false);
+                        TestHelper.AssertContextMenuStripContainsItem(menu,
+                                                                      0,
+                                                                      RingtoetsCommonFormsResources.Calculate_all,
+                                                                      Resources.GrassCoverErosionOutwards_WaveHeight_No_HRD_To_Calculate,
+                                                                      RingtoetsCommonFormsResources.CalculateAllIcon,
+                                                                      false);
+                        TestHelper.AssertContextMenuStripContainsItem(menu,
+                                                                      2,
+                                                                      CoreCommonGuiResources.Properties,
+                                                                      CoreCommonGuiResources.Properties_ToolTip,
+                                                                      CoreCommonGuiResources.PropertiesHS,
+                                                                      false);
 
-                    CollectionAssert.AllItemsAreInstancesOfType(new[]
-                    {
-                        menu.Items[1],
-                    }, typeof(ToolStripSeparator));
+                        CollectionAssert.AllItemsAreInstancesOfType(new[]
+                        {
+                            menu.Items[1],
+                        }, typeof(ToolStripSeparator));
+                    }
                 }
             }
         }
 
         [Test]
-        public void ContextMenuStrip_WithHydraulicDatabase_CalculateAllDisabledWithEnabledTooltip()
+        public void ContextMenuStrip_WithHydraulicDatabase_CalculateAllAndTooltipEnabled()
         {
             // Setup
             var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
@@ -225,47 +245,50 @@
 
             using (var treeViewControl = new TreeViewControl())
             {
-                var context = new GrassCoverErosionOutwardsWaveHeightLocationsContext(
-                    new ObservableList<GrassCoverErosionOutwardsHydraulicBoundaryLocation>(), 
-                    assessmentSectionMock);
+                using (var plugin = new GrassCoverErosionOutwardsPlugin())
+                {
+                    TreeNodeInfo info = GetInfo(plugin);
+                    var context = new GrassCoverErosionOutwardsWaveHeightLocationsContext(
+                        new ObservableList<GrassCoverErosionOutwardsHydraulicBoundaryLocation>(),
+                        assessmentSectionMock);
 
-                var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler,
-                                                         importCommandHandler,
-                                                         exportCommandHandler,
-                                                         viewCommandsHandler,
-                                                         context,
-                                                         treeViewControl);
+                    var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler,
+                                                             importCommandHandler,
+                                                             exportCommandHandler,
+                                                             viewCommandsHandler,
+                                                             context,
+                                                             treeViewControl);
 
-                var gui = mockRepository.StrictMock<IGui>();
-                gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
+                    var gui = mockRepository.StrictMock<IGui>();
+                    gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder);
 
-                mockRepository.ReplayAll();
+                    mockRepository.ReplayAll();
 
-                plugin.Gui = gui;
+                    plugin.Gui = gui;
 
-                // Call
-                using (ContextMenuStrip menu = info.ContextMenuStrip(context, null, treeViewControl))
-                {
-                    // Assert
-                    Assert.AreEqual(3, menu.Items.Count);
+                    // Call
+                    using (ContextMenuStrip menu = info.ContextMenuStrip(context, null, treeViewControl))
+                    {
+                        // Assert
+                        Assert.AreEqual(3, menu.Items.Count);
 
-                    TestHelper.AssertContextMenuStripContainsItem(menu,
-                                                                  0,
-                                                                  RingtoetsCommonFormsResources.Calculate_all,
-                                                                  Resources.GrassCoverErosionOutwards_WaveHeight_Calculate_All_ToolTip,
-                                                                  RingtoetsCommonFormsResources.CalculateAllIcon,
-                                                                  false);
-                    TestHelper.AssertContextMenuStripContainsItem(menu,
-                                                                  2,
-                                                                  CoreCommonGuiResources.Properties,
-                                                                  CoreCommonGuiResources.Properties_ToolTip,
-                                                                  CoreCommonGuiResources.PropertiesHS,
-                                                                  false);
+                        TestHelper.AssertContextMenuStripContainsItem(menu,
+                                                                      0,
+                                                                      RingtoetsCommonFormsResources.Calculate_all,
+                                                                      Resources.GrassCoverErosionOutwards_WaveHeight_Calculate_All_ToolTip,
+                                                                      RingtoetsCommonFormsResources.CalculateAllIcon);
+                        TestHelper.AssertContextMenuStripContainsItem(menu,
+                                                                      2,
+                                                                      CoreCommonGuiResources.Properties,
+                                                                      CoreCommonGuiResources.Properties_ToolTip,
+                                                                      CoreCommonGuiResources.PropertiesHS,
+                                                                      false);
 
-                    CollectionAssert.AllItemsAreInstancesOfType(new[]
-                    {
-                        menu.Items[1],
-                    }, typeof(ToolStripSeparator));
+                        CollectionAssert.AllItemsAreInstancesOfType(new[]
+                        {
+                            menu.Items[1],
+                        }, typeof(ToolStripSeparator));
+                    }
                 }
             }
         }
@@ -291,11 +314,16 @@
             };
             var context = new GrassCoverErosionOutwardsWaveHeightLocationsContext(locations, assessmentSectionMock);
 
-            // Call
-            Color color = info.ForeColor(context);
+            using (var plugin = new GrassCoverErosionOutwardsPlugin())
+            {
+                TreeNodeInfo info = GetInfo(plugin);
 
-            // Assert
-            Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), color);
+                // Call
+                Color color = info.ForeColor(context);
+
+                // Assert
+                Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), color);
+            }
         }
 
         [Test]
@@ -305,14 +333,87 @@
             var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
             mockRepository.ReplayAll();
             var context = new GrassCoverErosionOutwardsWaveHeightLocationsContext(
-                new ObservableList<GrassCoverErosionOutwardsHydraulicBoundaryLocation>(), 
+                new ObservableList<GrassCoverErosionOutwardsHydraulicBoundaryLocation>(),
                 assessmentSectionMock);
 
-            // Call
-            Color color = info.ForeColor(context);
+            using (var plugin = new GrassCoverErosionOutwardsPlugin())
+            {
+                TreeNodeInfo info = GetInfo(plugin);
+                // Call
+                Color color = info.ForeColor(context);
 
-            // Assert
-            Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), color);
+                // Assert
+                Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), color);
+            }
         }
+
+        [Test]
+        [RequiresSTA]
+        public void GivenHydraulicBoundaryLocationThatFails_CalculatingWaveHeightFromContextMenu_ThenLogMessagesAddedPreviousOutputNotAffected()
+        {
+            // Given
+            var guiMock = mockRepository.DynamicMock<IGui>();
+            var location = new HydraulicBoundaryLocation(1, "HydraulicBoundaryLocation", 1.1, 2.2);
+            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
+            assessmentSectionMock.Expect(a => a.Id).Return("Id");
+            assessmentSectionMock.Expect(a => a.GetFailureMechanisms()).Return(new[]
+            {
+                new GrassCoverErosionOutwardsFailureMechanism
+                {
+                    Contribution = 1
+                }
+            });
+            assessmentSectionMock.Expect(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 1, 300));
+            assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            {
+                FilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite"),
+                Locations =
+                {
+                    location
+                }
+            };
+
+            var grassCoverErosionOutwardsHydraulicBoundaryLocation = new GrassCoverErosionOutwardsHydraulicBoundaryLocation(location);
+            var context = new GrassCoverErosionOutwardsWaveHeightLocationsContext(new ObservableList<GrassCoverErosionOutwardsHydraulicBoundaryLocation>
+            {
+                grassCoverErosionOutwardsHydraulicBoundaryLocation
+            }, assessmentSectionMock);
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                using (var plugin = new GrassCoverErosionOutwardsPlugin())
+                {
+                    TreeNodeInfo info = GetInfo(plugin);
+                    guiMock.Expect(g => g.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                    guiMock.Expect(g => g.MainWindow).Return(mockRepository.Stub<IMainWindow>());
+                    mockRepository.ReplayAll();
+
+                    plugin.Gui = guiMock;
+                    plugin.Activate();
+
+                    using (ContextMenuStrip contextMenuAdapter = info.ContextMenuStrip(context, null, treeViewControl))
+                    {
+                        using (new WaveHeightCalculationServiceConfig())
+                        {
+                            var testService = (TestWaveHeightCalculationService) WaveHeightCalculationService.Instance;
+                            testService.SetCalculationConvergenceOutput = CalculationConvergence.NotCalculated;
+
+                            // When
+                            contextMenuAdapter.Items[contextMenuRunWaveHeightCalculationsIndex].PerformClick();
+
+                            // Then
+                            Assert.IsInstanceOf<GrassCoverErosionOutwardsWaveHeightCalculationMessageProvider>(testService.MessageProvider);
+                            Assert.AreEqual(CalculationConvergence.NotCalculated, grassCoverErosionOutwardsHydraulicBoundaryLocation.WaveHeightCalculationConvergence);
+                        }
+                    }
+                }
+            }
+            mockRepository.VerifyAll();
+        }
+
+        private static TreeNodeInfo GetInfo(GrassCoverErosionOutwardsPlugin plugin)
+        {
+            return plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(GrassCoverErosionOutwardsWaveHeightLocationsContext));
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/MessageProviders/GrassCoverErosionOutwardsWaveHeightCalculationMessageProviderTest.cs
===================================================================
diff -u
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/MessageProviders/GrassCoverErosionOutwardsWaveHeightCalculationMessageProviderTest.cs	(revision 0)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/MessageProviders/GrassCoverErosionOutwardsWaveHeightCalculationMessageProviderTest.cs	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -0,0 +1,110 @@
+// Copyright (C) Stichting Deltares 2016. 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 NUnit.Framework;
+using Ringtoets.Common.Service.MessageProviders;
+using Ringtoets.GrassCoverErosionOutwards.Service.MessageProviders;
+
+namespace Ringtoets.GrassCoverErosionOutwards.Service.Test.MessageProviders
+{
+    [TestFixture]
+    public class GrassCoverErosionOutwardsWaveHeightCalculationMessageProviderTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Setup & Call
+            var provider = new GrassCoverErosionOutwardsWaveHeightCalculationMessageProvider();
+
+            // Assert
+            Assert.IsInstanceOf<ICalculationMessageProvider>(provider);
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase("value")]
+        public void GetCalculationName_ValidNames_ExpectedValue(string name)
+        {
+            // Setup
+            var provider = new GrassCoverErosionOutwardsWaveHeightCalculationMessageProvider();
+
+            // Call
+            var calculationName = provider.GetCalculationName(name);
+
+            // Assert
+            var expectedName = string.Format("Golfhoogte bij doorsnede-eis voor locatie {0}", name);
+            Assert.AreEqual(expectedName, calculationName);
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase("value")]
+        public void GetActivityName_ValidNames_ExpectedValue(string name)
+        {
+            // Setup
+            var provider = new GrassCoverErosionOutwardsWaveHeightCalculationMessageProvider();
+
+            // Call
+            var activityName = provider.GetActivityName(name);
+
+            // Assert
+            var expectedName = string.Format("Golfhoogte bij doorsnede-eis berekenen voor locatie '{0}'", name);
+            Assert.AreEqual(expectedName, activityName);
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase("value")]
+        public void GetCalculationFailedMessage_ValidNames_ExpectedValue(string name)
+        {
+            // Setup
+            var provider = new GrassCoverErosionOutwardsWaveHeightCalculationMessageProvider();
+
+            // Call
+            var message = provider.GetCalculationFailedMessage(name);
+
+            // Assert
+            var expectedMessage = string.Format("Er is een fout opgetreden tijdens de Golfhoogte bij " +
+                                                "doorsnede-eis berekening '{0}': inspecteer het logbestand.", name);
+            Assert.AreEqual(expectedMessage, message);
+        }
+
+        [Test]
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase("value")]
+        public void GetCalculatedNotConvergedMessage_ValidNames_ExpectedValue(string name)
+        {
+            // Setup
+            var provider = new GrassCoverErosionOutwardsWaveHeightCalculationMessageProvider();
+
+            // Call
+            var message = provider.GetCalculatedNotConvergedMessage(name);
+
+            // Assert
+            var expectedMessage = string.Format("Golfhoogte bij doorsnede-eis berekening voor locatie {0} is niet geconvergeerd.", name);
+            Assert.AreEqual(expectedMessage, message);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj
===================================================================
diff -u -r50ecb5a95c088a636ec38ce3c5f2fc8addcd67e3 -r1e533850c7711172462df1e8f569b9f3ff950045
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj)	(revision 50ecb5a95c088a636ec38ce3c5f2fc8addcd67e3)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj)	(revision 1e533850c7711172462df1e8f569b9f3ff950045)
@@ -55,6 +55,7 @@
     <Compile Include="GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs" />
     <Compile Include="GrassCoverErosionOutwardsWaveConditionsCalculationActivityTest.cs" />
     <Compile Include="MessageProviders\GrassCoverErosionOutwardsDesignWaterLevelCalculationMessageProviderTest.cs" />
+    <Compile Include="MessageProviders\GrassCoverErosionOutwardsWaveHeightCalculationMessageProviderTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>