Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs =================================================================== diff -u -r79caa330aa6cb4c99f48c436b1188fdcfc5dce43 -r695a6afe5bb2d4b770029c476c8cea049a6a6e59 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision 79caa330aa6cb4c99f48c436b1188fdcfc5dce43) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision 695a6afe5bb2d4b770029c476c8cea049a6a6e59) @@ -240,7 +240,7 @@ } [Test] - public void Run_ValidHydraulicBoundaryLocation_PerformValidationAndCalculationAndLogStartAndEnd() + public void Run_ValidInput_PerformValidationAndCalculationAndLogStartAndEnd() { // Setup const string locationName = "punt_flw_"; Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs =================================================================== diff -u -r79caa330aa6cb4c99f48c436b1188fdcfc5dce43 -r695a6afe5bb2d4b770029c476c8cea049a6a6e59 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs (.../WaveHeightCalculationActivityTest.cs) (revision 79caa330aa6cb4c99f48c436b1188fdcfc5dce43) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs (.../WaveHeightCalculationActivityTest.cs) (revision 695a6afe5bb2d4b770029c476c8cea049a6a6e59) @@ -238,7 +238,7 @@ } [Test] - public void Run_ValidHydraulicBoundaryLocation_PerformValidationAndCalculationAndLogStartAndEnd() + public void Run_ValidInput_PerformValidationAndCalculationAndLogStartAndEnd() { // Setup const string locationName = "locationName"; Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationActivityTest.cs =================================================================== diff -u -r2e1b649ab9c300f891d3ff3a297c4e37173ca162 -r695a6afe5bb2d4b770029c476c8cea049a6a6e59 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationActivityTest.cs (.../DuneLocationCalculationActivityTest.cs) (revision 2e1b649ab9c300f891d3ff3a297c4e37173ca162) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationActivityTest.cs (.../DuneLocationCalculationActivityTest.cs) (revision 695a6afe5bb2d4b770029c476c8cea049a6a6e59) @@ -150,9 +150,38 @@ } [Test] - public void Run_ValidHydraulicBoundaryDatabaseAndDuneLocationCalculation_PerformValidationValidParameters() + public void Run_InvalidNorm_PerformValidationAndLogStartAndEndAndError() { // Setup + var duneLocation = new TestDuneLocation("testLocation"); + var duneLocationCalculation = new DuneLocationCalculation(duneLocation); + + var activity = new DuneLocationCalculationActivity(duneLocationCalculation, + validFilePath, + validPreprocessorDirectory, + 1.0); + + // Call + Action call = () => activity.Run(); + + // Assert + TestHelper.AssertLogMessages(call, messages => + { + string[] msgs = messages.ToArray(); + Assert.AreEqual(4, msgs.Length); + + Assert.AreEqual($"Hydraulische randvoorwaarden berekenen voor locatie '{duneLocation.Name}' is gestart.", msgs[0]); + CalculationServiceTestHelper.AssertValidationStartMessage(msgs[1]); + Assert.AreEqual("Doelkans is te groot om een berekening uit te kunnen voeren.", msgs[2]); + CalculationServiceTestHelper.AssertValidationEndMessage(msgs[3]); + }); + Assert.AreEqual(ActivityState.Failed, activity.State); + } + + [Test] + public void Run_ValidInput_PerformValidationAndCalculationAndLogStartAndEnd() + { + // Setup const double norm = 1.0 / 30; var duneLocation = new TestDuneLocation("some name"); @@ -200,7 +229,7 @@ } [Test] - public void Run_DuneLocationCalculationOutputSet_ValidationAndCalculationNotPerformedAndStateSkipped() + public void Run_OutputSet_ValidationAndCalculationNotPerformedAndStateSkipped() { // Setup var duneLocationCalculation = new DuneLocationCalculation(new TestDuneLocation())