Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs =================================================================== diff -u -r416bdb89f8e154bd4108a518d8a3e69f652a6eb0 -rbc9c19b950e12688f8f97a659af2f2cd3295956a --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision 416bdb89f8e154bd4108a518d8a3e69f652a6eb0) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a) @@ -385,9 +385,12 @@ } mockRepository.VerifyAll(); } - + [Test] - public void Run_UnexplainedErrorInCalculation_PerformValidationAndCalculationAndLogStartAndEndAndError() + [TestCase(true, null)] + [TestCase(true, "An error occurred")] + [TestCase(false, "An error occurred")] + public void Run_ErrorInCalculation_PerformValidationAndCalculationAndLogStartAndEndAndError(bool endInFailure, string lastErrorFileContent) { // Setup const string locationName = "locationName 1"; @@ -399,61 +402,11 @@ }; var calculationMessageProviderMock = mockRepository.StrictMock(); - calculationMessageProviderMock.Stub(calc => calc.GetActivityName(locationName)).Return(string.Empty); - calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(locationName); - calculationMessageProviderMock.Stub(calc => calc.GetCalculationFailedUnexplainedMessage(locationName)).Return(calculationFailedMessage); - mockRepository.ReplayAll(); - - string validFilePath = Path.Combine(testDataPath, validFile); - - var norm = 30; - - var activity = new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocation, - validFilePath, - string.Empty, - norm, - calculationMessageProviderMock); - - using (new HydraRingCalculatorFactoryConfig()) - { - var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DesignWaterLevelCalculator; - calculator.EndInFailure = true; - - // Call - Action call = () => activity.Run(); - - // Assert - TestHelper.AssertLogMessages(call, messages => - { - var msgs = messages.ToArray(); - Assert.AreEqual(6, msgs.Length); - StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", locationName), msgs[0]); - StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", locationName), msgs[1]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", locationName), msgs[2]); - Assert.AreEqual(calculationFailedMessage, msgs[3]); - StringAssert.StartsWith("Toetspeil berekening is uitgevoerd op de tijdelijke locatie:", msgs[4]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", locationName), msgs[5]); - }); - Assert.AreEqual(ActivityState.Failed, activity.State); - } - } - - [Test] - public void Run_ErrorInCalculation_PerformValidationAndCalculationAndLogStartAndEndAndError() - { - // Setup - const string locationName = "locationName 1"; - string calculationFailedMessage = "Something went wrong"; - var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, locationName, 0, 0) - { - DesignWaterLevel = new RoundedDouble(2, double.NaN), - DesignWaterLevelCalculationConvergence = CalculationConvergence.NotCalculated - }; - - var calculationMessageProviderMock = mockRepository.StrictMock(); calculationMessageProviderMock.Stub(calc => calc.GetActivityName(locationName)).Return(locationName); calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(locationName); calculationMessageProviderMock.Stub(calc => calc.GetCalculationFailedMessage(null, null)).IgnoreArguments().Return(calculationFailedMessage); + calculationMessageProviderMock.Stub(calc => calc.GetCalculationFailedUnexplainedMessage(locationName)).Return(calculationFailedMessage); + calculationMessageProviderMock.Stub(calc => calc.GetCalculatedNotConvergedMessage(locationName)).Return(locationName); mockRepository.ReplayAll(); string validFilePath = Path.Combine(testDataPath, validFile); @@ -469,26 +422,16 @@ using (new HydraRingCalculatorFactoryConfig()) { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DesignWaterLevelCalculator; - calculator.EndInFailure = false; - calculator.LastErrorFileContent = "An error occurred"; + calculator.EndInFailure = endInFailure; + calculator.LastErrorFileContent = lastErrorFileContent; // Call - Action call = () => activity.Run(); + activity.Run(); // Assert - TestHelper.AssertLogMessages(call, messages => - { - var msgs = messages.ToArray(); - Assert.AreEqual(6, msgs.Length); - StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", locationName), msgs[0]); - StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", locationName), msgs[1]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", locationName), msgs[2]); - Assert.AreEqual(calculationFailedMessage, msgs[3]); - StringAssert.StartsWith("Toetspeil berekening is uitgevoerd op de tijdelijke locatie:", msgs[4]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", locationName), msgs[5]); - }); Assert.AreEqual(ActivityState.Failed, activity.State); } + mockRepository.VerifyAll(); } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs =================================================================== diff -u -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff -rbc9c19b950e12688f8f97a659af2f2cd3295956a --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a) @@ -209,67 +209,6 @@ } [Test] - public void Calculate_CalculationFails_LogError() - { - // Setup - string validFilePath = Path.Combine(testDataPath, validFile); - - const string locationName = "punt_flw_ 1"; - const string calculationName = "locationName"; - const string calculationFailedMessage = "calculationFailedMessage"; - - var mockRepository = new MockRepository(); - var calculationMessageProviderMock = mockRepository.StrictMock(); - calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName); - calculationMessageProviderMock.Stub(calc => calc.GetCalculationFailedMessage(null, null)).IgnoreArguments().Return(calculationFailedMessage); - mockRepository.ReplayAll(); - - var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, locationName, 0, 0) - { - DesignWaterLevel = new RoundedDouble(2, double.NaN) - }; - - using (new HydraRingCalculatorFactoryConfig()) - { - var testCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DesignWaterLevelCalculator; - testCalculator.EndInFailure = true; - testCalculator.LastErrorFileContent = calculationFailedMessage; - bool exceptionThrown = false; - - // Call - Action call = () => - { - try - { - new DesignWaterLevelCalculationService().Calculate(hydraulicBoundaryLocation, - validFilePath, - "ringId", - 30, - calculationMessageProviderMock); - } - catch (HydraRingFileParserException) - { - exceptionThrown = true; - } - }; - - // Assert - TestHelper.AssertLogMessages(call, messages => - { - var msgs = messages.ToArray(); - Assert.AreEqual(4, msgs.Length); - StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), msgs[0]); - StringAssert.StartsWith(calculationFailedMessage, msgs[1]); - StringAssert.StartsWith("Toetspeil berekening is uitgevoerd op de tijdelijke locatie:", msgs[2]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[3]); - }); - Assert.IsTrue(exceptionThrown); - Assert.IsNaN(hydraulicBoundaryLocation.DesignWaterLevel); - } - mockRepository.VerifyAll(); - } - - [Test] public void Calculate_CalculationFailedWithExceptionAndLastErrorPresent_LogErrorAndThrowException() { // Setup @@ -326,7 +265,9 @@ StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[3]); }); Assert.IsTrue(exceptionThrown); + Assert.IsNaN(hydraulicBoundaryLocation.DesignWaterLevel); } + mockRepository.VerifyAll(); } [Test] @@ -386,6 +327,7 @@ }); Assert.IsTrue(exceptionThrown); } + mockRepository.VerifyAll(); } [Test] @@ -397,11 +339,13 @@ const string locationName = "punt_flw_ 1"; const string calculationName = "locationName"; const string calculationFailedMessage = "calculationFailedMessage"; + const string calculationNotConvergedMessage = "calculationNotConvergedMessage"; var mockRepository = new MockRepository(); var calculationMessageProviderMock = mockRepository.StrictMock(); calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName); calculationMessageProviderMock.Stub(calc => calc.GetCalculationFailedMessage(null, null)).IgnoreArguments().Return(calculationFailedMessage); + calculationMessageProviderMock.Stub(calc => calc.GetCalculatedNotConvergedMessage(locationName)).Return(calculationNotConvergedMessage); mockRepository.ReplayAll(); var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, locationName, 0, 0) @@ -440,15 +384,17 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - Assert.AreEqual(4, msgs.Length); + Assert.AreEqual(5, msgs.Length); StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), msgs[0]); - StringAssert.StartsWith(calculationFailedMessage, msgs[1]); - StringAssert.StartsWith("Toetspeil berekening is uitgevoerd op de tijdelijke locatie:", msgs[2]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[3]); + StringAssert.StartsWith(calculationNotConvergedMessage, msgs[1]); + StringAssert.StartsWith(calculationFailedMessage, msgs[2]); + StringAssert.StartsWith("Toetspeil berekening is uitgevoerd op de tijdelijke locatie:", msgs[3]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[4]); }); Assert.IsTrue(exceptionThrown); Assert.AreEqual(calculator.LastErrorFileContent, exceptionMessage); } + mockRepository.VerifyAll(); } private static void AssertInput(AssessmentLevelCalculationInput expectedInput, HydraRingCalculationInput hydraRingCalculationInput) Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs =================================================================== diff -u -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff -rbc9c19b950e12688f8f97a659af2f2cd3295956a --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs (.../WaveHeightCalculationActivityTest.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs (.../WaveHeightCalculationActivityTest.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a) @@ -370,73 +370,26 @@ } [Test] - public void Run_UnexplainedErrorInCalculation_PerformValidationAndCalculationAndLogStartAndEndAndError() + [TestCase(true, null)] + [TestCase(true, "An error occurred")] + [TestCase(false, "An error occurred")] + public void Run_ErrorInCalculation_PerformValidationAndCalculationAndLogStartAndEndAndError(bool endInFailure, string lastErrorFileContent) { // Setup const string locationName = "locationName 1"; string calculationFailedMessage = "Something went wrong"; var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, locationName, 0, 0) { - DesignWaterLevel = new RoundedDouble(2, double.NaN), - DesignWaterLevelCalculationConvergence = CalculationConvergence.NotCalculated + WaveHeight = new RoundedDouble(2, double.NaN), + WaveHeightCalculationConvergence = CalculationConvergence.NotCalculated }; var calculationMessageProviderMock = mockRepository.StrictMock(); - calculationMessageProviderMock.Stub(calc => calc.GetActivityName(locationName)).Return(string.Empty); - calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(locationName); - calculationMessageProviderMock.Stub(calc => calc.GetCalculationFailedUnexplainedMessage(locationName)).Return(calculationFailedMessage); - mockRepository.ReplayAll(); - - string validFilePath = Path.Combine(testDataPath, validFile); - - var norm = 30; - - var activity = new WaveHeightCalculationActivity(hydraulicBoundaryLocation, - validFilePath, - string.Empty, - norm, - calculationMessageProviderMock); - - using (new HydraRingCalculatorFactoryConfig()) - { - var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveHeightCalculator; - calculator.EndInFailure = true; - - // Call - Action call = () => activity.Run(); - - // Assert - TestHelper.AssertLogMessages(call, messages => - { - var msgs = messages.ToArray(); - Assert.AreEqual(6, msgs.Length); - StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", locationName), msgs[0]); - StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", locationName), msgs[1]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", locationName), msgs[2]); - Assert.AreEqual(calculationFailedMessage, msgs[3]); - StringAssert.StartsWith("Golfhoogte berekening is uitgevoerd op de tijdelijke locatie:", msgs[4]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", locationName), msgs[5]); - }); - Assert.AreEqual(ActivityState.Failed, activity.State); - } - } - - [Test] - public void Run_ErrorInCalculation_PerformValidationAndCalculationAndLogStartAndEndAndError() - { - // Setup - const string locationName = "locationName 1"; - string calculationFailedMessage = "Something went wrong"; - var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, locationName, 0, 0) - { - DesignWaterLevel = new RoundedDouble(2, double.NaN), - DesignWaterLevelCalculationConvergence = CalculationConvergence.NotCalculated - }; - - var calculationMessageProviderMock = mockRepository.StrictMock(); calculationMessageProviderMock.Stub(calc => calc.GetActivityName(locationName)).Return(locationName); calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(locationName); calculationMessageProviderMock.Stub(calc => calc.GetCalculationFailedMessage(null, null)).IgnoreArguments().Return(calculationFailedMessage); + calculationMessageProviderMock.Stub(calc => calc.GetCalculationFailedUnexplainedMessage(locationName)).Return(calculationFailedMessage); + calculationMessageProviderMock.Stub(calc => calc.GetCalculatedNotConvergedMessage(locationName)).Return(locationName); mockRepository.ReplayAll(); string validFilePath = Path.Combine(testDataPath, validFile); @@ -451,27 +404,17 @@ using (new HydraRingCalculatorFactoryConfig()) { - var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveHeightCalculator; - calculator.EndInFailure = false; - calculator.LastErrorFileContent = "An error occurred"; + var calculator = ((TestHydraRingCalculatorFactory)HydraRingCalculatorFactory.Instance).WaveHeightCalculator; + calculator.EndInFailure = endInFailure; + calculator.LastErrorFileContent = lastErrorFileContent; // Call - Action call = () => activity.Run(); + activity.Run(); // Assert - TestHelper.AssertLogMessages(call, messages => - { - var msgs = messages.ToArray(); - Assert.AreEqual(6, msgs.Length); - StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", locationName), msgs[0]); - StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", locationName), msgs[1]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", locationName), msgs[2]); - Assert.AreEqual(calculationFailedMessage, msgs[3]); - StringAssert.StartsWith("Golfhoogte berekening is uitgevoerd op de tijdelijke locatie:", msgs[4]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", locationName), msgs[5]); - }); Assert.AreEqual(ActivityState.Failed, activity.State); } + mockRepository.VerifyAll(); } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs =================================================================== diff -u -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff -rbc9c19b950e12688f8f97a659af2f2cd3295956a --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a) @@ -208,65 +208,6 @@ } [Test] - public void Calculate_CalculationFails_LogError() - { - // Setup - string validFilePath = Path.Combine(testDataPath, validFile); - const string locationName = "locationName"; - const string calculationName = "locationName"; - const string calculationFailedMessage = "calculationFailedMessage"; - - var mockRepository = new MockRepository(); - var calculationMessageProviderMock = mockRepository.StrictMock(); - calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName); - calculationMessageProviderMock.Stub(calc => calc.GetCalculationFailedMessage(null, null)).IgnoreArguments().Return(calculationFailedMessage).Repeat.AtLeastOnce(); - mockRepository.ReplayAll(); - - var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, locationName, 0, 0) - { - DesignWaterLevel = new RoundedDouble(2, double.NaN), - }; - - using (new HydraRingCalculatorFactoryConfig()) - { - var testCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveHeightCalculator; - testCalculator.EndInFailure = true; - testCalculator.LastErrorFileContent = calculationFailedMessage; - bool exceptionThrown = false; - // Call - Action call = () => - { - try - { - new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation, - validFilePath, - "ringId", - 30, - calculationMessageProviderMock); - } - catch (HydraRingFileParserException) - { - exceptionThrown = true; - } - }; - - // Assert - TestHelper.AssertLogMessages(call, messages => - { - var msgs = messages.ToArray(); - Assert.AreEqual(4, msgs.Length); - StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), msgs[0]); - StringAssert.StartsWith(calculationFailedMessage, msgs[1]); - StringAssert.StartsWith("Golfhoogte berekening is uitgevoerd op de tijdelijke locatie:", msgs[2]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[3]); - }); - Assert.IsTrue(exceptionThrown); - Assert.IsNaN(hydraulicBoundaryLocation.WaveHeight); - } - mockRepository.VerifyAll(); - } - - [Test] public void Calculate_CalculationFailedWithExceptionAndLastErrorPresent_LogErrorAndThrowException() { // Setup @@ -323,7 +264,9 @@ StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[3]); }); Assert.IsTrue(exceptionThrown); + Assert.IsNaN(hydraulicBoundaryLocation.WaveHeight); } + mockRepository.VerifyAll(); } [Test] @@ -383,6 +326,7 @@ }); Assert.IsTrue(exceptionThrown); } + mockRepository.VerifyAll(); } [Test] @@ -394,11 +338,13 @@ const string locationName = "punt_flw_ 1"; const string calculationName = "locationName"; const string calculationFailedMessage = "calculationFailedMessage"; + const string calculationNotConvergedMessage = "calculationNotConvergedMessage"; var mockRepository = new MockRepository(); var calculationMessageProviderMock = mockRepository.StrictMock(); calculationMessageProviderMock.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName); calculationMessageProviderMock.Stub(calc => calc.GetCalculationFailedMessage(null, null)).IgnoreArguments().Return(calculationFailedMessage); + calculationMessageProviderMock.Stub(calc => calc.GetCalculatedNotConvergedMessage(locationName)).Return(calculationNotConvergedMessage); mockRepository.ReplayAll(); var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, locationName, 0, 0) @@ -437,15 +383,17 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - Assert.AreEqual(4, msgs.Length); + Assert.AreEqual(5, msgs.Length); StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), msgs[0]); - StringAssert.StartsWith(calculationFailedMessage, msgs[1]); - StringAssert.StartsWith("Golfhoogte berekening is uitgevoerd op de tijdelijke locatie:", msgs[2]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[3]); + StringAssert.StartsWith(calculationNotConvergedMessage, msgs[1]); + StringAssert.StartsWith(calculationFailedMessage, msgs[2]); + StringAssert.StartsWith("Golfhoogte berekening is uitgevoerd op de tijdelijke locatie:", msgs[3]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[4]); }); Assert.IsTrue(exceptionThrown); Assert.AreEqual(calculator.LastErrorFileContent, exceptionMessage); } + mockRepository.VerifyAll(); } private static void AssertInput(AssessmentLevelCalculationInput expectedInput, HydraRingCalculationInput hydraRingCalculationInput) Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r2ba2957ae849bb05a45cf13f81a8f6464184caef -rbc9c19b950e12688f8f97a659af2f2cd3295956a --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 2ba2957ae849bb05a45cf13f81a8f6464184caef) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a) @@ -529,7 +529,7 @@ } [Test] - public void Calculate_CalculationFailedWithExceptionAndLastErrorPresent_ExceptionThrown() + public void Calculate_CalculationFailedWithExceptionAndLastErrorPresent_LogErrorAndThrowException() { // Setup var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism @@ -591,7 +591,7 @@ } [Test] - public void Calculate_CalculationFailedWithExceptionAndNoLastErrorPresent_ExceptionThrown() + public void Calculate_CalculationFailedWithExceptionAndNoLastErrorPresent_LogErrorAndThrowException() { // Setup var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r64eede81657b51fb755944fd3939ceefb839e591 -rbc9c19b950e12688f8f97a659af2f2cd3295956a --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationContextTreeNodeInfoTest.cs) (revision 64eede81657b51fb755944fd3939ceefb839e591) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationContextTreeNodeInfoTest.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a) @@ -612,8 +612,7 @@ Output = initialOutput, InputParameters = { - HydraulicBoundaryLocation = hydraulicBoundaryLocation, - Structure = new TestHeightStructure() + HydraulicBoundaryLocation = hydraulicBoundaryLocation } }; @@ -693,8 +692,7 @@ { InputParameters = { - HydraulicBoundaryLocation = hydraulicBoundaryLocation, - Structure = new TestHeightStructure() + HydraulicBoundaryLocation = hydraulicBoundaryLocation } }; Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r64eede81657b51fb755944fd3939ceefb839e591 -rbc9c19b950e12688f8f97a659af2f2cd3295956a --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 64eede81657b51fb755944fd3939ceefb839e591) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a) @@ -811,8 +811,7 @@ Name = "A", InputParameters = { - HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2), - Structure = new TestHeightStructure() + HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2) } }); @@ -821,8 +820,7 @@ Name = "B", InputParameters = { - HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2), - Structure = new TestHeightStructure() + HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2) } }); @@ -901,8 +899,7 @@ Name = "A", InputParameters = { - HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2), - Structure = new TestHeightStructure() + HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2) } }); @@ -911,8 +908,7 @@ Name = "B", InputParameters = { - HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2), - Structure = new TestHeightStructure() + HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2) } }); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r2545a8486f7c2820781ec3871125bdd8121622fd -rbc9c19b950e12688f8f97a659af2f2cd3295956a --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision 2545a8486f7c2820781ec3871125bdd8121622fd) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a) @@ -738,17 +738,15 @@ Name = "A", InputParameters = { - HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2), - Structure = new TestHeightStructure() + HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2) } }); failureMechanism.CalculationsGroup.Children.Add(new TestHeightStructuresCalculation { Name = "B", InputParameters = { - HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2), - Structure = new TestHeightStructure() + HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2) } }); @@ -820,17 +818,15 @@ Name = "A", InputParameters = { - HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2), - Structure = new TestHeightStructure() + HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2) } }); failureMechanism.CalculationsGroup.Children.Add(new TestHeightStructuresCalculation { Name = "B", InputParameters = { - HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2), - Structure = new TestHeightStructure() + HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2) } }); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs =================================================================== diff -u -racca39f8e27f0fc74521a290ae5404227e3e646e -rbc9c19b950e12688f8f97a659af2f2cd3295956a --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs (.../HeightStructuresCalculationActivityIntegrationTest.cs) (revision acca39f8e27f0fc74521a290ae5404227e3e646e) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs (.../HeightStructuresCalculationActivityIntegrationTest.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a) @@ -108,8 +108,7 @@ { InputParameters = { - HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001), - Structure = new TestHeightStructure() + HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001) } }; @@ -159,8 +158,7 @@ { InputParameters = { - HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 1, 1), - Structure = new TestHeightStructure() + HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 1, 1) } }; Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs =================================================================== diff -u -r2ba2957ae849bb05a45cf13f81a8f6464184caef -rbc9c19b950e12688f8f97a659af2f2cd3295956a --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision 2ba2957ae849bb05a45cf13f81a8f6464184caef) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a) @@ -167,11 +167,7 @@ var calculation = new TestHeightStructuresCalculation { - Name = name, - InputParameters = - { - Structure = new TestHeightStructure() - } + Name = name }; // Call @@ -255,8 +251,7 @@ Name = name, InputParameters = { - HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2, 2), - Structure = new TestHeightStructure() + HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2, 2) } }; @@ -302,8 +297,7 @@ Name = name, InputParameters = { - HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2, 2), - Structure = new TestHeightStructure() + HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2, 2) } }; @@ -351,8 +345,7 @@ Name = name, InputParameters = { - HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2, 2), - Structure = new TestHeightStructure() + HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2, 2) } }; @@ -399,8 +392,7 @@ Name = name, InputParameters = { - HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2, 2), - Structure = new TestHeightStructure() + HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2, 2) } }; @@ -448,7 +440,6 @@ InputParameters = { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2, 2), - Structure = new TestHeightStructure(), ForeshoreProfile = new TestForeshoreProfile(new BreakWater(BreakWaterType.Dam, breakWaterHeight)), UseBreakWater = true } @@ -489,8 +480,7 @@ Name = name, InputParameters = { - HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2, 2), - Structure = new TestHeightStructure() + HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2, 2) } }; @@ -534,7 +524,6 @@ InputParameters = { HydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001), - Structure = new TestHeightStructure(), ForeshoreProfile = new TestForeshoreProfile(true), UseBreakWater = true, UseForeshore = true @@ -601,7 +590,6 @@ InputParameters = { HydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001), - Structure = new TestHeightStructure(), ForeshoreProfile = new TestForeshoreProfile(true), UseBreakWater = false, UseForeshore = true @@ -652,8 +640,7 @@ { InputParameters = { - HydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001), - Structure = new TestHeightStructure() + HydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001) } }; @@ -729,8 +716,7 @@ { InputParameters = { - HydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001), - Structure = new TestHeightStructure() + HydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001) } }; Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs =================================================================== diff -u -r416bdb89f8e154bd4108a518d8a3e69f652a6eb0 -rbc9c19b950e12688f8f97a659af2f2cd3295956a --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs (.../HydraRingCalculatorBase.cs) (revision 416bdb89f8e154bd4108a518d8a3e69f652a6eb0) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs (.../HydraRingCalculatorBase.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a) @@ -61,7 +61,7 @@ } /// - /// Gets the directory of the output used during the calculation. + /// Gets the temporary output directory that is generated during the calculation. /// public string OutputDirectory { get; private set; } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDesignWaterLevelCalculator.cs =================================================================== diff -u -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff -rbc9c19b950e12688f8f97a659af2f2cd3295956a --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDesignWaterLevelCalculator.cs (.../IDesignWaterLevelCalculator.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDesignWaterLevelCalculator.cs (.../IDesignWaterLevelCalculator.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a) @@ -40,7 +40,7 @@ double ReliabilityIndex { get; } /// - /// Gets the the output directory used during the Hydra-Ring calculation. + /// Gets the temporary output directory that is generated during the Hydra-Ring calculation. /// string OutputDirectory { get; } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDikeHeightCalculator.cs =================================================================== diff -u -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff -rbc9c19b950e12688f8f97a659af2f2cd3295956a --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDikeHeightCalculator.cs (.../IDikeHeightCalculator.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDikeHeightCalculator.cs (.../IDikeHeightCalculator.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a) @@ -35,7 +35,7 @@ double DikeHeight { get; } /// - /// Gets the the output directory used during the Hydra-Ring calculation. + /// Gets the temporary output directory that is generated during the Hydra-Ring calculation. /// string OutputDirectory { get; } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IOvertoppingCalculator.cs =================================================================== diff -u -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff -rbc9c19b950e12688f8f97a659af2f2cd3295956a --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IOvertoppingCalculator.cs (.../IOvertoppingCalculator.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IOvertoppingCalculator.cs (.../IOvertoppingCalculator.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a) @@ -45,7 +45,7 @@ bool IsOvertoppingDominant { get; } /// - /// Gets the the output directory used during the Hydra-Ring calculation. + /// Gets the temporary output directory that is generated during the Hydra-Ring calculation. /// string OutputDirectory { get; } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IStructuresClosureCalculator.cs =================================================================== diff -u -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff -rbc9c19b950e12688f8f97a659af2f2cd3295956a --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IStructuresClosureCalculator.cs (.../IStructuresClosureCalculator.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IStructuresClosureCalculator.cs (.../IStructuresClosureCalculator.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a) @@ -35,7 +35,7 @@ double ExceedanceProbabilityBeta { get; } /// - /// Gets the the output directory used during the Hydra-Ring calculation. + /// Gets the temporary output directory that is generated during the Hydra-Ring calculation. /// string OutputDirectory { get; } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IStructuresOvertoppingCalculator.cs =================================================================== diff -u -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff -rbc9c19b950e12688f8f97a659af2f2cd3295956a --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IStructuresOvertoppingCalculator.cs (.../IStructuresOvertoppingCalculator.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IStructuresOvertoppingCalculator.cs (.../IStructuresOvertoppingCalculator.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a) @@ -35,7 +35,7 @@ double ExceedanceProbabilityBeta { get; } /// - /// Gets the the output directory used during the Hydra-Ring calculation. + /// Gets the temporary output directory that is generated during the Hydra-Ring calculation. /// string OutputDirectory { get; } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IStructuresStabilityPointCalculator.cs =================================================================== diff -u -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff -rbc9c19b950e12688f8f97a659af2f2cd3295956a --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IStructuresStabilityPointCalculator.cs (.../IStructuresStabilityPointCalculator.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IStructuresStabilityPointCalculator.cs (.../IStructuresStabilityPointCalculator.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a) @@ -35,7 +35,7 @@ double ExceedanceProbabilityBeta { get; } /// - /// Gets the the output directory used during the Hydra-Ring calculation. + /// Gets the temporary output directory that is generated during the Hydra-Ring calculation. /// string OutputDirectory { get; } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveConditionsCosineCalculator.cs =================================================================== diff -u -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff -rbc9c19b950e12688f8f97a659af2f2cd3295956a --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveConditionsCosineCalculator.cs (.../IWaveConditionsCosineCalculator.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveConditionsCosineCalculator.cs (.../IWaveConditionsCosineCalculator.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a) @@ -45,7 +45,7 @@ double WavePeakPeriod { get; } /// - /// Gets the the output directory used during the Hydra-Ring calculation. + /// Gets the temporary output directory that is generated during the Hydra-Ring calculation.s /// string OutputDirectory { get; } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveHeightCalculator.cs =================================================================== diff -u -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff -rbc9c19b950e12688f8f97a659af2f2cd3295956a --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveHeightCalculator.cs (.../IWaveHeightCalculator.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveHeightCalculator.cs (.../IWaveHeightCalculator.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a) @@ -40,7 +40,7 @@ double ReliabilityIndex { get; } /// - /// Gets the the output directory used during the Hydra-Ring calculation. + /// Gets the temporary output directory that is generated during the Hydra-Ring calculation. /// string OutputDirectory { get; } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraRingFileConstants.cs =================================================================== diff -u -rcda954dea54f724a567a847c271370dd03b72746 -rbc9c19b950e12688f8f97a659af2f2cd3295956a --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraRingFileConstants.cs (.../HydraRingFileConstants.cs) (revision cda954dea54f724a567a847c271370dd03b72746) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraRingFileConstants.cs (.../HydraRingFileConstants.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a) @@ -30,13 +30,8 @@ /// The tail and extension of the file containing output generated during a calculation. /// internal const string OutputFileSuffix = "-output.txt"; - + /// - /// The extension of the log file for a certain section. - /// - internal const string LogFileExtension = ".log"; - - /// /// The file name of the file containing the output of a calculation. /// internal const string DesignTablesFileName = "designTable.txt"; @@ -62,7 +57,7 @@ internal const string ConfigurationDatabaseFileName = "config.sqlite"; /// - /// The file name of the file containing the error of a calculation. + /// The file name which contains the error of a calculation. /// internal const string LastErrorFileName = "last_error.txt"; } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/LastErrorFileParserTest.cs =================================================================== diff -u -ra366dfcdc1745aac3f4588a6a91bfbca5db88419 -rbc9c19b950e12688f8f97a659af2f2cd3295956a --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/LastErrorFileParserTest.cs (.../LastErrorFileParserTest.cs) (revision a366dfcdc1745aac3f4588a6a91bfbca5db88419) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/LastErrorFileParserTest.cs (.../LastErrorFileParserTest.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a) @@ -63,7 +63,7 @@ } [Test] - public void Parse_NotExistingLastErrorOutputFile_DoensNotThrowException() + public void Parse_NotExistingLastErrorOutputFile_DoesNotThrowException() { // Setup var lastErrorFileParser = new LastErrorFileParser(); Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r2ba2957ae849bb05a45cf13f81a8f6464184caef -rbc9c19b950e12688f8f97a659af2f2cd3295956a --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision 2ba2957ae849bb05a45cf13f81a8f6464184caef) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a) @@ -573,7 +573,7 @@ } [Test] - public void Calculate_CalculationFailedWithExceptionAndLastErrorPresent_ExceptionThrown() + public void Calculate_CalculationFailedWithExceptionAndLastErrorPresent_LogErrorAndThrowException() { // Setup var failureMechanism = new StabilityStoneCoverFailureMechanism @@ -637,7 +637,7 @@ } [Test] - public void Calculate_CalculationFailedWithExceptionAndNoLastErrorPresent_ExceptionThrown() + public void Calculate_CalculationFailedWithExceptionAndNoLastErrorPresent_LogErrorAndThrowException() { // Setup var failureMechanism = new StabilityStoneCoverFailureMechanism Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r2ba2957ae849bb05a45cf13f81a8f6464184caef -rbc9c19b950e12688f8f97a659af2f2cd3295956a --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision 2ba2957ae849bb05a45cf13f81a8f6464184caef) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision bc9c19b950e12688f8f97a659af2f2cd3295956a) @@ -515,7 +515,7 @@ } [Test] - public void Calculate_CalculationFailedWithExceptionAndLastErrorPresent_ExceptionThrown() + public void Calculate_CalculationFailedWithExceptionAndLastErrorPresent_LogErrorAndThrowException() { // Setup var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism @@ -578,7 +578,7 @@ } [Test] - public void Calculate_CalculationFailedWithExceptionAndNoLastErrorPresent_ExceptionThrown() + public void Calculate_CalculationFailedWithExceptionAndNoLastErrorPresent_LogErrorAndThrowException() { // Setup var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism