Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs
===================================================================
diff -u -re464d420d0ce85287a40d0aee40d5dbdd0ade68e -r7be1cc916e7e9b1b992b5658e1a719331a17fe9e
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision e464d420d0ce85287a40d0aee40d5dbdd0ade68e)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision 7be1cc916e7e9b1b992b5658e1a719331a17fe9e)
@@ -405,8 +405,11 @@
             mockRepository.VerifyAll();
         }
 
-        [Test]
-        public void Finish_Always_NotifyHydraulicBoundaryLocation()
+        [TestCase(ActivityState.Executed)]
+        [TestCase(ActivityState.Failed)]
+        [TestCase(ActivityState.Canceled)]
+        [TestCase(ActivityState.Skipped)]
+        public void Finish_CalculationWithCertainState_NotifyHydraulicBoundaryLocation(ActivityState state)
         {
             // Setup
             var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
@@ -417,16 +420,33 @@
             hydraulicBoundaryLocation.Attach(observer);
             mockRepository.ReplayAll();
 
-            var activity = new WaveHeightCalculationActivity(hydraulicBoundaryLocation,
-                                                             Path.Combine(testDataPath, validFile),
-                                                             1.0,
-                                                             calculationMessageProvider);
+            var activity = new TestWaveHeightCalculationActivity(hydraulicBoundaryLocation,
+                                                                 Path.Combine(testDataPath, validFile),
+                                                                 1.0,
+                                                                 calculationMessageProvider,
+                                                                 state);
 
             // Call
             activity.Finish();
 
             // Assert
             mockRepository.VerifyAll();
         }
+
+        private class TestWaveHeightCalculationActivity : WaveHeightCalculationActivity
+        {
+            public TestWaveHeightCalculationActivity(HydraulicBoundaryLocation hydraulicBoundaryLocation,
+                                                     string hydraulicBoundaryDatabaseFilePath,
+                                                     double norm,
+                                                     ICalculationMessageProvider messageProvider,
+                                                     ActivityState state)
+                : base(hydraulicBoundaryLocation,
+                       hydraulicBoundaryDatabaseFilePath,
+                       norm,
+                       messageProvider)
+            {
+                State = state;
+            }
+        }
     }
 }
\ No newline at end of file