Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs =================================================================== diff -u -r16cb360eae0014270ebb6700054afdbbd565ae65 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 16cb360eae0014270ebb6700054afdbbd565ae65) +++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -112,6 +112,7 @@ } finally { + log.InfoFormat(Resources.DesignWaterLevelCalculationService_Calculate_Calculation_report_Click_details_for_full_report_0, calculator.OutputFileContent); CalculationServiceHelper.LogCalculationEndTime(calculationName); } } Index: Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.Designer.cs =================================================================== diff -u -rc786273ba6460b0498c00ff70d1703eee74fadb8 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c786273ba6460b0498c00ff70d1703eee74fadb8) +++ Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -22,7 +22,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -137,6 +137,17 @@ } /// + /// Looks up a localized string similar to Toetspeil berekeningsverslag. Klik op details voor meer informatie. + ///{0}. + /// + public static string DesignWaterLevelCalculationService_Calculate_Calculation_report_Click_details_for_full_report_0 { + get { + return ResourceManager.GetString("DesignWaterLevelCalculationService_Calculate_Calculation_report_Click_details_for" + + "_full_report_0", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Er is een fout opgetreden tijdens de toetspeil berekening '{0}': inspecteer het logbestand.. /// public static string DesignWaterLevelCalculationService_Calculate_Error_in_design_water_level_0_calculation { @@ -270,6 +281,17 @@ } /// + /// Looks up a localized string similar to Golfhoogte berekeningsverslag. Klik op details voor meer informatie. + ///{0}. + /// + public static string WaveHeightCalculationService_Calculate_Calculation_report_Click_details_for_full_report_0 { + get { + return ResourceManager.GetString("WaveHeightCalculationService_Calculate_Calculation_report_Click_details_for_full_" + + "report_0", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Er is een fout opgetreden tijdens de golfhoogte berekening '{0}': inspecteer het logbestand.. /// public static string WaveHeightCalculationService_Calculate_Error_in_wave_height_0_calculation { Index: Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.resx =================================================================== diff -u -rc786273ba6460b0498c00ff70d1703eee74fadb8 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.resx (.../Resources.resx) (revision c786273ba6460b0498c00ff70d1703eee74fadb8) +++ Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.resx (.../Resources.resx) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -183,4 +183,12 @@ Er is geen concreet getal ingevoerd voor '{0}'. + + Toetspeil berekeningsverslag. Klik op details voor meer informatie. +{0} + + + Golfhoogte berekeningsverslag. Klik op details voor meer informatie. +{0} + \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs =================================================================== diff -u -r16cb360eae0014270ebb6700054afdbbd565ae65 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision 16cb360eae0014270ebb6700054afdbbd565ae65) +++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -113,6 +113,7 @@ } finally { + log.InfoFormat(Resources.WaveHeightCalculationService_Calculate_Calculation_report_Click_details_for_full_report_0, calculator.OutputFileContent); CalculationServiceHelper.LogCalculationEndTime(calculationName); } } Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs =================================================================== diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs (.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs) (revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs (.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -248,12 +248,13 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - Assert.AreEqual(5, msgs.Length); + Assert.AreEqual(6, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculationName), msgs[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculationName), msgs[1]); StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), msgs[2]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[3]); - StringAssert.AreNotEqualIgnoringCase(string.Format("Uitvoeren van '{0}' is mislukt.", calculationName), msgs[4]); + StringAssert.StartsWith("Toetspeil berekeningsverslag. Klik op details voor meer informatie.", msgs[3]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[4]); + StringAssert.AreNotEqualIgnoringCase(string.Format("Uitvoeren van '{0}' is mislukt.", calculationName), msgs[5]); }); } mockRepository.VerifyAll(); @@ -471,12 +472,13 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - Assert.AreEqual(5, msgs.Length); + Assert.AreEqual(6, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculationName), msgs[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculationName), msgs[1]); StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), msgs[2]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[3]); - StringAssert.AreNotEqualIgnoringCase(string.Format("Uitvoeren van '{0}' is mislukt.", calculationName), msgs[4]); + StringAssert.StartsWith("Golfhoogte berekeningsverslag. Klik op details voor meer informatie.", msgs[3]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[4]); + StringAssert.AreNotEqualIgnoringCase(string.Format("Uitvoeren van '{0}' is mislukt.", calculationName), msgs[5]); }); } mockRepository.VerifyAll(); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs =================================================================== diff -u -r73d7f318e9a02087ac21dde7d3728d8eac27a9f5 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision 73d7f318e9a02087ac21dde7d3728d8eac27a9f5) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -163,7 +163,7 @@ } [Test] - public void Run_ValidHydraulicBoundaryHydraulicBoundaryLocation_PerformValidationValidParameters() + public void Run_ValidHydraulicBoundaryDataBaseAndHydraulicBoundaryLocation_PerformValidationValidParameters() { // Setup string validFilePath = Path.Combine(testDataPath, validFile); @@ -202,11 +202,12 @@ TestHelper.AssertLogMessages(call, m => { var messages = m.ToArray(); - Assert.AreEqual(4, messages.Length); + Assert.AreEqual(5, messages.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculationName), messages[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculationName), messages[1]); StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), messages[2]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), messages[3]); + StringAssert.StartsWith("Toetspeil berekeningsverslag. Klik op details voor meer informatie.", messages[3]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), messages[4]); }); var designWaterLevelCalculationInput = testDesignWaterLevelCalculator.ReceivedInputs.First(); @@ -331,7 +332,7 @@ Action call = () => activity.Run(); // Assert - TestHelper.AssertLogMessageIsGenerated(call, calculationFailedMessage, 5); + TestHelper.AssertLogMessageIsGenerated(call, calculationFailedMessage, 6); Assert.IsNaN(hydraulicBoundaryLocation.DesignWaterLevel); Assert.AreEqual(CalculationConvergence.CalculatedConverged, hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence); } @@ -377,7 +378,7 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - Assert.AreEqual(5, msgs.Length); + Assert.AreEqual(6, msgs.Length); StringAssert.StartsWith(calculationNotConvergedMessage, msgs[3]); }); Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs =================================================================== diff -u -r16cb360eae0014270ebb6700054afdbbd565ae65 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision 16cb360eae0014270ebb6700054afdbbd565ae65) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -230,10 +230,11 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - Assert.AreEqual(3, msgs.Length); + Assert.AreEqual(4, msgs.Length); StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), msgs[0]); StringAssert.StartsWith(calculationFailedMessage, msgs[1]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[2]); + StringAssert.StartsWith("Toetspeil berekeningsverslag. Klik op details voor meer informatie.", msgs[2]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[3]); }); Assert.IsTrue(exceptionThrown); Assert.IsNaN(hydraulicBoundaryLocation.DesignWaterLevel); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs =================================================================== diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs (.../WaveHeightCalculationActivityTest.cs) (revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs (.../WaveHeightCalculationActivityTest.cs) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -184,11 +184,12 @@ TestHelper.AssertLogMessages(call, m => { var messages = m.ToArray(); - Assert.AreEqual(4, messages.Length); + Assert.AreEqual(5, messages.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculationName), messages[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculationName), messages[1]); StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), messages[2]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), messages[3]); + StringAssert.StartsWith("Golfhoogte berekeningsverslag. Klik op details voor meer informatie.", messages[3]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), messages[4]); }); var waveHeightCalculationInput = testWaveHeightCalculator.ReceivedInputs.First(); @@ -313,7 +314,7 @@ Action call = () => activity.Run(); // Assert - TestHelper.AssertLogMessageIsGenerated(call, calculationFailedMessage, 5); + TestHelper.AssertLogMessageIsGenerated(call, calculationFailedMessage, 6); Assert.IsNaN(hydraulicBoundaryLocation.WaveHeight); Assert.AreEqual(CalculationConvergence.CalculatedConverged, hydraulicBoundaryLocation.WaveHeightCalculationConvergence); } @@ -359,7 +360,7 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - Assert.AreEqual(5, msgs.Length); + Assert.AreEqual(6, msgs.Length); StringAssert.StartsWith(calculationNotConvergedMessage, msgs[3]); }); Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, hydraulicBoundaryLocation.WaveHeightCalculationConvergence); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs =================================================================== diff -u -r16cb360eae0014270ebb6700054afdbbd565ae65 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision 16cb360eae0014270ebb6700054afdbbd565ae65) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -228,10 +228,11 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - Assert.AreEqual(3, msgs.Length); + Assert.AreEqual(4, msgs.Length); StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), msgs[0]); StringAssert.StartsWith(calculationFailedMessage, msgs[1]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[2]); + StringAssert.StartsWith("Golfhoogte berekeningsverslag. Klik op details voor meer informatie.", msgs[2]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[3]); }); Assert.IsTrue(exceptionThrown); Assert.IsNaN(hydraulicBoundaryLocation.WaveHeight); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -re674bb3e0b3e4f2e66080348b8e6acfa48137bb1 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision e674bb3e0b3e4f2e66080348b8e6acfa48137bb1) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -893,7 +893,7 @@ TestHelper.AssertLogMessages(call, logMessages => { var messages = logMessages.ToArray(); - Assert.AreEqual(11, messages.Length); + Assert.AreEqual(14, messages.Length); }); Assert.AreEqual(3, calculation.Output.Items.Count()); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -re674bb3e0b3e4f2e66080348b8e6acfa48137bb1 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision e674bb3e0b3e4f2e66080348b8e6acfa48137bb1) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -804,13 +804,13 @@ TestHelper.AssertLogMessages(test, m => { var messages = m.ToArray(); - Assert.AreEqual(22, messages.Length); + Assert.AreEqual(28, messages.Length); StringAssert.StartsWith("Berekening van 'Nieuwe berekening' gestart om: ", messages[2]); - StringAssert.StartsWith("Berekening van 'Nieuwe berekening' beëindigd om: ", messages[9]); - StringAssert.StartsWith("Berekening van 'Nieuwe berekening' gestart om: ", messages[12]); - StringAssert.StartsWith("Berekening van 'Nieuwe berekening' beëindigd om: ", messages[19]); - Assert.AreEqual("Uitvoeren van 'Nieuwe berekening' is gelukt.", messages[20]); - Assert.AreEqual("Uitvoeren van 'Nieuwe berekening' is gelukt.", messages[21]); + StringAssert.StartsWith("Berekening van 'Nieuwe berekening' beëindigd om: ", messages[12]); + StringAssert.StartsWith("Berekening van 'Nieuwe berekening' gestart om: ", messages[15]); + StringAssert.StartsWith("Berekening van 'Nieuwe berekening' beëindigd om: ", messages[25]); + Assert.AreEqual("Uitvoeren van 'Nieuwe berekening' is gelukt.", messages[26]); + Assert.AreEqual("Uitvoeren van 'Nieuwe berekening' is gelukt.", messages[27]); }); } Assert.AreEqual(3, calculationA.Output.Items.Count()); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -re674bb3e0b3e4f2e66080348b8e6acfa48137bb1 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision e674bb3e0b3e4f2e66080348b8e6acfa48137bb1) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -314,7 +314,7 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - Assert.AreEqual(8, msgs.Length); + Assert.AreEqual(10, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); @@ -324,12 +324,13 @@ foreach (var waterLevel in calculation.InputParameters.WaterLevels) { Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, waterLevel), msgs[i + 1]); - Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i + 2]); + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[i + 2]); + Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i + 3]); - i = i + 2; + i = i + 3; } - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[7]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[9]); }); Assert.AreEqual(ActivityState.Executed, activity.State); } @@ -416,7 +417,7 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - Assert.AreEqual(8, msgs.Length); + Assert.AreEqual(10, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); @@ -426,12 +427,13 @@ foreach (var waterLevel in calculation.InputParameters.WaterLevels) { Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, waterLevel), msgs[i + 1]); - Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i + 2]); + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[i + 2]); + Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i + 3]); - i = i + 2; + i = i + 3; } - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[7]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[9]); }); Assert.AreEqual(ActivityState.Executed, activity.State); } @@ -460,7 +462,7 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - Assert.AreEqual(10, msgs.Length); + Assert.AreEqual(13, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]); @@ -469,11 +471,12 @@ foreach (var waterLevel in calculation.InputParameters.WaterLevels) { Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, waterLevel), msgs[i + 1]); - Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i + 2]); - i = i + 2; + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[i + 2]); + Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i + 3]); + i = i + 3; } - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[9]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[12]); }); Assert.AreEqual(ActivityState.Executed, activity.State); } @@ -590,13 +593,14 @@ string[] msgs = messages.ToArray(); RoundedDouble firstWaterLevel = calculation.InputParameters.WaterLevels.First(); - Assert.AreEqual(6, msgs.Length); + Assert.AreEqual(7, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]); Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, firstWaterLevel), msgs[3]); - Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, firstWaterLevel), msgs[4]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[5]); + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[4]); + Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, firstWaterLevel), msgs[5]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[6]); }); Assert.AreEqual(ActivityState.Canceled, activity.State); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r16cb360eae0014270ebb6700054afdbbd565ae65 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 16cb360eae0014270ebb6700054afdbbd565ae65) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -283,20 +283,21 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - Assert.AreEqual(6, msgs.Length); + Assert.AreEqual(8, msgs.Length); StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[0]); int i = 0; foreach (var waterLevel in calculation.InputParameters.WaterLevels) { Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, waterLevel), msgs[i + 1]); - Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i + 2]); + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[i + 2]); + Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i + 3]); - i = i + 2; + i = i + 3; } - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[5]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[7]); }); } } @@ -342,20 +343,21 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - Assert.AreEqual(6, msgs.Length); + Assert.AreEqual(8, msgs.Length); StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[0]); int i = 0; foreach (var waterLevel in calculation.InputParameters.WaterLevels) { Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, waterLevel), msgs[i + 1]); - Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i + 2]); + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[i + 2]); + Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i + 3]); - i = i + 2; + i = i + 3; } - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[5]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[7]); }); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r968cbe97d1a910b9bbb0fb52b22ece65126ed675 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs (.../WaveHeightLocationsContextTreeNodeInfoTest.cs) (revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs (.../WaveHeightLocationsContextTreeNodeInfoTest.cs) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -405,13 +405,14 @@ TestHelper.AssertLogMessages(action, messages => { var msgs = messages.ToArray(); - Assert.AreEqual(6, msgs.Length); + Assert.AreEqual(7, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van 'Golfhoogte berekenen voor locatie '{0}'' gestart om:", locationName), msgs[0]); StringAssert.StartsWith(string.Format("Validatie van 'Golfhoogte berekenen voor locatie '{0}'' beëindigd om:", locationName), msgs[1]); StringAssert.StartsWith(string.Format("Berekening van 'Golfhoogte berekenen voor locatie '{0}'' gestart om:", locationName), msgs[2]); StringAssert.StartsWith(string.Format("Er is een fout opgetreden tijdens de golfhoogte berekening '{0}': inspecteer het logbestand.", locationName), msgs[3]); - StringAssert.StartsWith(string.Format("Berekening van 'Golfhoogte berekenen voor locatie '{0}'' beëindigd om:", locationName), msgs[4]); - StringAssert.StartsWith(string.Format("Uitvoeren van 'Golfhoogte berekenen voor locatie '{0}'' is mislukt.", locationName), msgs[5]); + StringAssert.StartsWith("Golfhoogte berekeningsverslag. Klik op details voor meer informatie.", msgs[4]); + StringAssert.StartsWith(string.Format("Berekening van 'Golfhoogte berekenen voor locatie '{0}'' beëindigd om:", locationName), msgs[5]); + StringAssert.StartsWith(string.Format("Uitvoeren van 'Golfhoogte berekenen voor locatie '{0}'' is mislukt.", locationName), msgs[6]); }); Assert.AreEqual(CalculationConvergence.NotCalculated, location.WaveHeightCalculationConvergence); } Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Properties/Resources.Designer.cs =================================================================== diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -82,6 +82,17 @@ } /// + /// Looks up a localized string similar to Golfcondities berekeningsverslag. Klik op details voor meer informatie. + ///{0}. + /// + public static string WaveConditionsCalculationService_CalculateWaterLevel_Calculation_report_Click_details_for_full_report_0 { + get { + return ResourceManager.GetString("WaveConditionsCalculationService_CalculateWaterLevel_Calculation_report_Click_det" + + "ails_for_full_report_0", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Waterstand '{0}' berekenen.. /// public static string WaveConditionsCalculationService_OnRun_Calculate_waterlevel_0_ { Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Properties/Resources.resx =================================================================== diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Properties/Resources.resx (.../Resources.resx) (revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Properties/Resources.resx (.../Resources.resx) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -141,4 +141,8 @@ Waterstand '{0}' berekenen. + + Golfcondities berekeningsverslag. Klik op details voor meer informatie. +{0} + \ No newline at end of file Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs =================================================================== diff -u -rc786273ba6460b0498c00ff70d1703eee74fadb8 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision c786273ba6460b0498c00ff70d1703eee74fadb8) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -235,6 +235,10 @@ } return null; } + finally + { + log.InfoFormat(Resources.WaveConditionsCalculationService_CalculateWaterLevel_Calculation_report_Click_details_for_full_report_0, calculator.OutputFileContent); + } } private static WaveConditionsCosineCalculationInput CreateInput(RoundedDouble waterLevel, Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs =================================================================== diff -u -rc786273ba6460b0498c00ff70d1703eee74fadb8 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision c786273ba6460b0498c00ff70d1703eee74fadb8) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -472,9 +472,10 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - Assert.AreEqual(2, msgs.Length); + Assert.AreEqual(3, msgs.Length); Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", name, waterLevel), msgs[0]); Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' is niet gelukt.", name, waterLevel), msgs[1]); + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[2]); }); Assert.IsTrue(exceptionThrown); } Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -re674bb3e0b3e4f2e66080348b8e6acfa48137bb1 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision e674bb3e0b3e4f2e66080348b8e6acfa48137bb1) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -930,10 +930,10 @@ TestHelper.AssertLogMessages(call, logMessages => { var messages = logMessages.ToArray(); - Assert.AreEqual(21, messages.Length); + Assert.AreEqual(27, messages.Length); StringAssert.StartsWith("Berekening van 'A' gestart om: ", messages[2]); - StringAssert.StartsWith("Berekening van 'A' beëindigd om: ", messages[19]); - StringAssert.StartsWith("Uitvoeren van 'Golfcondities voor blokken en zuilen voor 'A' berekenen' is gelukt.", messages[20]); + StringAssert.StartsWith("Berekening van 'A' beëindigd om: ", messages[25]); + StringAssert.StartsWith("Uitvoeren van 'Golfcondities voor blokken en zuilen voor 'A' berekenen' is gelukt.", messages[26]); }); Assert.AreEqual(3, calculation.Output.BlocksOutput.Count()); Assert.AreEqual(3, calculation.Output.ColumnsOutput.Count()); Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -re674bb3e0b3e4f2e66080348b8e6acfa48137bb1 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision e674bb3e0b3e4f2e66080348b8e6acfa48137bb1) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -799,13 +799,13 @@ TestHelper.AssertLogMessages(test, m => { var messages = m.ToArray(); - Assert.AreEqual(42, messages.Length); + Assert.AreEqual(54, messages.Length); StringAssert.StartsWith("Berekening van 'Nieuwe berekening' gestart om: ", messages[2]); - StringAssert.StartsWith("Berekening van 'Nieuwe berekening' beëindigd om: ", messages[19]); - StringAssert.StartsWith("Berekening van 'Nieuwe berekening' gestart om: ", messages[22]); - StringAssert.StartsWith("Berekening van 'Nieuwe berekening' beëindigd om: ", messages[39]); - StringAssert.StartsWith("Uitvoeren van 'Golfcondities voor blokken en zuilen voor 'Nieuwe berekening' berekenen' is gelukt.", messages[40]); - StringAssert.StartsWith("Uitvoeren van 'Golfcondities voor blokken en zuilen voor 'Nieuwe berekening' berekenen' is gelukt.", messages[41]); + StringAssert.StartsWith("Berekening van 'Nieuwe berekening' beëindigd om: ", messages[25]); + StringAssert.StartsWith("Berekening van 'Nieuwe berekening' gestart om: ", messages[28]); + StringAssert.StartsWith("Berekening van 'Nieuwe berekening' beëindigd om: ", messages[51]); + StringAssert.StartsWith("Uitvoeren van 'Golfcondities voor blokken en zuilen voor 'Nieuwe berekening' berekenen' is gelukt.", messages[52]); + StringAssert.StartsWith("Uitvoeren van 'Golfcondities voor blokken en zuilen voor 'Nieuwe berekening' berekenen' is gelukt.", messages[53]); }); Assert.AreEqual(3, calculationA.Output.BlocksOutput.Count()); Assert.AreEqual(3, calculationA.Output.ColumnsOutput.Count()); Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -re674bb3e0b3e4f2e66080348b8e6acfa48137bb1 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision e674bb3e0b3e4f2e66080348b8e6acfa48137bb1) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -324,7 +324,7 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - Assert.AreEqual(16, msgs.Length); + Assert.AreEqual(20, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); @@ -336,21 +336,23 @@ foreach (var waterLevel in calculation.InputParameters.WaterLevels) { Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, waterLevel), msgs[i++]); + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[i++]); Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i++]); } - Assert.AreEqual(string.Format("Berekening '{0}' voor blokken beëindigd.", calculation.Name), msgs[8]); - Assert.AreEqual(string.Format("Berekening '{0}' voor zuilen gestart.", calculation.Name), msgs[9]); + Assert.AreEqual(string.Format("Berekening '{0}' voor blokken beëindigd.", calculation.Name), msgs[10]); + Assert.AreEqual(string.Format("Berekening '{0}' voor zuilen gestart.", calculation.Name), msgs[11]); - i = 10; + i = 12; foreach (var waterLevel in calculation.InputParameters.WaterLevels) { Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, waterLevel), msgs[i++]); + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[i++]); Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i++]); } - Assert.AreEqual(string.Format("Berekening '{0}' voor zuilen beëindigd.", calculation.Name), msgs[14]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[15]); + Assert.AreEqual(string.Format("Berekening '{0}' voor zuilen beëindigd.", calculation.Name), msgs[18]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[19]); }); Assert.AreEqual(ActivityState.Executed, activity.State); } @@ -438,7 +440,7 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - Assert.AreEqual(16, msgs.Length); + Assert.AreEqual(20, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); @@ -450,21 +452,23 @@ foreach (var waterLevel in calculation.InputParameters.WaterLevels) { Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, waterLevel), msgs[i++]); + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[i++]); Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i++]); } - Assert.AreEqual(string.Format("Berekening '{0}' voor blokken beëindigd.", calculation.Name), msgs[8]); - Assert.AreEqual(string.Format("Berekening '{0}' voor zuilen gestart.", calculation.Name), msgs[9]); + Assert.AreEqual(string.Format("Berekening '{0}' voor blokken beëindigd.", calculation.Name), msgs[10]); + Assert.AreEqual(string.Format("Berekening '{0}' voor zuilen gestart.", calculation.Name), msgs[11]); - i = 10; + i = 12; foreach (var waterLevel in calculation.InputParameters.WaterLevels) { Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, waterLevel), msgs[i++]); + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[i++]); Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i++]); } - Assert.AreEqual(string.Format("Berekening '{0}' voor zuilen beëindigd.", calculation.Name), msgs[14]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[15]); + Assert.AreEqual(string.Format("Berekening '{0}' voor zuilen beëindigd.", calculation.Name), msgs[18]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[19]); }); Assert.AreEqual(ActivityState.Executed, activity.State); } @@ -605,15 +609,16 @@ string[] msgs = messages.ToArray(); RoundedDouble firstWaterLevel = calculation.InputParameters.WaterLevels.First(); - Assert.AreEqual(8, msgs.Length); + Assert.AreEqual(9, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]); Assert.AreEqual(string.Format("Berekening '{0}' voor blokken gestart.", calculation.Name), msgs[3]); Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, firstWaterLevel), msgs[4]); - Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, firstWaterLevel), msgs[5]); - Assert.AreEqual(string.Format("Berekening '{0}' voor blokken beëindigd.", calculation.Name), msgs[6]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[7]); + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[5]); + Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, firstWaterLevel), msgs[6]); + Assert.AreEqual(string.Format("Berekening '{0}' voor blokken beëindigd.", calculation.Name), msgs[7]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[8]); }); Assert.AreEqual(ActivityState.Canceled, activity.State); @@ -653,23 +658,27 @@ string[] msgs = messages.ToArray(); var waterLevels = calculation.InputParameters.WaterLevels.ToArray(); - Assert.AreEqual(16, msgs.Length); + Assert.AreEqual(20, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]); Assert.AreEqual(string.Format("Berekening '{0}' voor blokken gestart.", calculation.Name), msgs[3]); Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, waterLevels[0]), msgs[4]); - Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevels[0]), msgs[5]); - Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, waterLevels[1]), msgs[6]); - Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevels[1]), msgs[7]); - Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, waterLevels[2]), msgs[8]); - Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevels[2]), msgs[9]); - Assert.AreEqual(string.Format("Berekening '{0}' voor blokken beëindigd.", calculation.Name), msgs[10]); - Assert.AreEqual(string.Format("Berekening '{0}' voor zuilen gestart.", calculation.Name), msgs[11]); - Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, waterLevels[0]), msgs[12]); - Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevels[0]), msgs[13]); - Assert.AreEqual(string.Format("Berekening '{0}' voor zuilen beëindigd.", calculation.Name), msgs[14]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[15]); + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[5]); + Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevels[0]), msgs[6]); + Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, waterLevels[1]), msgs[7]); + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[8]); + Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevels[1]), msgs[9]); + Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, waterLevels[2]), msgs[10]); + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[11]); + Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevels[2]), msgs[12]); + Assert.AreEqual(string.Format("Berekening '{0}' voor blokken beëindigd.", calculation.Name), msgs[13]); + Assert.AreEqual(string.Format("Berekening '{0}' voor zuilen gestart.", calculation.Name), msgs[14]); + Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, waterLevels[0]), msgs[15]); + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[16]); + Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevels[0]), msgs[17]); + Assert.AreEqual(string.Format("Berekening '{0}' voor zuilen beëindigd.", calculation.Name), msgs[18]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[19]); }); Assert.AreEqual(ActivityState.Canceled, activity.State); Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r16cb360eae0014270ebb6700054afdbbd565ae65 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision 16cb360eae0014270ebb6700054afdbbd565ae65) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -254,7 +254,7 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - Assert.AreEqual(14, msgs.Length); + Assert.AreEqual(18, msgs.Length); StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[0]); @@ -264,21 +264,23 @@ foreach (var waterLevel in calculation.InputParameters.WaterLevels) { Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, waterLevel), msgs[i++]); + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[i++]); Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i++]); } - Assert.AreEqual(string.Format("Berekening '{0}' voor blokken beëindigd.", calculation.Name), msgs[6]); - Assert.AreEqual(string.Format("Berekening '{0}' voor zuilen gestart.", calculation.Name), msgs[7]); + Assert.AreEqual(string.Format("Berekening '{0}' voor blokken beëindigd.", calculation.Name), msgs[8]); + Assert.AreEqual(string.Format("Berekening '{0}' voor zuilen gestart.", calculation.Name), msgs[9]); - i = 8; + i = 10; foreach (var waterLevel in calculation.InputParameters.WaterLevels) { Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, waterLevel), msgs[i++]); + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[i++]); Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i++]); } - Assert.AreEqual(string.Format("Berekening '{0}' voor zuilen beëindigd.", calculation.Name), msgs[12]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[13]); + Assert.AreEqual(string.Format("Berekening '{0}' voor zuilen beëindigd.", calculation.Name), msgs[16]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[17]); }); } mockRepository.VerifyAll(); @@ -323,7 +325,7 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - Assert.AreEqual(14, msgs.Length); + Assert.AreEqual(18, msgs.Length); StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[0]); @@ -333,21 +335,23 @@ foreach (var waterLevel in calculation.InputParameters.WaterLevels) { Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, waterLevel), msgs[i++]); + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[i++]); Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i++]); } - Assert.AreEqual(string.Format("Berekening '{0}' voor blokken beëindigd.", calculation.Name), msgs[6]); - Assert.AreEqual(string.Format("Berekening '{0}' voor zuilen gestart.", calculation.Name), msgs[7]); + Assert.AreEqual(string.Format("Berekening '{0}' voor blokken beëindigd.", calculation.Name), msgs[8]); + Assert.AreEqual(string.Format("Berekening '{0}' voor zuilen gestart.", calculation.Name), msgs[9]); - i = 8; + i = 10; foreach (var waterLevel in calculation.InputParameters.WaterLevels) { Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, waterLevel), msgs[i++]); + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[i++]); Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i++]); } - Assert.AreEqual(string.Format("Berekening '{0}' voor zuilen beëindigd.", calculation.Name), msgs[12]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[13]); + Assert.AreEqual(string.Format("Berekening '{0}' voor zuilen beëindigd.", calculation.Name), msgs[16]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[17]); }); } mockRepository.VerifyAll(); Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -re674bb3e0b3e4f2e66080348b8e6acfa48137bb1 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision e674bb3e0b3e4f2e66080348b8e6acfa48137bb1) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -901,10 +901,10 @@ TestHelper.AssertLogMessages(call, logMessages => { var messages = logMessages.ToArray(); - Assert.AreEqual(11, messages.Length); + Assert.AreEqual(14, messages.Length); StringAssert.StartsWith("Berekening van 'A' gestart om: ", messages[2]); - StringAssert.StartsWith("Berekening van 'A' beëindigd om: ", messages[9]); - StringAssert.StartsWith("Uitvoeren van 'A' is gelukt.", messages[10]); + StringAssert.StartsWith("Berekening van 'A' beëindigd om: ", messages[12]); + StringAssert.StartsWith("Uitvoeren van 'A' is gelukt.", messages[13]); }); Assert.AreEqual(3, calculation.Output.Items.Count()); } Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -re674bb3e0b3e4f2e66080348b8e6acfa48137bb1 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision e674bb3e0b3e4f2e66080348b8e6acfa48137bb1) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -800,13 +800,13 @@ TestHelper.AssertLogMessages(test, m => { var messages = m.ToArray(); - Assert.AreEqual(22, messages.Length); + Assert.AreEqual(28, messages.Length); StringAssert.StartsWith("Berekening van 'Nieuwe berekening' gestart om: ", messages[2]); - StringAssert.StartsWith("Berekening van 'Nieuwe berekening' beëindigd om: ", messages[9]); - StringAssert.StartsWith("Berekening van 'Nieuwe berekening' gestart om: ", messages[12]); - StringAssert.StartsWith("Berekening van 'Nieuwe berekening' beëindigd om: ", messages[19]); - Assert.AreEqual("Uitvoeren van 'Nieuwe berekening' is gelukt.", messages[20]); - Assert.AreEqual("Uitvoeren van 'Nieuwe berekening' is gelukt.", messages[21]); + StringAssert.StartsWith("Berekening van 'Nieuwe berekening' beëindigd om: ", messages[12]); + StringAssert.StartsWith("Berekening van 'Nieuwe berekening' gestart om: ", messages[15]); + StringAssert.StartsWith("Berekening van 'Nieuwe berekening' beëindigd om: ", messages[25]); + Assert.AreEqual("Uitvoeren van 'Nieuwe berekening' is gelukt.", messages[26]); + Assert.AreEqual("Uitvoeren van 'Nieuwe berekening' is gelukt.", messages[27]); }); Assert.AreEqual(3, calculationA.Output.Items.Count()); Assert.AreEqual(3, calculationB.Output.Items.Count()); Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -re674bb3e0b3e4f2e66080348b8e6acfa48137bb1 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision e674bb3e0b3e4f2e66080348b8e6acfa48137bb1) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -327,7 +327,7 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - Assert.AreEqual(8, msgs.Length); + Assert.AreEqual(10, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); @@ -337,12 +337,13 @@ foreach (var waterLevel in calculation.InputParameters.WaterLevels) { Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, waterLevel), msgs[i + 1]); - Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i + 2]); + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[i + 2]); + Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i + 3]); - i = i + 2; + i = i + 3; } - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[7]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[9]); }); Assert.AreEqual(ActivityState.Executed, activity.State); } @@ -441,7 +442,7 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - Assert.AreEqual(8, msgs.Length); + Assert.AreEqual(10, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); @@ -451,12 +452,13 @@ foreach (var waterLevel in calculation.InputParameters.WaterLevels) { Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, waterLevel), msgs[i + 1]); - Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i + 2]); + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[i + 2]); + Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i + 3]); - i = i + 2; + i = i + 3; } - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[7]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[9]); }); Assert.AreEqual(ActivityState.Executed, activity.State); } @@ -573,13 +575,14 @@ string[] msgs = messages.ToArray(); RoundedDouble firstWaterLevel = calculation.InputParameters.WaterLevels.First(); - Assert.AreEqual(6, msgs.Length); + Assert.AreEqual(7, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]); Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, firstWaterLevel), msgs[3]); - Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, firstWaterLevel), msgs[4]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[5]); + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[4]); + Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, firstWaterLevel), msgs[5]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[6]); }); Assert.AreEqual(ActivityState.Canceled, activity.State); Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r16cb360eae0014270ebb6700054afdbbd565ae65 -rcc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision 16cb360eae0014270ebb6700054afdbbd565ae65) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision cc39748cdc122bfcc9bfb27e6e1ac9b7c558b5bf) @@ -266,20 +266,21 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - Assert.AreEqual(6, msgs.Length); + Assert.AreEqual(8, msgs.Length); StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[0]); int i = 0; foreach (var waterLevel in calculation.InputParameters.WaterLevels) { Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, waterLevel), msgs[i + 1]); - Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i + 2]); + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[i + 2]); + Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i + 3]); - i = i + 2; + i = i + 3; } - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[5]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[7]); }); } } @@ -325,20 +326,21 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - Assert.AreEqual(6, msgs.Length); + Assert.AreEqual(8, msgs.Length); StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[0]); int i = 0; foreach (var waterLevel in calculation.InputParameters.WaterLevels) { Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' gestart.", calculation.Name, waterLevel), msgs[i + 1]); - Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i + 2]); + StringAssert.StartsWith("Golfcondities berekeningsverslag. Klik op details voor meer informatie.", msgs[i + 2]); + Assert.AreEqual(string.Format("Berekening '{0}' voor waterstand '{1}' beëindigd.", calculation.Name, waterLevel), msgs[i + 3]); - i = i + 2; + i = i + 3; } - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[5]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[7]); }); } }