Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/CalculationContextProperties.cs
===================================================================
diff -u -rc43715cf3e6dce0c427b10c4852d5ae54e6d668d -r6b330f8e7c1df6bc70f6de1e4251f69cd6865a81
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/CalculationContextProperties.cs	(.../CalculationContextProperties.cs)	(revision c43715cf3e6dce0c427b10c4852d5ae54e6d668d)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/CalculationContextProperties.cs	(.../CalculationContextProperties.cs)	(revision 6b330f8e7c1df6bc70f6de1e4251f69cd6865a81)
@@ -29,7 +29,6 @@
 
 namespace Ringtoets.Integration.Forms.PropertyClasses
 {
-    [ResourcesDisplayName(typeof(Resources), "CalculationContextProperties_DisplayName")]
     public class CalculationContextProperties : ObjectProperties<ICalculationContext<ICalculation, IFailureMechanism>>
     {
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_General")]
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/IWaveConditionsCalculationService.cs
===================================================================
diff -u -rfb6c8cb473282ccd9b920afddb33a2284c7274cd -r6b330f8e7c1df6bc70f6de1e4251f69cd6865a81
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/IWaveConditionsCalculationService.cs	(.../IWaveConditionsCalculationService.cs)	(revision fb6c8cb473282ccd9b920afddb33a2284c7274cd)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/IWaveConditionsCalculationService.cs	(.../IWaveConditionsCalculationService.cs)	(revision 6b330f8e7c1df6bc70f6de1e4251f69cd6865a81)
@@ -30,6 +30,15 @@
     public interface IWaveConditionsCalculationService
     {
         /// <summary>
+        /// Performs validation over the values on the given calculation.
+        /// Error and status information is logged during the execution of the operation.
+        /// </summary>
+        /// <param name="name">The name of the calculation to perform.</param>
+        /// <returns><c>False</c> if given parameters result in validation errors;
+        /// <c>True</c> otherwise.</returns>
+        bool Validate(string name);
+
+        /// <summary>
         /// Performs a wave conditions cosine calculation based on the supplied <see cref="WaveConditionsInput"/>
         /// and returns the <see cref="WaveConditionsOutput"/> if the calculation was succesful.
         /// Error and status information is logged during the execution of the operation.
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Ringtoets.Revetment.Service.csproj
===================================================================
diff -u -r5b3041efe0fd2d334984d6c730815242b30229aa -r6b330f8e7c1df6bc70f6de1e4251f69cd6865a81
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Ringtoets.Revetment.Service.csproj	(.../Ringtoets.Revetment.Service.csproj)	(revision 5b3041efe0fd2d334984d6c730815242b30229aa)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Ringtoets.Revetment.Service.csproj	(.../Ringtoets.Revetment.Service.csproj)	(revision 6b330f8e7c1df6bc70f6de1e4251f69cd6865a81)
@@ -69,6 +69,10 @@
       <Name>Ringtoets.Common.Data</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Service\Ringtoets.Common.Service.csproj">
+      <Project>{D951D6DA-FE83-4920-9FDB-63BF96480B54}</Project>
+      <Name>Ringtoets.Common.Service</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Calculation\Ringtoets.HydraRing.Calculation.csproj">
       <Project>{888D4097-8BC2-4703-9FB1-8744C94D525E}</Project>
       <Name>Ringtoets.HydraRing.Calculation</Name>
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationService.cs
===================================================================
diff -u -rfb6c8cb473282ccd9b920afddb33a2284c7274cd -r6b330f8e7c1df6bc70f6de1e4251f69cd6865a81
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationService.cs	(.../WaveConditionsCalculationService.cs)	(revision fb6c8cb473282ccd9b920afddb33a2284c7274cd)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationService.cs	(.../WaveConditionsCalculationService.cs)	(revision 6b330f8e7c1df6bc70f6de1e4251f69cd6865a81)
@@ -24,6 +24,7 @@
 using System.Linq;
 using Core.Common.Base.Data;
 using log4net;
+using Ringtoets.Common.Service;
 using Ringtoets.HydraRing.Calculation.Data;
 using Ringtoets.HydraRing.Calculation.Data.Input.WaveConditions;
 using Ringtoets.HydraRing.Calculation.Data.Output;
@@ -59,6 +60,13 @@
             }
         }
 
+        public bool Validate(string name)
+        {
+            // TODO: Implement validation with WTI-826
+            return CalculationServiceHelper.PerformValidation(name,
+                                                              () => new string[0]);
+        }
+
         public WaveConditionsOutput Calculate(RoundedDouble waterLevel,
                                               double a,
                                               double b,
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil/Ringtoets.Revetment.Service.TestUtil.csproj
===================================================================
diff -u -rfb6c8cb473282ccd9b920afddb33a2284c7274cd -r6b330f8e7c1df6bc70f6de1e4251f69cd6865a81
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil/Ringtoets.Revetment.Service.TestUtil.csproj	(.../Ringtoets.Revetment.Service.TestUtil.csproj)	(revision fb6c8cb473282ccd9b920afddb33a2284c7274cd)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil/Ringtoets.Revetment.Service.TestUtil.csproj	(.../Ringtoets.Revetment.Service.TestUtil.csproj)	(revision 6b330f8e7c1df6bc70f6de1e4251f69cd6865a81)
@@ -65,6 +65,10 @@
       <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
       <Name>Ringtoets.Common.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Data\Ringtoets.HydraRing.Data.csproj">
+      <Project>{70F8CC9C-5BC8-4FB2-B201-EAE7FA8088C2}</Project>
+      <Name>Ringtoets.HydraRing.Data</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.Revetment.Data\Ringtoets.Revetment.Data.csproj">
       <Project>{87C2C553-C0BC-40BF-B1EA-B83BFF357F27}</Project>
       <Name>Ringtoets.Revetment.Data</Name>
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil/TestWaveConditionsCalculationService.cs
===================================================================
diff -u -r5b3041efe0fd2d334984d6c730815242b30229aa -r6b330f8e7c1df6bc70f6de1e4251f69cd6865a81
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil/TestWaveConditionsCalculationService.cs	(.../TestWaveConditionsCalculationService.cs)	(revision 5b3041efe0fd2d334984d6c730815242b30229aa)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil/TestWaveConditionsCalculationService.cs	(.../TestWaveConditionsCalculationService.cs)	(revision 6b330f8e7c1df6bc70f6de1e4251f69cd6865a81)
@@ -30,6 +30,11 @@
     /// </summary>
     public class TestWaveConditionsCalculationService : IWaveConditionsCalculationService
     {
+        public bool Validate(string name)
+        {
+            return true;
+        }
+
         public WaveConditionsOutput Calculate(RoundedDouble waterLevel,
                                               double a,
                                               double b,
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/Ringtoets.StabilityStoneCover.Plugin.csproj
===================================================================
diff -u -r0d98073e4ba2bdc6b69b7f875508488d1fa0148a -r6b330f8e7c1df6bc70f6de1e4251f69cd6865a81
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/Ringtoets.StabilityStoneCover.Plugin.csproj	(.../Ringtoets.StabilityStoneCover.Plugin.csproj)	(revision 0d98073e4ba2bdc6b69b7f875508488d1fa0148a)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/Ringtoets.StabilityStoneCover.Plugin.csproj	(.../Ringtoets.StabilityStoneCover.Plugin.csproj)	(revision 6b330f8e7c1df6bc70f6de1e4251f69cd6865a81)
@@ -110,6 +110,10 @@
       <Name>Ringtoets.Revetment.Data</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Revetment\src\Ringtoets.Revetment.Service\Ringtoets.Revetment.Service.csproj">
+      <Project>{2331235F-1E56-4344-ACC2-191C22A39594}</Project>
+      <Name>Ringtoets.Revetment.Service</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Ringtoets.StabilityStoneCover.Data\Ringtoets.StabilityStoneCover.Data.csproj">
       <Project>{b479e3af-7c34-488c-bb73-d324100d36c9}</Project>
       <Name>Ringtoets.StabilityStoneCover.Data</Name>
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs
===================================================================
diff -u -r45cdbd9c1a4955375e03be0085a22152e53232ef -r6b330f8e7c1df6bc70f6de1e4251f69cd6865a81
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision 45cdbd9c1a4955375e03be0085a22152e53232ef)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision 6b330f8e7c1df6bc70f6de1e4251f69cd6865a81)
@@ -35,7 +35,9 @@
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Forms.TreeNodeInfos;
+using Ringtoets.HydraRing.Data;
 using Ringtoets.HydraRing.IO;
+using Ringtoets.Revetment.Service;
 using Ringtoets.StabilityStoneCover.Data;
 using Ringtoets.StabilityStoneCover.Forms.PresentationObjects;
 using Ringtoets.StabilityStoneCover.Forms.PropertyClasses;
@@ -280,7 +282,11 @@
 
             builder.AddSeparator()
                    .AddValidateAllCalculationsInGroupItem(nodeData,
-                                                          c => ValidateAll(c.WrappedData.GetCalculations().OfType<StabilityStoneCoverWaveConditionsCalculation>()),
+                                                          c => ValidateAll(
+                                                              c.WrappedData.GetCalculations().OfType<StabilityStoneCoverWaveConditionsCalculation>(),
+                                                              c.FailureMechanism.GeneralInput,
+                                                              c.AssessmentSection.FailureMechanismContribution.Norm,
+                                                              c.AssessmentSection.HydraulicBoundaryDatabase),
                                                           ValidateAllDataAvailableAndGetErrorMessageForCalculationGroup)
                    .AddPerformAllCalculationsInGroupItem(group, nodeData, CalculateAll)
                    .AddClearAllCalculationOutputInGroupItem(group)
@@ -358,11 +364,11 @@
             nodeData.WrappedData.NotifyObservers();
         }
 
-        private void ValidateAll(IEnumerable<StabilityStoneCoverWaveConditionsCalculation> calculations)
+        private void ValidateAll(IEnumerable<StabilityStoneCoverWaveConditionsCalculation> calculations, GeneralStabilityStoneCoverWaveConditionsInput generalInput, int norm, HydraulicBoundaryDatabase database)
         {
             foreach (StabilityStoneCoverWaveConditionsCalculation calculation in calculations)
             {
-                StabilityStoneCoverCalculationService.Validate(calculation);
+                WaveConditionsCalculationService.Instance.Validate(calculation.Name);
             }
         }
 
@@ -385,6 +391,11 @@
                                                                                                     failureMechanism,
                                                                                                     assessmentSection))
                     .ToList());
