Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs =================================================================== diff -u -rb66269d1c3435557b993a5daa333612017f6ccfd -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs (.../ClosingStructuresCalculationService.cs) (revision b66269d1c3435557b993a5daa333612017f6ccfd) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs (.../ClosingStructuresCalculationService.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -104,7 +104,7 @@ { if (!canceled) { - var lastErrorContent = calculator.LastErrorContent; + var lastErrorContent = calculator.LastErrorFileContent; if (string.IsNullOrEmpty(lastErrorContent)) { log.ErrorFormat(Resources.ClosingStructuresCalculationService_Calculate_Unexplained_error_in_closing_structures_0_calculation, @@ -124,7 +124,7 @@ { try { - var lastErrorContent = calculator.LastErrorContent; + var lastErrorContent = calculator.LastErrorFileContent; if (!canceled && !exceptionThrown && !string.IsNullOrEmpty(lastErrorContent)) { log.ErrorFormat(Resources.ClosingStructuresCalculationService_Calculate_Error_in_closing_structures_0_calculation_click_details_for_last_error_1, Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs =================================================================== diff -u -r7d48ffd223ef14e9642bd8e09fe37ba6ab4c8c2f -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs (.../ClosingStructuresCalculationActivityIntegrationTest.cs) (revision 7d48ffd223ef14e9642bd8e09fe37ba6ab4c8c2f) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs (.../ClosingStructuresCalculationActivityIntegrationTest.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -165,7 +165,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).StructuresClosureCalculator; calculator.EndInFailure = true; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; // Call Action call = () => activity.Run(); @@ -270,7 +270,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).StructuresClosureCalculator; calculator.EndInFailure = false; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; // Call Action call = () => activity.Run(); Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs =================================================================== diff -u -rd4213a7531c7effcd982ca96e799c2f8231b7627 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision d4213a7531c7effcd982ca96e799c2f8231b7627) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -908,7 +908,7 @@ using (new HydraRingCalculatorFactoryConfig()) { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).StructuresClosureCalculator; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; calculator.EndInFailure = true; var exceptionThrown = false; @@ -1034,7 +1034,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).StructuresClosureCalculator; calculator.EndInFailure = false; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; var exceptionThrown = false; var exceptionMessage = string.Empty; @@ -1068,7 +1068,7 @@ StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[3]); }); Assert.IsTrue(exceptionThrown); - Assert.AreEqual(calculator.LastErrorContent, exceptionMessage); + Assert.AreEqual(calculator.LastErrorFileContent, exceptionMessage); } } Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs =================================================================== diff -u -r38caef175dd83b98ba80552e366d18a2871646b3 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 38caef175dd83b98ba80552e366d18a2871646b3) +++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -108,7 +108,7 @@ { if (!canceled) { - var lastErrorContent = calculator.LastErrorContent; + var lastErrorContent = calculator.LastErrorFileContent; log.Error(string.IsNullOrEmpty(lastErrorContent) ? messageProvider.GetCalculationFailedUnexplainedMessage(hydraulicBoundaryLocation.Name) : messageProvider.GetCalculationFailedMessage(hydraulicBoundaryLocation.Name, lastErrorContent)); @@ -121,7 +121,7 @@ { try { - var lastErrorContent = calculator.LastErrorContent; + var lastErrorContent = calculator.LastErrorFileContent; if (!canceled && !exceptionThrown && !string.IsNullOrEmpty(lastErrorContent)) { log.Error(messageProvider.GetCalculationFailedMessage(hydraulicBoundaryLocation.Name, lastErrorContent)); Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs =================================================================== diff -u -r38caef175dd83b98ba80552e366d18a2871646b3 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision 38caef175dd83b98ba80552e366d18a2871646b3) +++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -109,7 +109,7 @@ { if (!canceled) { - var lastErrorContent = calculator.LastErrorContent; + var lastErrorContent = calculator.LastErrorFileContent; log.Error(string.IsNullOrEmpty(lastErrorContent) ? messageProvider.GetCalculationFailedUnexplainedMessage(hydraulicBoundaryLocation.Name) : messageProvider.GetCalculationFailedMessage(hydraulicBoundaryLocation.Name, lastErrorContent)); @@ -122,7 +122,7 @@ { try { - var lastErrorContent = calculator.LastErrorContent; + var lastErrorContent = calculator.LastErrorFileContent; if (!canceled && !exceptionThrown && !string.IsNullOrEmpty(lastErrorContent)) { log.Error(messageProvider.GetCalculationFailedMessage(hydraulicBoundaryLocation.Name, lastErrorContent)); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs =================================================================== diff -u -rb66269d1c3435557b993a5daa333612017f6ccfd -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision b66269d1c3435557b993a5daa333612017f6ccfd) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -326,7 +326,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DesignWaterLevelCalculator; calculator.EndInFailure = true; - calculator.LastErrorContent = calculationFailedMessage; + calculator.LastErrorFileContent = calculationFailedMessage; // Call Action call = () => activity.Run(); @@ -470,7 +470,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DesignWaterLevelCalculator; calculator.EndInFailure = false; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; // Call Action call = () => activity.Run(); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs =================================================================== diff -u -ra8bfedc443289dd37ebd3c2304d4c4add4ef7d58 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision a8bfedc443289dd37ebd3c2304d4c4add4ef7d58) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -233,7 +233,7 @@ { var testCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DesignWaterLevelCalculator; testCalculator.EndInFailure = true; - testCalculator.LastErrorContent = calculationFailedMessage; + testCalculator.LastErrorFileContent = calculationFailedMessage; bool exceptionThrown = false; // Call @@ -293,7 +293,7 @@ using (new HydraRingCalculatorFactoryConfig()) { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DesignWaterLevelCalculator; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; calculator.EndInFailure = true; var exceptionThrown = false; @@ -413,7 +413,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DesignWaterLevelCalculator; calculator.EndInFailure = false; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; var exceptionThrown = false; var exceptionMessage = string.Empty; @@ -447,7 +447,7 @@ StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[3]); }); Assert.IsTrue(exceptionThrown); - Assert.AreEqual(calculator.LastErrorContent, exceptionMessage); + Assert.AreEqual(calculator.LastErrorFileContent, exceptionMessage); } } Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs =================================================================== diff -u -rb66269d1c3435557b993a5daa333612017f6ccfd -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs (.../WaveHeightCalculationActivityTest.cs) (revision b66269d1c3435557b993a5daa333612017f6ccfd) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs (.../WaveHeightCalculationActivityTest.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -309,7 +309,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveHeightCalculator; calculator.EndInFailure = true; - calculator.LastErrorContent = calculationFailedMessage; + calculator.LastErrorFileContent = calculationFailedMessage; // Call Action call = () => activity.Run(); @@ -453,7 +453,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveHeightCalculator; calculator.EndInFailure = false; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; // Call Action call = () => activity.Run(); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs =================================================================== diff -u -ra8bfedc443289dd37ebd3c2304d4c4add4ef7d58 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision a8bfedc443289dd37ebd3c2304d4c4add4ef7d58) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -231,7 +231,7 @@ { var testCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveHeightCalculator; testCalculator.EndInFailure = true; - testCalculator.LastErrorContent = calculationFailedMessage; + testCalculator.LastErrorFileContent = calculationFailedMessage; bool exceptionThrown = false; // Call Action call = () => @@ -290,7 +290,7 @@ using (new HydraRingCalculatorFactoryConfig()) { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveHeightCalculator; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; calculator.EndInFailure = true; var exceptionThrown = false; @@ -410,7 +410,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveHeightCalculator; calculator.EndInFailure = false; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; var exceptionThrown = false; var exceptionMessage = string.Empty; @@ -444,7 +444,7 @@ StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[3]); }); Assert.IsTrue(exceptionThrown); - Assert.AreEqual(calculator.LastErrorContent, exceptionMessage); + Assert.AreEqual(calculator.LastErrorFileContent, exceptionMessage); } } Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs =================================================================== diff -u -r38caef175dd83b98ba80552e366d18a2871646b3 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 38caef175dd83b98ba80552e366d18a2871646b3) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -173,7 +173,7 @@ { if (!canceled) { - var lastErrorContent = overtoppingCalculator.LastErrorContent; + var lastErrorContent = overtoppingCalculator.LastErrorFileContent; if (string.IsNullOrEmpty(lastErrorContent)) { log.ErrorFormat(Resources.GrassCoverErosionInwardsCalculationService_Calculate_Unexplained_error_in_grass_cover_erosion_inwards_0_calculation, calculationName); @@ -191,7 +191,7 @@ { try { - var lastErrorContent = overtoppingCalculator.LastErrorContent; + var lastErrorContent = overtoppingCalculator.LastErrorFileContent; if (!canceled && !exceptionThrown && !string.IsNullOrEmpty(lastErrorContent)) { log.ErrorFormat(Resources.GrassCoverErosionInwardsCalculationService_Calculate_Error_in_grass_cover_erosion_inwards_0_calculation_click_details_for_last_error_1, calculationName, lastErrorContent); @@ -219,7 +219,7 @@ { if (!canceled) { - var lastErrorContent = dikeHeightCalculator.LastErrorContent; + var lastErrorContent = dikeHeightCalculator.LastErrorFileContent; if (string.IsNullOrEmpty(lastErrorContent)) { log.ErrorFormat(Resources.GrassCoverErosionInwardsCalculationService_Calculate_Unexplained_error_in_hbn_grass_cover_erosion_inwards_0_calculation, calculationName); @@ -234,7 +234,7 @@ } finally { - var lastErrorContent = dikeHeightCalculator.LastErrorContent; + var lastErrorContent = dikeHeightCalculator.LastErrorFileContent; if (!canceled && !exceptionThrown && !string.IsNullOrEmpty(lastErrorContent)) { log.ErrorFormat(Resources.GrassCoverErosionInwardsCalculationService_Calculate_Error_in_hbn_grass_cover_erosion_inwards_0_calculation_click_details_for_last_error_1, calculationName, lastErrorContent); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r7d48ffd223ef14e9642bd8e09fe37ba6ab4c8c2f -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision 7d48ffd223ef14e9642bd8e09fe37ba6ab4c8c2f) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -528,7 +528,7 @@ using (new HydraRingCalculatorFactoryConfig()) { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; calculator.EndInFailure = true; var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFile, assessmentSection.GrassCoverErosionInwards, assessmentSection); @@ -618,7 +618,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; calculator.EndInFailure = false; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFile, assessmentSection.GrassCoverErosionInwards, assessmentSection); @@ -663,7 +663,7 @@ using (new HydraRingCalculatorFactoryConfig()) { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; calculator.EndInFailure = true; var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFile, assessmentSection.GrassCoverErosionInwards, assessmentSection); @@ -755,7 +755,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; calculator.EndInFailure = false; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFile, assessmentSection.GrassCoverErosionInwards, assessmentSection); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs =================================================================== diff -u -rb66269d1c3435557b993a5daa333612017f6ccfd -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs (.../GrassCoverErosionInwardsCalculationServiceTest.cs) (revision b66269d1c3435557b993a5daa333612017f6ccfd) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs (.../GrassCoverErosionInwardsCalculationServiceTest.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -728,7 +728,7 @@ using (new HydraRingCalculatorFactoryConfig()) { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; calculator.EndInFailure = true; var exceptionThrown = false; @@ -862,7 +862,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; calculator.EndInFailure = false; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; var exceptionThrown = false; var exceptionMessage = string.Empty; @@ -898,7 +898,7 @@ StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[3]); }); Assert.IsTrue(exceptionThrown); - Assert.AreEqual(calculator.LastErrorContent, exceptionMessage); + Assert.AreEqual(calculator.LastErrorFileContent, exceptionMessage); } } @@ -932,7 +932,7 @@ using (new HydraRingCalculatorFactoryConfig()) { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; calculator.EndInFailure = true; var exceptionThrown = false; @@ -1068,7 +1068,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; calculator.EndInFailure = false; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; var exceptionThrown = false; Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r5a19c1544d732696d84f24877303cdfb19122bc7 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 5a19c1544d732696d84f24877303cdfb19122bc7) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -341,7 +341,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator; calculator.EndInFailure = false; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; // Call activity.Run(); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r5a19c1544d732696d84f24877303cdfb19122bc7 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 5a19c1544d732696d84f24877303cdfb19122bc7) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -546,7 +546,7 @@ using (new HydraRingCalculatorFactoryConfig()) { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; calculator.EndInFailure = true; var exception = false; @@ -672,7 +672,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator; calculator.EndInFailure = false; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; var exception = false; var exceptionMessage = string.Empty; @@ -713,7 +713,7 @@ StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[5]); }); Assert.IsTrue(exception); - Assert.AreEqual(calculator.LastErrorContent, exceptionMessage); + Assert.AreEqual(calculator.LastErrorFileContent, exceptionMessage); mockRepository.VerifyAll(); } } Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs =================================================================== diff -u -rdc06e587d9b54b54505ebd4cf70efb9c75c94411 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs (.../HeightStructuresCalculationService.cs) (revision dc06e587d9b54b54505ebd4cf70efb9c75c94411) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs (.../HeightStructuresCalculationService.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -128,7 +128,7 @@ { if (!canceled) { - var lastErrorContent = calculator.LastErrorContent; + var lastErrorContent = calculator.LastErrorFileContent; if (string.IsNullOrEmpty(lastErrorContent)) { log.ErrorFormat(Resources.HeightStructuresCalculationService_Calculate_Unexplained_error_in_height_structures_0_calculation, @@ -148,7 +148,7 @@ { try { - var lastErrorContent = calculator.LastErrorContent; + var lastErrorContent = calculator.LastErrorFileContent; if (!canceled && !exceptionThrown && !string.IsNullOrEmpty(lastErrorContent)) { log.ErrorFormat(Resources.HeightStructuresCalculationService_Calculate_Error_in_height_structures_0_calculation_click_details_for_last_error_1, Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs =================================================================== diff -u -ra8bfedc443289dd37ebd3c2304d4c4add4ef7d58 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs (.../HeightStructuresCalculationActivityIntegrationTest.cs) (revision a8bfedc443289dd37ebd3c2304d4c4add4ef7d58) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs (.../HeightStructuresCalculationActivityIntegrationTest.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -167,7 +167,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).StructuresOvertoppingCalculator; calculator.EndInFailure = true; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; // Call Action call = () => activity.Run(); @@ -271,7 +271,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).StructuresOvertoppingCalculator; calculator.EndInFailure = false; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; // Call Action call = () => activity.Run(); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs =================================================================== diff -u -rd4213a7531c7effcd982ca96e799c2f8231b7627 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision d4213a7531c7effcd982ca96e799c2f8231b7627) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -784,7 +784,7 @@ using (new HydraRingCalculatorFactoryConfig()) { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).StructuresOvertoppingCalculator; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; calculator.EndInFailure = true; var exceptionThrown = false; @@ -910,7 +910,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).StructuresOvertoppingCalculator; calculator.EndInFailure = false; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; var exceptionThrown = false; var exceptionMessage = string.Empty; @@ -944,7 +944,7 @@ StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[3]); }); Assert.IsTrue(exceptionThrown); - Assert.AreEqual(calculator.LastErrorContent, exceptionMessage); + Assert.AreEqual(calculator.LastErrorFileContent, exceptionMessage); } } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs =================================================================== diff -u -r07cf1185ccd0260f3e72818dff093ff39dbdd816 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs (.../HydraRingCalculatorBase.cs) (revision 07cf1185ccd0260f3e72818dff093ff39dbdd816) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs (.../HydraRingCalculatorBase.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -68,7 +68,7 @@ /// /// Gets the content of the last error file generated during the Hydra-Ring calculation. /// - public string LastErrorContent { get; private set; } + public string LastErrorFileContent { get; private set; } /// /// Cancels any currently running Hydra-Ring calculation. @@ -122,7 +122,7 @@ private void ExecuteGenericParsers(HydraRingInitializationService hydraRingInitializationService, int sectionId) { lastErrorFileParser.Parse(hydraRingInitializationService.TemporaryWorkingDirectory, sectionId); - LastErrorContent = lastErrorFileParser.ErrorFileContent; + LastErrorFileContent = lastErrorFileParser.ErrorFileContent; } private void ExecuteCustomParsers(string temporaryWorkingDirectory, int sectionId) Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDesignWaterLevelCalculator.cs =================================================================== diff -u -rc7d39e2c22a5df98a9f398cab98040a51faba283 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDesignWaterLevelCalculator.cs (.../IDesignWaterLevelCalculator.cs) (revision c7d39e2c22a5df98a9f398cab98040a51faba283) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDesignWaterLevelCalculator.cs (.../IDesignWaterLevelCalculator.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -47,7 +47,7 @@ /// /// Gets the content of the last error file generated during the Hydra-Ring calculation. /// - string LastErrorContent { get; } + string LastErrorFileContent { get; } /// /// Performs the actual calculation by running the Hydra-Ring executable. Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDikeHeightCalculator.cs =================================================================== diff -u -r42d52d35081f3f43067fd542813e1688cc78a454 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDikeHeightCalculator.cs (.../IDikeHeightCalculator.cs) (revision 42d52d35081f3f43067fd542813e1688cc78a454) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDikeHeightCalculator.cs (.../IDikeHeightCalculator.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -42,7 +42,7 @@ /// /// Gets the content of the last error file generated during the Hydra-Ring calculation. /// - string LastErrorContent { get; } + string LastErrorFileContent { get; } /// /// Performs the actual calculation by running the Hydra-Ring executable. Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IOvertoppingCalculator.cs =================================================================== diff -u -r42d52d35081f3f43067fd542813e1688cc78a454 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IOvertoppingCalculator.cs (.../IOvertoppingCalculator.cs) (revision 42d52d35081f3f43067fd542813e1688cc78a454) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IOvertoppingCalculator.cs (.../IOvertoppingCalculator.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -52,7 +52,7 @@ /// /// Gets the content of the last error file generated during the Hydra-Ring calculation. /// - string LastErrorContent { get; } + string LastErrorFileContent { get; } /// /// Performs the actual calculation by running the Hydra-Ring executable. Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IStructuresClosureCalculator.cs =================================================================== diff -u -r07cf1185ccd0260f3e72818dff093ff39dbdd816 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IStructuresClosureCalculator.cs (.../IStructuresClosureCalculator.cs) (revision 07cf1185ccd0260f3e72818dff093ff39dbdd816) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IStructuresClosureCalculator.cs (.../IStructuresClosureCalculator.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -42,7 +42,7 @@ /// /// Gets the content of the last error file generated during the Hydra-Ring calculation. /// - string LastErrorContent { get; } + string LastErrorFileContent { get; } /// /// Performs the actual calculation by running the Hydra-Ring executable. Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IStructuresOvertoppingCalculator.cs =================================================================== diff -u -r0fc840682ffcce4fc1074e7d6687e90cab58bd2b -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IStructuresOvertoppingCalculator.cs (.../IStructuresOvertoppingCalculator.cs) (revision 0fc840682ffcce4fc1074e7d6687e90cab58bd2b) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IStructuresOvertoppingCalculator.cs (.../IStructuresOvertoppingCalculator.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -42,7 +42,7 @@ /// /// Gets the content of the last error file generated during the Hydra-Ring calculation. /// - string LastErrorContent { get; } + string LastErrorFileContent { get; } /// /// Performs the actual calculation by running the Hydra-Ring executable. Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IStructuresStabilityPointCalculator.cs =================================================================== diff -u -rdf13dff5aedb149d7b566bed9dda68fe9e3a8e02 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IStructuresStabilityPointCalculator.cs (.../IStructuresStabilityPointCalculator.cs) (revision df13dff5aedb149d7b566bed9dda68fe9e3a8e02) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IStructuresStabilityPointCalculator.cs (.../IStructuresStabilityPointCalculator.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -42,7 +42,7 @@ /// /// Gets the content of the last error file generated during the Hydra-Ring calculation. /// - string LastErrorContent { get; } + string LastErrorFileContent { get; } /// /// Performs the actual calculation by running the Hydra-Ring executable. Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveConditionsCosineCalculator.cs =================================================================== diff -u -re07044ef611f4a005447703ffba9f24b7c5acb90 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveConditionsCosineCalculator.cs (.../IWaveConditionsCosineCalculator.cs) (revision e07044ef611f4a005447703ffba9f24b7c5acb90) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveConditionsCosineCalculator.cs (.../IWaveConditionsCosineCalculator.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -52,7 +52,7 @@ /// /// Gets the content of the last error file generated during the Hydra-Ring calculation. /// - string LastErrorContent { get; } + string LastErrorFileContent { get; } /// /// Performs the actual calculation by running the Hydra-Ring executable. Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveHeightCalculator.cs =================================================================== diff -u -rc7d39e2c22a5df98a9f398cab98040a51faba283 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveHeightCalculator.cs (.../IWaveHeightCalculator.cs) (revision c7d39e2c22a5df98a9f398cab98040a51faba283) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveHeightCalculator.cs (.../IWaveHeightCalculator.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -47,7 +47,7 @@ /// /// Gets the content of the last error file generated during the Hydra-Ring calculation. /// - string LastErrorContent { get; } + string LastErrorFileContent { get; } /// /// Performs the actual calculation by running the Hydra-Ring executable. Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs =================================================================== diff -u -r42d52d35081f3f43067fd542813e1688cc78a454 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs (.../TestHydraRingCalculatorFactory.cs) (revision 42d52d35081f3f43067fd542813e1688cc78a454) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs (.../TestHydraRingCalculatorFactory.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -102,15 +102,15 @@ public class TestWaveHeightCalculator : TestHydraRingCalculator, IWaveHeightCalculator { public string OutputDirectory { get; set; } - public string LastErrorContent { get; set; } + public string LastErrorFileContent { get; set; } public double WaveHeight { get; set; } public double ReliabilityIndex { get; set; } } public class TestWaveConditionsCosineCalculator : TestHydraRingCalculator, IWaveConditionsCosineCalculator { public string OutputDirectory { get; set; } - public string LastErrorContent { get; set; } + public string LastErrorFileContent { get; set; } public double WaveHeight { get; set; } public double WaveAngle { get; set; } public double WavePeakPeriod { get; set; } @@ -122,20 +122,20 @@ public double WaveHeight { get; set; } public bool IsOvertoppingDominant { get; set; } public string OutputDirectory { get; set; } - public string LastErrorContent { get; set; } + public string LastErrorFileContent { get; set; } } public class TestDikeHeightCalculator : TestHydraRingCalculator, IDikeHeightCalculator { public double DikeHeight { get; set; } public string OutputDirectory { get; set; } - public string LastErrorContent { get; set; } + public string LastErrorFileContent { get; set; } } public class TestDesignWaterLevelCalculator : TestHydraRingCalculator, IDesignWaterLevelCalculator { public string OutputDirectory { get; set; } - public string LastErrorContent { get; set; } + public string LastErrorFileContent { get; set; } public double DesignWaterLevel { get; set; } public double ReliabilityIndex { get; set; } } @@ -144,21 +144,21 @@ { public double ExceedanceProbabilityBeta { get; set; } public string OutputDirectory { get; set; } - public string LastErrorContent { get; set; } + public string LastErrorFileContent { get; set; } } public class TestStructuresClosureCalculator : TestHydraRingCalculator, IStructuresClosureCalculator { public double ExceedanceProbabilityBeta { get; set; } public string OutputDirectory { get; set; } - public string LastErrorContent { get; set; } + public string LastErrorFileContent { get; set; } } public class TestStructuresStabilityPointCalculator : TestHydraRingCalculator, IStructuresStabilityPointCalculator { public double ExceedanceProbabilityBeta { get; set; } public string OutputDirectory { get; set; } - public string LastErrorContent { get; set; } + public string LastErrorFileContent { get; set; } } public class TestHydraRingCalculator Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs =================================================================== diff -u -r38caef175dd83b98ba80552e366d18a2871646b3 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision 38caef175dd83b98ba80552e366d18a2871646b3) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -233,7 +233,7 @@ { if (!Canceled) { - var lastErrorContent = calculator.LastErrorContent; + var lastErrorContent = calculator.LastErrorFileContent; if (string.IsNullOrEmpty(lastErrorContent)) { log.ErrorFormat(CultureInfo.CurrentCulture, @@ -259,7 +259,7 @@ { try { - var lastErrorContent = calculator.LastErrorContent; + var lastErrorContent = calculator.LastErrorFileContent; if (!Canceled && !exceptionThrown && !string.IsNullOrEmpty(lastErrorContent)) { log.ErrorFormat(CultureInfo.CurrentCulture, Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs =================================================================== diff -u -r38caef175dd83b98ba80552e366d18a2871646b3 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision 38caef175dd83b98ba80552e366d18a2871646b3) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -124,7 +124,7 @@ { if (!canceled) { - var lastErrorContent = calculator.LastErrorContent; + var lastErrorContent = calculator.LastErrorFileContent; if (string.IsNullOrEmpty(lastErrorContent)) { log.ErrorFormat(Resources.StabilityPointStructuresCalculationService_Calculate_Unexplained_error_in_stabilityPoint_structures_0_calculation, @@ -144,7 +144,7 @@ { try { - var lastErrorContent = calculator.LastErrorContent; + var lastErrorContent = calculator.LastErrorFileContent; if (!canceled && !exceptionThrown && !string.IsNullOrEmpty(lastErrorContent)) { log.ErrorFormat(Resources.StabilityPointStructuresCalculationService_Calculate_Error_in_stabilityPoint_structures_0_calculation_click_details_for_last_error_1, Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs =================================================================== diff -u -r7d48ffd223ef14e9642bd8e09fe37ba6ab4c8c2f -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs (.../StabilityPointStructuresCalculationActivityIntegrationTest.cs) (revision 7d48ffd223ef14e9642bd8e09fe37ba6ab4c8c2f) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs (.../StabilityPointStructuresCalculationActivityIntegrationTest.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -169,7 +169,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).StructuresStabilityPointCalculator; calculator.EndInFailure = true; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; // Call Action call = () => activity.Run(); @@ -275,7 +275,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).StructuresStabilityPointCalculator; calculator.EndInFailure = false; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; // Call Action call = () => activity.Run(); Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs =================================================================== diff -u -rd4213a7531c7effcd982ca96e799c2f8231b7627 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision d4213a7531c7effcd982ca96e799c2f8231b7627) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -1431,7 +1431,7 @@ using (new HydraRingCalculatorFactoryConfig()) { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).StructuresStabilityPointCalculator; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; calculator.EndInFailure = true; var exceptionThrown = false; @@ -1557,7 +1557,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).StructuresStabilityPointCalculator; calculator.EndInFailure = false; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; var exceptionThrown = false; var exceptionMessage = string.Empty; @@ -1590,7 +1590,7 @@ StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[3]); }); Assert.IsTrue(exceptionThrown); - Assert.AreEqual(calculator.LastErrorContent, exceptionMessage); + Assert.AreEqual(calculator.LastErrorFileContent, exceptionMessage); } } Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -ra8bfedc443289dd37ebd3c2304d4c4add4ef7d58 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision a8bfedc443289dd37ebd3c2304d4c4add4ef7d58) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -434,7 +434,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator; calculator.EndInFailure = false; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; // Call activity.Run(); Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -ra8bfedc443289dd37ebd3c2304d4c4add4ef7d58 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision a8bfedc443289dd37ebd3c2304d4c4add4ef7d58) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -590,7 +590,7 @@ using (new HydraRingCalculatorFactoryConfig()) { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; calculator.EndInFailure = true; var exception = false; @@ -718,7 +718,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator; calculator.EndInFailure = false; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; var exception = false; var exceptionMessage = string.Empty; @@ -760,7 +760,7 @@ StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[6]); }); Assert.IsTrue(exception); - Assert.AreEqual(calculator.LastErrorContent, exceptionMessage); + Assert.AreEqual(calculator.LastErrorFileContent, exceptionMessage); mockRepository.VerifyAll(); } } Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -ra8bfedc443289dd37ebd3c2304d4c4add4ef7d58 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision a8bfedc443289dd37ebd3c2304d4c4add4ef7d58) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -299,7 +299,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator; calculator.EndInFailure = false; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; // Call activity.Run(); Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -ra8bfedc443289dd37ebd3c2304d4c4add4ef7d58 -r80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision a8bfedc443289dd37ebd3c2304d4c4add4ef7d58) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision 80e51fdd446be6524d4f3bcc4175e8d3ae9c86ff) @@ -528,7 +528,7 @@ using (new HydraRingCalculatorFactoryConfig()) { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; calculator.EndInFailure = true; var exception = false; @@ -654,7 +654,7 @@ { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator; calculator.EndInFailure = false; - calculator.LastErrorContent = "An error occurred"; + calculator.LastErrorFileContent = "An error occurred"; var exception = false; var exceptionMessage = string.Empty; @@ -695,7 +695,7 @@ StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[5]); }); Assert.IsTrue(exception); - Assert.AreEqual(calculator.LastErrorContent, exceptionMessage); + Assert.AreEqual(calculator.LastErrorFileContent, exceptionMessage); mockRepository.VerifyAll(); } }