Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -r436afc32ff70f325001e7f13ad496271ab9b6d89 -r9779d1ab6b555c557e8fd18f4430ad207bd003da
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs)	(revision 436afc32ff70f325001e7f13ad496271ab9b6d89)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs)	(revision 9779d1ab6b555c557e8fd18f4430ad207bd003da)
@@ -30,6 +30,7 @@
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
 using Ringtoets.HydraRing.Calculation.Data;
 using Ringtoets.HydraRing.Calculation.Data.Input.WaveConditions;
@@ -98,9 +99,9 @@
                 {
                     string[] msgs = messages.ToArray();
                     Assert.AreEqual(3, msgs.Length);
-                    Assert.AreEqual($"Validatie van '{calculation.Name}' gestart.", msgs[0]);
+                    CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]);
                     Assert.AreEqual($"Validatie mislukt: Fout bij het lezen van bestand '{testFilePath}': het bestand bestaat niet.", msgs[1]);
-                    Assert.AreEqual($"Validatie van '{calculation.Name}' beëindigd.", msgs[2]);
+                    CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[2]);
                 });
                 Assert.IsFalse(isValid);
             }
@@ -130,9 +131,9 @@
                 {
                     string[] msgs = messages.ToArray();
                     Assert.AreEqual(3, msgs.Length);
-                    Assert.AreEqual($"Validatie van '{calculation.Name}' gestart.", msgs[0]);
+                    CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]);
                     Assert.AreEqual($"Validatie mislukt: Fout bij het lezen van bestand '{testFilePath}': kon geen locaties verkrijgen van de database.", msgs[1]);
-                    Assert.AreEqual($"Validatie van '{calculation.Name}' beëindigd.", msgs[2]);
+                    CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[2]);
                 });
                 Assert.IsFalse(isValid);
             }
@@ -162,9 +163,9 @@
                 {
                     string[] msgs = messages.ToArray();
                     Assert.AreEqual(3, msgs.Length);
-                    Assert.AreEqual($"Validatie van '{calculation.Name}' gestart.", msgs[0]);
+                    CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]);
                     StringAssert.StartsWith("Validatie mislukt: Fout bij het lezen van bestand", msgs[1]);
-                    Assert.AreEqual($"Validatie van '{calculation.Name}' beëindigd.", msgs[2]);
+                    CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[2]);
                 });
                 Assert.IsFalse(isValid);
             }
@@ -194,9 +195,9 @@
                 {
                     string[] msgs = messages.ToArray();
                     Assert.AreEqual(3, msgs.Length);
-                    Assert.AreEqual($"Validatie van '{calculation.Name}' gestart.", msgs[0]);
+                    CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]);
                     Assert.AreEqual("Validatie mislukt: Er is geen hydraulische randvoorwaardenlocatie geselecteerd.", msgs[1]);
-                    Assert.AreEqual($"Validatie van '{calculation.Name}' beëindigd.", msgs[2]);
+                    CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[2]);
                 });
                 Assert.IsFalse(isValid);
             }
@@ -226,9 +227,9 @@
                 {
                     string[] msgs = messages.ToArray();
                     Assert.AreEqual(3, msgs.Length);
-                    Assert.AreEqual($"Validatie van '{calculation.Name}' gestart.", msgs[0]);
+                    CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]);
                     Assert.AreEqual("Validatie mislukt: Kan het toetspeil niet afleiden op basis van de invoer.", msgs[1]);
-                    Assert.AreEqual($"Validatie van '{calculation.Name}' beëindigd.", msgs[2]);
+                    CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[2]);
                 });
                 Assert.IsFalse(isValid);
             }
@@ -261,9 +262,9 @@
                 {
                     string[] msgs = messages.ToArray();
                     Assert.AreEqual(3, msgs.Length);
-                    Assert.AreEqual($"Validatie van '{calculation.Name}' gestart.", msgs[0]);
+                    CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]);
                     Assert.AreEqual("Validatie mislukt: Kan geen waterstanden afleiden op basis van de invoer. Controleer de opgegeven boven- en ondergrenzen.", msgs[1]);
-                    Assert.AreEqual($"Validatie van '{calculation.Name}' beëindigd.", msgs[2]);
+                    CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[2]);
                 });
                 Assert.IsFalse(isValid);
             }
@@ -299,9 +300,9 @@
                     string[] msgs = messages.ToArray();
                     Assert.AreEqual(3, msgs.Length);
 
-                    Assert.AreEqual($"Validatie van '{calculation.Name}' gestart.", msgs[0]);
+                    CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]);
                     Assert.AreEqual("Validatie mislukt: De waarde voor 'hoogte' van de dam moet een concreet getal zijn.", msgs[1]);
-                    Assert.AreEqual($"Validatie van '{calculation.Name}' beëindigd.", msgs[2]);
+                    CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[2]);
                 });
                 Assert.IsFalse(isValid);
             }
@@ -406,7 +407,7 @@
                     string[] msgs = messages.ToArray();
                     Assert.AreEqual(18, msgs.Length);
 
-                    Assert.AreEqual($"Berekening van '{calculation.Name}' gestart.", msgs[0]);
+                    CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[0]);
 
                     Assert.AreEqual($"Berekening '{calculation.Name}' voor blokken gestart.", msgs[1]);
 
@@ -484,7 +485,7 @@
                     string[] msgs = messages.ToArray();
                     Assert.AreEqual(18, msgs.Length);
 
-                    Assert.AreEqual($"Berekening van '{calculation.Name}' gestart.", msgs[0]);
+                    CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[0]);
                     Assert.AreEqual($"Berekening '{calculation.Name}' voor blokken gestart.", msgs[1]);
 
                     var i = 2;
@@ -770,7 +771,7 @@
                     string[] msgs = messages.ToArray();
                     Assert.AreEqual(16, msgs.Length);
 
-                    Assert.AreEqual($"Berekening van '{calculation.Name}' gestart.", msgs[0]);
+                    CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[0]);
                     Assert.AreEqual($"Berekening '{calculation.Name}' voor blokken gestart.", msgs[1]);
 
                     RoundedDouble[] waterLevels = calculation.InputParameters.WaterLevels.ToArray();
@@ -859,7 +860,7 @@
                     RoundedDouble waterLevelMiddleRevetment = waterLevels[1];
                     RoundedDouble waterLevelLowerBoundaryRevetment = waterLevels[2];
 
-                    Assert.AreEqual($"Berekening van '{calculation.Name}' gestart.", msgs[0]);
+                    CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[0]);
                     Assert.AreEqual($"Berekening '{calculation.Name}' voor blokken gestart.", msgs[1]);
 
                     Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{waterLevelUpperBoundaryRevetment}' gestart.", msgs[2]);
@@ -955,7 +956,7 @@
                     string[] msgs = messages.ToArray();
                     Assert.AreEqual(25, msgs.Length);
 
-                    Assert.AreEqual($"Berekening van '{calculation.Name}' gestart.", msgs[0]);
+                    CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[0]);
                     Assert.AreEqual($"Berekening '{calculation.Name}' voor blokken gestart.", msgs[1]);
 
                     var i = 2;