+
+            foreach (var calculation in calculations)
+            {
+                calculation.NotifyObservers();
+            }
         }
 
         private void WaveConditionsCalculationGroupContextOnNodeRemoved(StabilityStoneCoverWaveConditionsCalculationGroupContext nodeData, object parentNodeData)
@@ -429,7 +440,11 @@
             StabilityStoneCoverWaveConditionsCalculation calculation = nodeData.WrappedData;
 
             return builder.AddValidateCalculationItem(nodeData,
-                                                      c => StabilityStoneCoverCalculationService.Validate(c.WrappedData),
+                                                      c => ValidateAll(
+                                                          new [] { c.WrappedData },
+                                                          c.FailureMechanism.GeneralInput,
+                                                          c.AssessmentSection.FailureMechanismContribution.Norm,
+                                                          c.AssessmentSection.HydraulicBoundaryDatabase),
                                                       ValidateAllDataAvailableAndGetErrorMessageForCalculation)
                           .AddPerformCalculationItem(calculation, nodeData, PerformCalculation)
                           .AddClearCalculationOutputItem(calculation)
@@ -452,6 +467,7 @@
                                                                                                       Path.GetDirectoryName(context.AssessmentSection.HydraulicBoundaryDatabase.FilePath),
                                                                                                       context.FailureMechanism,
                                                                                                       context.AssessmentSection));
+            calculation.NotifyObservers();
         }
 
         private void WaveConditionsCalculationContextOnNodeRemoved(StabilityStoneCoverWaveConditionsCalculationContext nodeData, object parentNodeData)
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/Ringtoets.StabilityStoneCover.Service.csproj
===================================================================
diff -u -re2dbd70747659819d97614b9a73733babaa7b106 -r6b330f8e7c1df6bc70f6de1e4251f69cd6865a81
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/Ringtoets.StabilityStoneCover.Service.csproj	(.../Ringtoets.StabilityStoneCover.Service.csproj)	(revision e2dbd70747659819d97614b9a73733babaa7b106)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/Ringtoets.StabilityStoneCover.Service.csproj	(.../Ringtoets.StabilityStoneCover.Service.csproj)	(revision 6b330f8e7c1df6bc70f6de1e4251f69cd6865a81)
@@ -51,7 +51,6 @@
     </Compile>
     <Compile Include="StabilityStoneCoverDataSynchronizationService.cs" />
     <Compile Include="StabilityStoneCoverWaveConditionsCalculationActivityOutput.cs" />
-    <Compile Include="StabilityStoneCoverCalculationService.cs" />
     <Compile Include="StabilityStoneCoverWaveConditionsCalculationActivity.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -81,6 +80,10 @@
       <Name>Ringtoets.HydraRing.Calculation</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Data\Ringtoets.HydraRing.Data.csproj">
