Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs
===================================================================
diff -u -r69634527eef3ea9da999f4236d31a318e24b60f4 -r8d1fe58f784199e4b36e754dede5846a3189db42
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs	(.../WaveConditionsCalculationServiceBaseTest.cs)	(revision 69634527eef3ea9da999f4236d31a318e24b60f4)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs	(.../WaveConditionsCalculationServiceBaseTest.cs)	(revision 8d1fe58f784199e4b36e754dede5846a3189db42)
@@ -45,7 +45,7 @@
     [TestFixture]
     public class WaveConditionsCalculationServiceBaseTest
     {
-        private const double validTargetProbability = 0.005;
+        private const double validNorm = 0.005;
         private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
         private static readonly string validFilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite");
         private static readonly string validPreprocessorDirectory = TestHelper.GetScratchPadPath();
@@ -58,7 +58,7 @@
                                                                                                                GetValidAssessmentLevel(),
                                                                                                                validFilePath,
                                                                                                                validPreprocessorDirectory,
-                                                                                                               validTargetProbability,
+                                                                                                               validNorm,
                                                                                                                string.Empty);
 
             // Assert
@@ -80,7 +80,7 @@
                                                                                                                GetValidAssessmentLevel(),
                                                                                                                validFilePath,
                                                                                                                validPreprocessorDirectory,
-                                                                                                               validTargetProbability,
+                                                                                                               validNorm,
                                                                                                                null);
 
             // Assert
@@ -99,7 +99,7 @@
                                                                                                                    GetValidAssessmentLevel(),
                                                                                                                    string.Empty,
                                                                                                                    validPreprocessorDirectory,
-                                                                                                                   validTargetProbability,
+                                                                                                                   validNorm,
                                                                                                                    string.Empty);
 
             // Assert
@@ -127,7 +127,7 @@
                                                                                                                    GetValidAssessmentLevel(),
                                                                                                                    invalidFilePath,
                                                                                                                    validPreprocessorDirectory,
-                                                                                                                   validTargetProbability,
+                                                                                                                   validNorm,
                                                                                                                    string.Empty);
 
             // Assert
@@ -155,7 +155,7 @@
                                                                                                                    GetValidAssessmentLevel(),
                                                                                                                    validFilePath,
                                                                                                                    invalidPreprocessorDirectory,
-                                                                                                                   validTargetProbability,
+                                                                                                                   validNorm,
                                                                                                                    string.Empty);
 
             // Assert
@@ -183,7 +183,7 @@
                                                                                                                    GetValidAssessmentLevel(),
                                                                                                                    dbFilePath,
                                                                                                                    validPreprocessorDirectory,
-                                                                                                                   validTargetProbability,
+                                                                                                                   validNorm,
                                                                                                                    string.Empty);
 
             // Assert
@@ -200,6 +200,62 @@
         }
 
         [Test]
+        public void Validate_NormInvalid_LogsErrorAndReturnsFalse()
+        {
+            // Setup
+            var isValid = false;
+            const string invalidPreprocessorDirectory = "NonExistingPreprocessorDirectory";
+
+            // Call
+            Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(new TestWaveConditionsInput(),
+                                                                                                                   GetValidAssessmentLevel(),
+                                                                                                                   validFilePath,
+                                                                                                                   invalidPreprocessorDirectory,
+                                                                                                                   validNorm,
+                                                                                                                   string.Empty);
+
+            // Assert
+            TestHelper.AssertLogMessages(action, messages =>
+            {
+                string[] msgs = messages.ToArray();
+                Assert.AreEqual(3, msgs.Length);
+                CalculationServiceTestHelper.AssertValidationStartMessage(msgs[0]);
+                Assert.AreEqual("Kon geen doelkans bepalen voor deze berekening.", msgs[1]);
+                CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]);
+            });
+
+            Assert.IsFalse(isValid);
+        }
+
+        [Test]
+        public void Validate_NormTooBig_LogsErrorAndReturnsFalse()
+        {
+            // Setup
+            var isValid = false;
+            const string invalidPreprocessorDirectory = "NonExistingPreprocessorDirectory";
+
+            // Call
+            Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(new TestWaveConditionsInput(),
+                                                                                                                   GetValidAssessmentLevel(),
+                                                                                                                   validFilePath,
+                                                                                                                   invalidPreprocessorDirectory,
+                                                                                                                   validNorm,
+                                                                                                                   string.Empty);
+
+            // Assert
+            TestHelper.AssertLogMessages(action, messages =>
+            {
+                string[] msgs = messages.ToArray();
+                Assert.AreEqual(3, msgs.Length);
+                CalculationServiceTestHelper.AssertValidationStartMessage(msgs[0]);
+                Assert.AreEqual("Doelkans is te groot om een berekening uit te kunnen voeren.", msgs[1]);
+                CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]);
+            });
+
+            Assert.IsFalse(isValid);
+        }
+
+        [Test]
         public void Validate_NoHydraulicBoundaryLocation_ReturnsFalseAndLogsValidationError()
         {
             // Setup
@@ -212,7 +268,7 @@
                                                                                                                    GetValidAssessmentLevel(),
                                                                                                                    validFilePath,
                                                                                                                    validPreprocessorDirectory,
-                                                                                                                   validTargetProbability,
+                                                                                                                   validNorm,
                                                                                                                    string.Empty);
 
             // Assert
@@ -246,7 +302,7 @@
                                                                                                                    RoundedDouble.NaN,
                                                                                                                    validFilePath,
                                                                                                                    validPreprocessorDirectory,
-                                                                                                                   validTargetProbability,
+                                                                                                                   validNorm,
                                                                                                                    designWaterLevelName);
 
             // Assert
@@ -290,7 +346,7 @@
                                                                                                                    (RoundedDouble) assessmentLevel,
                                                                                                                    validFilePath,
                                                                                                                    validPreprocessorDirectory,
-                                                                                                                   validTargetProbability,
+                                                                                                                   validNorm,
                                                                                                                    "DesignWaterLevelName");
 
             // Assert
@@ -324,7 +380,7 @@
                                                                                                                    GetValidAssessmentLevel(),
                                                                                                                    validFilePath,
                                                                                                                    validPreprocessorDirectory,
-                                                                                                                   validTargetProbability,
+                                                                                                                   validNorm,
                                                                                                                    "DesignWaterLevelName");
 
             // Assert
@@ -358,7 +414,7 @@
                                                                                                                    GetValidAssessmentLevel(),
                                                                                                                    validFilePath,
                                                                                                                    validPreprocessorDirectory,
-                                                                                                                   validTargetProbability,
+                                                                                                                   validNorm,
                                                                                                                    "DesignWaterLevelName");
 
             // Assert
@@ -405,7 +461,7 @@
                                                                                                                    GetValidAssessmentLevel(),
                                                                                                                    validFilePath,
                                                                                                                    validPreprocessorDirectory,
-                                                                                                                   validTargetProbability,
+                                                                                                                   validNorm,
                                                                                                                    "DesignWaterLevelName");
 
             // Assert
@@ -434,7 +490,7 @@
                                                                                                                    GetValidAssessmentLevel(),
                                                                                                                    validFilePath,
                                                                                                                    validPreprocessorDirectory,
-                                                                                                                   validTargetProbability,
+                                                                                                                   validNorm,
                                                                                                                    "DesignWaterLevelName");
 
             // Assert