+      <Project>{70f8cc9c-5bc8-4fb2-b201-eae7fa8088c2}</Project>
+      <Name>Ringtoets.HydraRing.Data</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Revetment\src\Ringtoets.Revetment.Data\Ringtoets.Revetment.Data.csproj">
       <Project>{87C2C553-C0BC-40BF-B1EA-B83BFF357F27}</Project>
       <Name>Ringtoets.Revetment.Data</Name>
Fisheye: Tag 6b330f8e7c1df6bc70f6de1e4251f69cd6865a81 refers to a dead (removed) revision in file `Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverCalculationService.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationActivity.cs
===================================================================
diff -u -re2dbd70747659819d97614b9a73733babaa7b106 -r6b330f8e7c1df6bc70f6de1e4251f69cd6865a81
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationActivity.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivity.cs)	(revision e2dbd70747659819d97614b9a73733babaa7b106)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationActivity.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivity.cs)	(revision 6b330f8e7c1df6bc70f6de1e4251f69cd6865a81)
@@ -83,7 +83,7 @@
 
         protected override void OnRun()
         {
-            PerformRun(() => true,
+            PerformRun(() => WaveConditionsCalculationService.Instance.Validate(calculation.Name),
                        () => StabilityStoneCoverDataSynchronizationService.ClearWaveConditionsCalculationOutput(calculation),
                        () =>
                        {
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Ringtoets.StabilityStoneCover.Forms.Test.csproj
===================================================================
diff -u -ra6bf5045f290fdd35cba2545611613f2608ef90a -r6b330f8e7c1df6bc70f6de1e4251f69cd6865a81
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Ringtoets.StabilityStoneCover.Forms.Test.csproj	(.../Ringtoets.StabilityStoneCover.Forms.Test.csproj)	(revision a6bf5045f290fdd35cba2545611613f2608ef90a)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Ringtoets.StabilityStoneCover.Forms.Test.csproj	(.../Ringtoets.StabilityStoneCover.Forms.Test.csproj)	(revision 6b330f8e7c1df6bc70f6de1e4251f69cd6865a81)
@@ -145,10 +145,18 @@
       <Project>{70f8cc9c-5bc8-4fb2-b201-eae7fa8088c2}</Project>
       <Name>Ringtoets.HydraRing.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\HydraRing\test\Ringtoets.HydraRing.Calculation.TestUtil\Ringtoets.HydraRing.Calculation.TestUtil.csproj">
+      <Project>{74CBA865-9338-447F-BAD9-28312446AE84}</Project>
+      <Name>Ringtoets.HydraRing.Calculation.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Revetment\src\Ringtoets.Revetment.Data\Ringtoets.Revetment.Data.csproj">
       <Project>{87c2c553-c0bc-40bf-b1ea-b83bff357f27}</Project>
       <Name>Ringtoets.Revetment.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Revetment\test\Ringtoets.Revetment.Service.TestUtil\Ringtoets.Revetment.Service.TestUtil.csproj">
+      <Project>{EA416DD2-1633-439E-8512-B9933E37B9C5}</Project>
+      <Name>Ringtoets.Revetment.Service.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.StabilityStoneCover.Data\Ringtoets.StabilityStoneCover.Data.csproj">
       <Project>{b479e3af-7c34-488c-bb73-d324100d36c9}</Project>
       <Name>Ringtoets.StabilityStoneCover.Data</Name>
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r45cdbd9c1a4955375e03be0085a22152e53232ef -r6b330f8e7c1df6bc70f6de1e4251f69cd6865a81
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 45cdbd9c1a4955375e03be0085a22152e53232ef)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 6b330f8e7c1df6bc70f6de1e4251f69cd6865a81)
@@ -25,21 +25,27 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
+using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 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.TestUtil;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Contribution;
+using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Forms.PresentationObjects;
+using Ringtoets.HydraRing.Calculation.TestUtil;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.Revetment.Data;
+using Ringtoets.Revetment.Service.TestUtil;
 using Ringtoets.StabilityStoneCover.Data;
 using Ringtoets.StabilityStoneCover.Forms.PresentationObjects;
 using Ringtoets.StabilityStoneCover.Plugin;
@@ -630,6 +636,9 @@
             {
                 FilePath = validHydroDatabasePath
             };
+            assessmentSection.Stub(a => a.Id).Return("someId");
+            assessmentSection.Stub(a => a.FailureMechanismContribution).Return(
+                new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 100, 20));
 
             var calculation = new StabilityStoneCoverWaveConditionsCalculation
             {
@@ -669,8 +678,8 @@
                                                                   RingtoetsCommonFormsResources.ValidateIcon);
 
                     // When
-                    ToolStripItem validateMeniItem = contextMenu.Items[validateMenuItemIndex];
-                    Action call = () => validateMeniItem.PerformClick();
+                    ToolStripItem validateMenuItem = contextMenu.Items[validateMenuItemIndex];
+                    Action call = () => validateMenuItem.PerformClick();
 
                     // Then
                     TestHelper.AssertLogMessages(call, logMessages =>
@@ -731,8 +740,92 @@
             }
         }
 
-        // TODO: WTI-724 Create unit test that clicks on 'calculate' context menu item and asserts calculation is performed and observers are notified.
+        [Test]
+        public void GivenValidCalculation_WhenCalculating_ThenCalculationReturnsResult()
+        {
+            // Given
+            string validHydroDatabasePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.HydraRing.IO,
+                                                                       Path.Combine("HydraulicBoundaryLocationReader", "complete.sqlite"));
 
+            var failureMechanism = new StabilityStoneCoverFailureMechanism();
+            failureMechanism.AddSection(new FailureMechanismSection("A", new[]
+            {
+                new Point2D(0, 0),
+                new Point2D(1, 1)
+            }));
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            {
+                FilePath = validHydroDatabasePath
+            };
+            assessmentSection.Stub(a => a.Id).Return("someId");
+            assessmentSection.Stub(a => a.FailureMechanismContribution).Return(
+                new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 100, 20));
+
+            var calculation = GetValidCalculation(assessmentSection);
+            calculation.Name = "A";
+            var context = new StabilityStoneCoverWaveConditionsCalculationContext(calculation,
+                                                                                  failureMechanism,
+                                                                                  assessmentSection);
+
+            DialogBoxHandler = (name, wnd) =>
+            {
+                // Expect an activity dialog which is automatically closed
+            };
+
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var appFeatureCommandHandler = mocks.Stub<IApplicationFeatureCommands>();
+                var importHandler = mocks.Stub<IImportCommandHandler>();
+                var exportHandler = mocks.Stub<IExportCommandHandler>();
+                var viewCommands = mocks.Stub<IViewCommands>();
+                var mainWindow = mocks.Stub<IMainWindow>();
+                var menuBuilderMock = new ContextMenuBuilder(appFeatureCommandHandler,
+                                                             importHandler,
+                                                             exportHandler,
+                                                             viewCommands,
+                                                             context,
+                                                             treeViewControl);
+                var observerMock = mocks.StrictMock<IObserver>();
+                observerMock.Expect(o => o.UpdateObserver());
+                calculation.Attach(observerMock);
+
+                var gui = mocks.Stub<IGui>();
+                gui.Stub(g => g.Get(context, treeViewControl)).Return(menuBuilderMock);
+                gui.Stub(g => g.MainWindow).Return(mainWindow);
+
+                mocks.ReplayAll();
+
+                plugin.Gui = gui;
+
+                using (new HydraRingCalculationServiceConfig())
+                using (new WaveConditionsCalculationServiceConfig())
+                using (ContextMenuStrip contextMenu = info.ContextMenuStrip(context, null, treeViewControl))
+                {
+                    // Precondition
+                    TestHelper.AssertContextMenuStripContainsItem(contextMenu,
+                                                                  calculateMenuItemIndex,
+                                                                  "Be&rekenen",
+                                                                  "Voer deze berekening uit.",
+                                                                  RingtoetsCommonFormsResources.CalculateIcon);
+
+                    // When
+                    ToolStripItem calculateMenuItem = contextMenu.Items[calculateMenuItemIndex];
+                    Action call = () => calculateMenuItem.PerformClick();
+
+                    // Then
+                    TestHelper.AssertLogMessages(call, logMessages =>
+                    {
+                        var messages = logMessages.ToArray();
+                        Assert.AreEqual(15, messages.Length);
+                        StringAssert.StartsWith("Berekening van 'A' gestart om: ", messages[0]);
+                        StringAssert.StartsWith("Berekening van 'A' beëindigd om: ", messages[13]);
+                        StringAssert.StartsWith("Uitvoeren van 'A' is gelukt.", messages[14]);
+                    });
+                }
+            }
+        }
+
         [Test]
         public void GivenCalculationWithoutOutput_ThenClearOutputItemDisabled()
         {
@@ -888,14 +981,47 @@
                                                                   RingtoetsCommonFormsResources.ClearIcon);
 
                     // When
-                    ToolStripItem validateMeniItem = contextMenu.Items[clearOutputMenuItemIndex];
-                    validateMeniItem.PerformClick();
+                    ToolStripItem validateMenuItem = contextMenu.Items[clearOutputMenuItemIndex];
+                    validateMenuItem.PerformClick();
 
                     // Then
                     Assert.IsNull(calculation.Output);
                     // Check expectancies in TearDown()
                 }
             }
         }
+
+        private static StabilityStoneCoverWaveConditionsCalculation GetValidCalculation(IAssessmentSection assessmentSection)
+        {
+            var calculation = new StabilityStoneCoverWaveConditionsCalculation
+            {
+                InputParameters =
+                {
+                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1300001, "", 0.0, 0.0),
+                    ForeshoreProfile = CreateForeshoreProfile(),
+                    UseForeshore = true,
+                    UseBreakWater = true,
+                    StepSize = (RoundedDouble)0.5,
+                    LowerBoundaryRevetment = (RoundedDouble)4,
+                    UpperBoundaryRevetment = (RoundedDouble)10,
+                    UpperBoundaryWaterLevels = (RoundedDouble)8,
+                    LowerBoundaryWaterLevels = (RoundedDouble)7.1
+                }
+            };
+            calculation.InputParameters.HydraulicBoundaryLocation.DesignWaterLevel = (RoundedDouble)9.3;
+            return calculation;
+        }
+
+        private static ForeshoreProfile CreateForeshoreProfile()
+        {
+            return new ForeshoreProfile(new Point2D(0, 0),
+                                        new[]
+                                        {
+                                            new Point2D(3.3, 4.4),
+                                            new Point2D(5.5, 6.6)
+                                        },
+                                        new BreakWater(BreakWaterType.Dam, 10.0),
+                                        new ForeshoreProfile.ConstructionProperties());
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -rfb6c8cb473282ccd9b920afddb33a2284c7274cd -r6b330f8e7c1df6bc70f6de1e4251f69cd6865a81
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision fb6c8cb473282ccd9b920afddb33a2284c7274cd)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 6b330f8e7c1df6bc70f6de1e4251f69cd6865a81)
@@ -149,10 +149,12 @@
                 TestHelper.AssertLogMessages(call, messages =>
                 {
                     var msgs = messages.ToArray();
-                    Assert.AreEqual(20, msgs.Length);
-                    StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[0]);
+                    Assert.AreEqual(22, msgs.Length);
+                    StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]);
+                    StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]);
+                    StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]);
 
-                    int i = 0;
+                    int i = 2;
                     foreach (var waterLevel in calculation.InputParameters.WaterLevels)
                     {
                         StringAssert.StartsWith(string.Format("Blokken berekening '{0}' voor waterstand '{1}' gestart om: ", calculation.Name, waterLevel), msgs[i + 1]);
@@ -165,7 +167,7 @@
                         i = i + 6;
                     }
 
-                    StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[19]);
+                    StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[21]);
                 });
                 Assert.AreEqual(ActivityState.Failed, activity.State);
             }
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/Ringtoets.StabilityStoneCover.Service.Test.csproj
===================================================================
diff -u -rfb6c8cb473282ccd9b920afddb33a2284c7274cd -r6b330f8e7c1df6bc70f6de1e4251f69cd6865a81
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/Ringtoets.StabilityStoneCover.Service.Test.csproj	(.../Ringtoets.StabilityStoneCover.Service.Test.csproj)	(revision fb6c8cb473282ccd9b920afddb33a2284c7274cd)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/Ringtoets.StabilityStoneCover.Service.Test.csproj	(.../Ringtoets.StabilityStoneCover.Service.Test.csproj)	(revision 6b330f8e7c1df6bc70f6de1e4251f69cd6865a81)
@@ -54,7 +54,6 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="StabilityStoneCoverCalculationFactory.cs" />
-    <Compile Include="StabilityStoneCoverCalculationServiceTest.cs" />
     <Compile Include="StabilityStoneCoverDataSynchronizationService.cs" />
     <Compile Include="StabilityStoneCoverWaveConditionsCalculationActivityOutputTest.cs" />
     <Compile Include="StabilityStoneCoverWaveConditionsCalculationActivityTest.cs" />
Fisheye: Tag 6b330f8e7c1df6bc70f6de1e4251f69cd6865a81 refers to a dead (removed) revision in file `Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverCalculationServiceTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?