Index: Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.Designer.cs =================================================================== diff -u -re493ed352717714ee690dae7c4f168cc6df87b53 -rb6f3b68404cad00988843342f68022dc743e74c1 --- Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e493ed352717714ee690dae7c4f168cc6df87b53) +++ Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b6f3b68404cad00988843342f68022dc743e74c1) @@ -138,7 +138,7 @@ } /// - /// Looks up a localized string similar to Toetspeil berekening voor locatie '{0}' ({1}) is niet geconvergeerd.. + /// Looks up a localized string similar to Waterstand berekening voor locatie '{0}' ({1}) is niet geconvergeerd.. /// public static string DesignWaterLevelCalculationActivity_DesignWaterLevelCalculation_for_HydraulicBoundaryLocation_0_Category_1_not_converged { get { @@ -148,7 +148,7 @@ } /// - /// Looks up a localized string similar to Toetspeil berekening is uitgevoerd op de tijdelijke locatie '{0}'. Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.. + /// Looks up a localized string similar to Waterstand berekening is uitgevoerd op de tijdelijke locatie '{0}'. Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.. /// public static string DesignWaterLevelCalculationService_Calculate_Calculation_temporary_directory_can_be_found_on_location_0 { get { @@ -179,7 +179,7 @@ } /// - /// Looks up a localized string similar to Toetspeil berekenen voor locatie '{0}' ({1}). + /// Looks up a localized string similar to Waterstand berekenen voor locatie '{0}' ({1}). /// public static string DesignWaterLevelCalculationService_Name_Calculate_assessment_level_for_HydraulicBoundaryLocation_0_Category_1_ { get { Index: Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.resx =================================================================== diff -u -re493ed352717714ee690dae7c4f168cc6df87b53 -rb6f3b68404cad00988843342f68022dc743e74c1 --- Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.resx (.../Resources.resx) (revision e493ed352717714ee690dae7c4f168cc6df87b53) +++ Ringtoets/Common/src/Ringtoets.Common.Service/Properties/Resources.resx (.../Resources.resx) (revision b6f3b68404cad00988843342f68022dc743e74c1) @@ -136,10 +136,10 @@ Validatie is gestart. - Toetspeil berekening voor locatie '{0}' ({1}) is niet geconvergeerd. + Waterstand berekening voor locatie '{0}' ({1}) is niet geconvergeerd. - Toetspeil berekenen voor locatie '{0}' ({1}) + Waterstand berekenen voor locatie '{0}' ({1}) Herstellen van de verbinding met de hydraulische randvoorwaardendatabase is mislukt. {0} @@ -172,7 +172,7 @@ De waarde voor '{0}' moet een concreet getal zijn. - Toetspeil berekening is uitgevoerd op de tijdelijke locatie '{0}'. Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden. + Waterstand berekening is uitgevoerd op de tijdelijke locatie '{0}'. Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden. Golfhoogte berekening is uitgevoerd op de tijdelijke locatie '{0}'. Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden. Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs =================================================================== diff -u -r4c288b5894b926ba5fdd7f6222c813c19b9701b8 -rb6f3b68404cad00988843342f68022dc743e74c1 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs (.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs) (revision 4c288b5894b926ba5fdd7f6222c813c19b9701b8) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs (.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs) (revision b6f3b68404cad00988843342f68022dc743e74c1) @@ -238,7 +238,7 @@ CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]); CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[3]); Assert.AreEqual(calculatedNotConvergedMessage, msgs[4]); - StringAssert.StartsWith("Toetspeil berekening is uitgevoerd op de tijdelijke locatie", msgs[5]); + StringAssert.StartsWith("Waterstand berekening is uitgevoerd op de tijdelijke locatie", msgs[5]); CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[6]); StringAssert.AreNotEqualIgnoringCase($"Uitvoeren van '{calculationName}' is gelukt.", msgs[7]); }); Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/HydraulicBoundaryCalculationActivityHelperTest.cs =================================================================== diff -u -r4c288b5894b926ba5fdd7f6222c813c19b9701b8 -rb6f3b68404cad00988843342f68022dc743e74c1 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/HydraulicBoundaryCalculationActivityHelperTest.cs (.../HydraulicBoundaryCalculationActivityHelperTest.cs) (revision 4c288b5894b926ba5fdd7f6222c813c19b9701b8) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/HydraulicBoundaryCalculationActivityHelperTest.cs (.../HydraulicBoundaryCalculationActivityHelperTest.cs) (revision b6f3b68404cad00988843342f68022dc743e74c1) @@ -240,7 +240,7 @@ CalculationServiceTestHelper.AssertValidationStartMessage(messages[1]); CalculationServiceTestHelper.AssertValidationEndMessage(messages[2]); CalculationServiceTestHelper.AssertCalculationStartMessage(messages[3]); - StringAssert.StartsWith("Toetspeil berekening is uitgevoerd op de tijdelijke locatie", messages[4]); + StringAssert.StartsWith("Waterstand berekening is uitgevoerd op de tijdelijke locatie", messages[4]); CalculationServiceTestHelper.AssertCalculationEndMessage(messages[5]); }); AssessmentLevelCalculationInput assessmentLevelCalculationInput = calculator.ReceivedInputs.Single(); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs =================================================================== diff -u -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 -rb6f3b68404cad00988843342f68022dc743e74c1 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision b6f3b68404cad00988843342f68022dc743e74c1) @@ -244,7 +244,7 @@ CalculationServiceTestHelper.AssertValidationStartMessage(messages[1]); CalculationServiceTestHelper.AssertValidationEndMessage(messages[2]); CalculationServiceTestHelper.AssertCalculationStartMessage(messages[3]); - StringAssert.StartsWith("Toetspeil berekening is uitgevoerd op de tijdelijke locatie", messages[4]); + StringAssert.StartsWith("Waterstand berekening is uitgevoerd op de tijdelijke locatie", messages[4]); CalculationServiceTestHelper.AssertCalculationEndMessage(messages[5]); }); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs =================================================================== diff -u -r25af784999b04dc8156272632e7f6c638c55a18c -rb6f3b68404cad00988843342f68022dc743e74c1 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision 25af784999b04dc8156272632e7f6c638c55a18c) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision b6f3b68404cad00988843342f68022dc743e74c1) @@ -215,7 +215,7 @@ string[] msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]); - Assert.AreEqual($"Toetspeil berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " + + Assert.AreEqual($"Waterstand berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " + "Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.", msgs[1]); CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[2]); }); @@ -320,7 +320,7 @@ Assert.AreEqual(4, msgs.Length); CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]); Assert.AreEqual(failedConvergenceMessage, msgs[1]); - Assert.AreEqual($"Toetspeil berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " + + Assert.AreEqual($"Waterstand berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " + "Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.", msgs[2]); CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]); }); @@ -379,7 +379,7 @@ CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]); Assert.AreEqual("Het uitlezen van illustratiepunten is mislukt.", msgs[1]); - Assert.AreEqual($"Toetspeil berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " + + Assert.AreEqual($"Waterstand berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " + "Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.", msgs[2]); CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]); @@ -440,7 +440,7 @@ Assert.AreEqual($"Fout bij het uitlezen van de illustratiepunten voor berekening {locationName}: " + "Een of meerdere stochasten hebben dezelfde naam. " + "Het uitlezen van illustratiepunten wordt overgeslagen.", msgs[1]); - Assert.AreEqual($"Toetspeil berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " + + Assert.AreEqual($"Waterstand berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " + "Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.", msgs[2]); CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]); }); @@ -534,7 +534,7 @@ Assert.AreEqual(4, msgs.Length); CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]); Assert.AreEqual(parserErrorMessage, msgs[1]); - Assert.AreEqual($"Toetspeil berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " + + Assert.AreEqual($"Waterstand berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " + "Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.", msgs[2]); CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]); }); @@ -578,7 +578,7 @@ string[] msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]); - Assert.AreEqual($"Toetspeil berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " + + Assert.AreEqual($"Waterstand berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " + "Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.", msgs[1]); CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[2]); }); @@ -688,7 +688,7 @@ Assert.AreEqual(4, msgs.Length); CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]); Assert.AreEqual(calculationFailedMessage, msgs[1]); - Assert.AreEqual($"Toetspeil berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " + + Assert.AreEqual($"Waterstand berekening is uitgevoerd op de tijdelijke locatie '{calculator.OutputDirectory}'. " + "Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.", msgs[2]); CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[3]); }); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/MessageProviders/DesignWaterLevelCalculationMessageProviderTest.cs =================================================================== diff -u -rd3b14a0f327184e0239e5239c826805c565fe8be -rb6f3b68404cad00988843342f68022dc743e74c1 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/MessageProviders/DesignWaterLevelCalculationMessageProviderTest.cs (.../DesignWaterLevelCalculationMessageProviderTest.cs) (revision d3b14a0f327184e0239e5239c826805c565fe8be) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/MessageProviders/DesignWaterLevelCalculationMessageProviderTest.cs (.../DesignWaterLevelCalculationMessageProviderTest.cs) (revision b6f3b68404cad00988843342f68022dc743e74c1) @@ -74,7 +74,7 @@ string activityDescription = provider.GetActivityDescription(name); // Assert - string expectedName = $"Toetspeil berekenen voor locatie '{name}' ({categoryBoundaryName})"; + string expectedName = $"Waterstand berekenen voor locatie '{name}' ({categoryBoundaryName})"; Assert.AreEqual(expectedName, activityDescription); } @@ -151,7 +151,7 @@ string message = provider.GetCalculatedNotConvergedMessage(name); // Assert - string expectedMessage = $"Toetspeil berekening voor locatie '{name}' ({categoryBoundaryName}) is niet geconvergeerd."; + string expectedMessage = $"Waterstand berekening voor locatie '{name}' ({categoryBoundaryName}) is niet geconvergeerd."; Assert.AreEqual(expectedMessage, message); } } Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs =================================================================== diff -u -rf524b7c173a54c449e623613059c27a66672a3ba -rb6f3b68404cad00988843342f68022dc743e74c1 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs) (revision f524b7c173a54c449e623613059c27a66672a3ba) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs) (revision b6f3b68404cad00988843342f68022dc743e74c1) @@ -26,10 +26,10 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Forms.Views; +using Ringtoets.Common.Service.MessageProviders; using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects; using Ringtoets.GrassCoverErosionOutwards.Forms.Properties; -using Ringtoets.GrassCoverErosionOutwards.Service.MessageProviders; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.GrassCoverErosionOutwards.Forms.Views @@ -39,7 +39,7 @@ /// public class GrassCoverErosionOutwardsDesignWaterLevelCalculationsView : HydraulicBoundaryCalculationsView { - private readonly GrassCoverErosionOutwardsDesignWaterLevelCalculationMessageProvider messageProvider; + private readonly DesignWaterLevelCalculationMessageProvider messageProvider; private readonly Observer failureMechanismObserver; private readonly Func getNormFunc; @@ -50,11 +50,15 @@ /// The failure mechanism that the calculations belong to. /// The assessment section that the calculations belong to. /// for getting the norm to derive a mechanism specific norm from. - /// Thrown when any input parameter is null. + /// The name of the category boundary. + /// Thrown when , , + /// or is null. + /// Thrown when is null or empty. public GrassCoverErosionOutwardsDesignWaterLevelCalculationsView(IObservableEnumerable calculations, GrassCoverErosionOutwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection, - Func getNormFunc) + Func getNormFunc, + string categoryBoundaryName) : base(calculations, assessmentSection) { if (failureMechanism == null) @@ -68,7 +72,7 @@ } FailureMechanism = failureMechanism; - messageProvider = new GrassCoverErosionOutwardsDesignWaterLevelCalculationMessageProvider(); + messageProvider = new DesignWaterLevelCalculationMessageProvider(categoryBoundaryName); failureMechanismObserver = new Observer(UpdateCalculateForSelectedButton) { Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightCalculationsView.cs =================================================================== diff -u -r8b013118f28fcc57054216f614fe556ee72d9eeb -rb6f3b68404cad00988843342f68022dc743e74c1 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightCalculationsView.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsView.cs) (revision 8b013118f28fcc57054216f614fe556ee72d9eeb) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightCalculationsView.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsView.cs) (revision b6f3b68404cad00988843342f68022dc743e74c1) @@ -26,10 +26,10 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Forms.Views; +using Ringtoets.Common.Service.MessageProviders; using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects; using Ringtoets.GrassCoverErosionOutwards.Forms.Properties; -using Ringtoets.GrassCoverErosionOutwards.Service.MessageProviders; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.GrassCoverErosionOutwards.Forms.Views @@ -39,7 +39,7 @@ /// public class GrassCoverErosionOutwardsWaveHeightCalculationsView : HydraulicBoundaryCalculationsView { - private readonly GrassCoverErosionOutwardsWaveHeightCalculationMessageProvider messageProvider; + private readonly WaveHeightCalculationMessageProvider messageProvider; private readonly Observer failureMechanismObserver; private readonly Func getNormFunc; @@ -50,11 +50,15 @@ /// The failure mechanism that the calculations belong to. /// The assessment section that the calculations belong to. /// for getting the norm to derive a mechanism specific norm from. - /// Thrown when any input parameter is null. + /// The name of the category boundary. + /// Thrown when , , + /// or is null. + /// Thrown when is null or empty. public GrassCoverErosionOutwardsWaveHeightCalculationsView(IObservableEnumerable calculations, GrassCoverErosionOutwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection, - Func getNormFunc) + Func getNormFunc, + string categoryBoundaryName) : base(calculations, assessmentSection) { if (failureMechanism == null) @@ -68,7 +72,7 @@ } FailureMechanism = failureMechanism; - messageProvider = new GrassCoverErosionOutwardsWaveHeightCalculationMessageProvider(); + messageProvider = new WaveHeightCalculationMessageProvider(categoryBoundaryName); failureMechanismObserver = new Observer(UpdateCalculateForSelectedButton) { Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -r0a4dbdf6c5cf212aa86bddc821e81fbf1b1bcf1e -rb6f3b68404cad00988843342f68022dc743e74c1 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 0a4dbdf6c5cf212aa86bddc821e81fbf1b1bcf1e) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision b6f3b68404cad00988843342f68022dc743e74c1) @@ -45,6 +45,7 @@ using Ringtoets.Common.Forms.TreeNodeInfos; using Ringtoets.Common.Plugin; using Ringtoets.Common.Service; +using Ringtoets.Common.Service.MessageProviders; using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.GrassCoverErosionOutwards.Forms; using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects; @@ -53,7 +54,6 @@ using Ringtoets.GrassCoverErosionOutwards.IO.Exporters; using Ringtoets.GrassCoverErosionOutwards.Plugin.Properties; using Ringtoets.GrassCoverErosionOutwards.Service; -using Ringtoets.GrassCoverErosionOutwards.Service.MessageProviders; using Ringtoets.Revetment.Data; using Ringtoets.Revetment.Forms.Views; using Ringtoets.Revetment.IO.Configurations; @@ -159,7 +159,8 @@ CreateInstance = context => new GrassCoverErosionOutwardsDesignWaterLevelCalculationsView(context.WrappedData, context.FailureMechanism, context.AssessmentSection, - context.GetNormFunc), + context.GetNormFunc, + context.CategoryBoundaryName), AfterCreate = (view, context) => { view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService; }, CloseForData = (view, data) => CloseHydraulicBoundaryCalculationsViewForData(view.AssessmentSection, data) }; @@ -175,7 +176,8 @@ CreateInstance = context => new GrassCoverErosionOutwardsWaveHeightCalculationsView(context.WrappedData, context.FailureMechanism, context.AssessmentSection, - context.GetNormFunc), + context.GetNormFunc, + context.CategoryBoundaryName), AfterCreate = (view, context) => { view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService; }, CloseForData = (view, data) => CloseHydraulicBoundaryCalculationsViewForData(view.AssessmentSection, data) }; @@ -544,7 +546,9 @@ #region GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext TreeNodeInfo - private ContextMenuStrip GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextMenuStrip(GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext nodeData, object parentData, TreeViewControl treeViewControl) + private ContextMenuStrip GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextMenuStrip(GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext nodeData, + object parentData, + TreeViewControl treeViewControl) { var designWaterLevelItem = new StrictContextMenuItem( RingtoetsGrassCoverErosionOutwardsFormsResources.GrassCoverErosionOutwardsWaterLevelLocation_Calculate_All, @@ -564,7 +568,7 @@ assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(), nodeData.WrappedData, nodeData.GetNormFunc(), - new GrassCoverErosionOutwardsDesignWaterLevelCalculationMessageProvider()); + new DesignWaterLevelCalculationMessageProvider(nodeData.CategoryBoundaryName)); }); string validationText = ValidateAllDataAvailableAndGetErrorMessage(nodeData.AssessmentSection, nodeData.FailureMechanism); @@ -590,7 +594,7 @@ private ContextMenuStrip GrassCoverErosionOutwardsWaveHeightCalculationsContextMenuStrip(GrassCoverErosionOutwardsWaveHeightCalculationsContext nodeData, object parentData, TreeViewControl treeViewControl) { var waveHeightItem = new StrictContextMenuItem( - RingtoetsCommonFormsResources.Calculate_all, + RingtoetsCommonFormsResources.Calculate_All, RingtoetsGrassCoverErosionOutwardsFormsResources.GrassCoverErosionOutwards_WaveHeight_Calculate_All_ToolTip, RingtoetsCommonFormsResources.CalculateAllIcon, (sender, args) => @@ -612,7 +616,7 @@ assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(), nodeData.WrappedData, nodeData.GetNormFunc(), - new GrassCoverErosionOutwardsWaveHeightCalculationMessageProvider()); + new WaveHeightCalculationMessageProvider(nodeData.CategoryBoundaryName)); }); string validationText = ValidateAllDataAvailableAndGetErrorMessage(nodeData.AssessmentSection, nodeData.FailureMechanism); @@ -979,7 +983,66 @@ private ContextMenuStrip GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextMenuStrip( GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContext nodeData, object parentData, TreeViewControl treeViewControl) { + IAssessmentSection assessmentSection = nodeData.AssessmentSection; + GrassCoverErosionOutwardsFailureMechanism failureMechanism = nodeData.FailureMechanism; + + var waveHeightItem = new StrictContextMenuItem( + RingtoetsCommonFormsResources.Calculate_All, + RingtoetsCommonFormsResources.Calculate_All_ToolTip, + RingtoetsCommonFormsResources.CalculateAllIcon, + (sender, args) => + { + if (hydraulicBoundaryLocationCalculationGuiService == null) + { + return; + } + + string hydraulicBoundaryDatabaseFilePath = assessmentSection.HydraulicBoundaryDatabase.FilePath; + string preprocessorDirectory = assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(); + var calculations = new List(); + calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities( + hydraulicBoundaryDatabaseFilePath, + preprocessorDirectory, + failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm, + failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm), + new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonPluginResources.Hydraulic_category_boundary_mechanismSpecificFactorizedSignalingNorm_name))); + + calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities( + hydraulicBoundaryDatabaseFilePath, + preprocessorDirectory, + failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm, + failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificSignalingNorm), + new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonPluginResources.Hydraulic_category_boundary_mechanismSpecificSignalingNorm_name))); + + calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities( + hydraulicBoundaryDatabaseFilePath, + preprocessorDirectory, + failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm, + failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm), + new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonPluginResources.Hydraulic_category_boundary_mechanismSpecificLowerLimitNorm_name))); + + calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities( + hydraulicBoundaryDatabaseFilePath, + preprocessorDirectory, + assessmentSection.WaterLevelCalculationsForLowerLimitNorm, + failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.LowerLimitNorm), + new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonPluginResources.Hydraulic_category_boundary_lowerLimitNorm_name))); + + calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities( + hydraulicBoundaryDatabaseFilePath, + preprocessorDirectory, + assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, + failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.FactorizedLowerLimitNorm), + new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonPluginResources.Hydraulic_category_boundary_factorizedLowerLimitNorm_name))); + + hydraulicBoundaryLocationCalculationGuiService.RunActivities(hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, calculations); + }); + + SetHydraulicsMenuItemEnabledStateAndTooltip(assessmentSection, waveHeightItem); + return Gui.Get(nodeData, treeViewControl) + .AddCustomItem(waveHeightItem) + .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() .Build(); @@ -1029,7 +1092,66 @@ private ContextMenuStrip GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextMenuStrip( GrassCoverErosionOutwardsWaveHeightCalculationsGroupContext nodeData, object parentData, TreeViewControl treeViewControl) { + IAssessmentSection assessmentSection = nodeData.AssessmentSection; + GrassCoverErosionOutwardsFailureMechanism failureMechanism = nodeData.FailureMechanism; + + var waveHeightItem = new StrictContextMenuItem( + RingtoetsCommonFormsResources.Calculate_All, + RingtoetsCommonFormsResources.Calculate_All_ToolTip, + RingtoetsCommonFormsResources.CalculateAllIcon, + (sender, args) => + { + if (hydraulicBoundaryLocationCalculationGuiService == null) + { + return; + } + + string hydraulicBoundaryDatabaseFilePath = assessmentSection.HydraulicBoundaryDatabase.FilePath; + string preprocessorDirectory = assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(); + var calculations = new List(); + calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities( + hydraulicBoundaryDatabaseFilePath, + preprocessorDirectory, + failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm, + failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm), + new WaveHeightCalculationMessageProvider(RingtoetsCommonPluginResources.Hydraulic_category_boundary_mechanismSpecificFactorizedSignalingNorm_name))); + + calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities( + hydraulicBoundaryDatabaseFilePath, + preprocessorDirectory, + failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm, + failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificSignalingNorm), + new WaveHeightCalculationMessageProvider(RingtoetsCommonPluginResources.Hydraulic_category_boundary_mechanismSpecificSignalingNorm_name))); + + calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities( + hydraulicBoundaryDatabaseFilePath, + preprocessorDirectory, + failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm, + failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm), + new WaveHeightCalculationMessageProvider(RingtoetsCommonPluginResources.Hydraulic_category_boundary_mechanismSpecificLowerLimitNorm_name))); + + calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities( + hydraulicBoundaryDatabaseFilePath, + preprocessorDirectory, + assessmentSection.WaveHeightCalculationsForLowerLimitNorm, + failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.LowerLimitNorm), + new WaveHeightCalculationMessageProvider(RingtoetsCommonPluginResources.Hydraulic_category_boundary_lowerLimitNorm_name))); + + calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities( + hydraulicBoundaryDatabaseFilePath, + preprocessorDirectory, + assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, + failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.FactorizedLowerLimitNorm), + new WaveHeightCalculationMessageProvider(RingtoetsCommonPluginResources.Hydraulic_category_boundary_factorizedLowerLimitNorm_name))); + + hydraulicBoundaryLocationCalculationGuiService.RunActivities(hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, calculations); + }); + + SetHydraulicsMenuItemEnabledStateAndTooltip(assessmentSection, waveHeightItem); + return Gui.Get(nodeData, treeViewControl) + .AddCustomItem(waveHeightItem) + .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() .Build(); @@ -1074,6 +1196,16 @@ #endregion + private static void SetHydraulicsMenuItemEnabledStateAndTooltip(IAssessmentSection assessmentSection, StrictContextMenuItem menuItem) + { + string validationText = HydraulicBoundaryDatabaseConnectionValidator.Validate(assessmentSection.HydraulicBoundaryDatabase); + if (!string.IsNullOrEmpty(validationText)) + { + menuItem.Enabled = false; + menuItem.ToolTipText = validationText; + } + } + #endregion } } \ No newline at end of file Fisheye: Tag b6f3b68404cad00988843342f68022dc743e74c1 refers to a dead (removed) revision in file `Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/MessageProviders/GrassCoverErosionOutwardsDesignWaterLevelCalculationMessageProvider.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6f3b68404cad00988843342f68022dc743e74c1 refers to a dead (removed) revision in file `Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/MessageProviders/GrassCoverErosionOutwardsWaveHeightCalculationMessageProvider.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/Properties/Resources.Designer.cs =================================================================== diff -u -r42589a013431937bdf0165af5fda1228d235629a -rb6f3b68404cad00988843342f68022dc743e74c1 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 42589a013431937bdf0165af5fda1228d235629a) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b6f3b68404cad00988843342f68022dc743e74c1) @@ -40,7 +40,7 @@ // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { @@ -82,48 +82,6 @@ } /// - /// Looks up a localized string similar to Er is een fout opgetreden tijdens de Waterstand bij doorsnede-eis berekening '{0}'. Bekijk het foutrapport door op details te klikken. - ///{1}. - /// - public static string GrassCoverErosionOutwardsPlugin_Calculate_Error_in_DesignWaterLevelCalculation_0_click_details_for_last_error_report_1 { - get { - return ResourceManager.GetString("GrassCoverErosionOutwardsPlugin_Calculate_Error_in_DesignWaterLevelCalculation_0_" + - "click_details_for_last_error_report_1", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Er is een fout opgetreden tijdens de Waterstand bij doorsnede-eis berekening '{0}'. Er is geen foutrapport beschikbaar.. - /// - public static string GrassCoverErosionOutwardsPlugin_Calculate_Error_in_DesignWaterLevelCalculation_0_no_error_report { - get { - return ResourceManager.GetString("GrassCoverErosionOutwardsPlugin_Calculate_Error_in_DesignWaterLevelCalculation_0_" + - "no_error_report", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Er is een fout opgetreden tijdens de Golfhoogte bij doorsnede-eis berekening '{0}'. Bekijk het foutrapport door op details te klikken. - ///{1}. - /// - public static string GrassCoverErosionOutwardsPlugin_Calculate_Error_in_WaveHeightCalculation_0_click_details_for_last_error_report_1 { - get { - return ResourceManager.GetString("GrassCoverErosionOutwardsPlugin_Calculate_Error_in_WaveHeightCalculation_0_click_" + - "details_for_last_error_report_1", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Er is een fout opgetreden tijdens de Golfhoogte bij doorsnede-eis berekening '{0}'. Er is geen foutrapport beschikbaar.. - /// - public static string GrassCoverErosionOutwardsPlugin_Calculate_Error_in_WaveHeightCalculation_0_no_error_report { - get { - return ResourceManager.GetString("GrassCoverErosionOutwardsPlugin_Calculate_Error_in_WaveHeightCalculation_0_no_err" + - "or_report", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Waterstand bij doorsnede-eis berekening voor locatie '{0}' is niet geconvergeerd.. /// public static string GrassCoverErosionOutwardsPlugin_DesignWaterLevelCalculation_for_HydraulicBoundaryLocation_0_not_converged { Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/Properties/Resources.resx =================================================================== diff -u -r42589a013431937bdf0165af5fda1228d235629a -rb6f3b68404cad00988843342f68022dc743e74c1 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/Properties/Resources.resx (.../Resources.resx) (revision 42589a013431937bdf0165af5fda1228d235629a) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/Properties/Resources.resx (.../Resources.resx) (revision b6f3b68404cad00988843342f68022dc743e74c1) @@ -117,20 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Er is een fout opgetreden tijdens de Waterstand bij doorsnede-eis berekening '{0}'. Bekijk het foutrapport door op details te klikken. -{1} - - - Er is een fout opgetreden tijdens de Waterstand bij doorsnede-eis berekening '{0}'. Er is geen foutrapport beschikbaar. - - - Er is een fout opgetreden tijdens de Golfhoogte bij doorsnede-eis berekening '{0}'. Bekijk het foutrapport door op details te klikken. -{1} - - - Er is een fout opgetreden tijdens de Golfhoogte bij doorsnede-eis berekening '{0}'. Er is geen foutrapport beschikbaar. - Waterstand bij doorsnede-eis berekening voor locatie '{0}' is niet geconvergeerd. Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/Ringtoets.GrassCoverErosionOutwards.Service.csproj =================================================================== diff -u -r893ae543428122bb3679f721754f6a7078c74a06 -rb6f3b68404cad00988843342f68022dc743e74c1 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/Ringtoets.GrassCoverErosionOutwards.Service.csproj (.../Ringtoets.GrassCoverErosionOutwards.Service.csproj) (revision 893ae543428122bb3679f721754f6a7078c74a06) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/Ringtoets.GrassCoverErosionOutwards.Service.csproj (.../Ringtoets.GrassCoverErosionOutwards.Service.csproj) (revision b6f3b68404cad00988843342f68022dc743e74c1) @@ -13,8 +13,6 @@ - - Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs =================================================================== diff -u -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 -rb6f3b68404cad00988843342f68022dc743e74c1 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs) (revision b6f3b68404cad00988843342f68022dc743e74c1) @@ -44,7 +44,6 @@ using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects; using Ringtoets.GrassCoverErosionOutwards.Forms.Views; -using Ringtoets.GrassCoverErosionOutwards.Service.MessageProviders; namespace Ringtoets.GrassCoverErosionOutwards.Forms.Test.Views { @@ -86,7 +85,8 @@ using (var view = new GrassCoverErosionOutwardsDesignWaterLevelCalculationsView(new ObservableList(), new GrassCoverErosionOutwardsFailureMechanism(), assessmentSection, - () => 0.01)) + () => 0.01, + "Category")) { // Assert Assert.IsInstanceOf(view); @@ -105,7 +105,8 @@ TestDelegate call = () => new GrassCoverErosionOutwardsDesignWaterLevelCalculationsView(new ObservableList(), null, assessmentSection, - () => 0.01); + () => 0.01, + "Category"); // Assert var exception = Assert.Throws(call); @@ -123,7 +124,8 @@ TestDelegate call = () => new GrassCoverErosionOutwardsDesignWaterLevelCalculationsView(new ObservableList(), new GrassCoverErosionOutwardsFailureMechanism(), assessmentSection, - null); + null, + "Category"); // Assert var exception = Assert.Throws(call); @@ -138,7 +140,7 @@ mockRepository.ReplayAll(); // Call - ShowDesignWaterLevelCalculationsView(new ObservableList(), assessmentSection, 0.01, testForm); + ShowDesignWaterLevelCalculationsView(new ObservableList(), assessmentSection, 0.01, "Category", testForm); // Assert DataGridView calculationsDataGridView = GetCalculationsDataGridView(); @@ -227,7 +229,7 @@ ObservableList calculations = GetTestHydraulicBoundaryLocationCalculations(); - ShowDesignWaterLevelCalculationsView(calculations, assessmentSection, 0.01, testForm); + ShowDesignWaterLevelCalculationsView(calculations, assessmentSection, 0.01, "Category", testForm); // Precondition DataGridView calculationsDataGridView = GetCalculationsDataGridView(); @@ -274,7 +276,7 @@ ObservableList calculations = GetTestHydraulicBoundaryLocationCalculations(); - ShowDesignWaterLevelCalculationsView(calculations, assessmentSection, 0.01, testForm); + ShowDesignWaterLevelCalculationsView(calculations, assessmentSection, 0.01, "Category", testForm); IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl(); DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl(); @@ -322,7 +324,7 @@ ObservableList calculations = GetTestHydraulicBoundaryLocationCalculations(); - GrassCoverErosionOutwardsDesignWaterLevelCalculationsView view = ShowDesignWaterLevelCalculationsView(calculations, assessmentSection, 0.01, testForm); + GrassCoverErosionOutwardsDesignWaterLevelCalculationsView view = ShowDesignWaterLevelCalculationsView(calculations, assessmentSection, 0.01, "Category", testForm); DataGridView calculationsDataGridView = GetCalculationsDataGridView(); object dataGridViewSource = calculationsDataGridView.DataSource; DataGridViewRowCollection rows = calculationsDataGridView.Rows; @@ -406,6 +408,7 @@ // Setup const string databaseFilePath = "DatabaseFilePath"; const double norm = 0.01; + const string categoryBoundaryName = "Category"; IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mockRepository); assessmentSection.Stub(a => a.Id).Return(string.Empty); @@ -437,7 +440,11 @@ ObservableList calculations = GetTestHydraulicBoundaryLocationCalculations(); - GrassCoverErosionOutwardsDesignWaterLevelCalculationsView view = ShowDesignWaterLevelCalculationsView(calculations, assessmentSection, norm, testForm); + GrassCoverErosionOutwardsDesignWaterLevelCalculationsView view = ShowDesignWaterLevelCalculationsView(calculations, + assessmentSection, + norm, + categoryBoundaryName, + testForm); DataGridView calculationsDataGridView = GetCalculationsDataGridView(); DataGridViewRowCollection rows = calculationsDataGridView.Rows; rows[0].Cells[calculateColumnIndex].Value = true; @@ -449,7 +456,9 @@ button.Click(); // Assert - Assert.IsInstanceOf(messageProviderValue); + Assert.IsInstanceOf(messageProviderValue); + Assert.AreEqual($"Waterstand berekenen voor locatie 'Location name' ({categoryBoundaryName})", + messageProviderValue.GetActivityDescription("Location name")); Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue); Assert.AreEqual("", preprocessorDirectoryValue); Assert.AreEqual(norm, normValue); @@ -464,6 +473,7 @@ const string databaseFilePath = "DatabaseFilePath"; string preprocessorDirectory = TestHelper.GetScratchPadPath(); const double norm = 0.01; + const string categoryBoundaryName = "Category"; IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mockRepository); assessmentSection.Stub(a => a.Id).Return(string.Empty); @@ -499,7 +509,11 @@ ObservableList calculations = GetTestHydraulicBoundaryLocationCalculations(); - GrassCoverErosionOutwardsDesignWaterLevelCalculationsView view = ShowDesignWaterLevelCalculationsView(calculations, assessmentSection, norm, testForm); + GrassCoverErosionOutwardsDesignWaterLevelCalculationsView view = ShowDesignWaterLevelCalculationsView(calculations, + assessmentSection, + norm, + categoryBoundaryName, + testForm); DataGridView calculationsDataGridView = GetCalculationsDataGridView(); DataGridViewRowCollection rows = calculationsDataGridView.Rows; rows[0].Cells[calculateColumnIndex].Value = true; @@ -511,7 +525,9 @@ button.Click(); // Assert - Assert.IsInstanceOf(messageProviderValue); + Assert.IsInstanceOf(messageProviderValue); + Assert.AreEqual($"Waterstand berekenen voor locatie 'Location name' ({categoryBoundaryName})", + messageProviderValue.GetActivityDescription("Location name")); Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue); Assert.AreEqual(preprocessorDirectory, preprocessorDirectoryValue); Assert.AreEqual(norm, normValue); @@ -525,6 +541,7 @@ // Setup const string databaseFilePath = "DatabaseFilePath"; const double norm = 0.01; + const string categoryBoundaryName = "Category"; IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mockRepository); assessmentSection.Stub(a => a.Id).Return(string.Empty); @@ -560,7 +577,11 @@ ObservableList calculations = GetTestHydraulicBoundaryLocationCalculations(); - GrassCoverErosionOutwardsDesignWaterLevelCalculationsView view = ShowDesignWaterLevelCalculationsView(calculations, assessmentSection, norm, testForm); + GrassCoverErosionOutwardsDesignWaterLevelCalculationsView view = ShowDesignWaterLevelCalculationsView(calculations, + assessmentSection, + norm, + categoryBoundaryName, + testForm); DataGridView calculationsDataGridView = GetCalculationsDataGridView(); DataGridViewRowCollection rows = calculationsDataGridView.Rows; rows[0].Cells[calculateColumnIndex].Value = true; @@ -572,7 +593,9 @@ button.Click(); // Assert - Assert.IsInstanceOf(messageProviderValue); + Assert.IsInstanceOf(messageProviderValue); + Assert.AreEqual($"Waterstand berekenen voor locatie 'Location name' ({categoryBoundaryName})", + messageProviderValue.GetActivityDescription("Location name")); Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue); Assert.AreEqual("", preprocessorDirectoryValue); Assert.AreEqual(norm, normValue); @@ -610,9 +633,10 @@ }); } - private static GrassCoverErosionOutwardsDesignWaterLevelCalculationsView ShowDesignWaterLevelCalculationsView(ObservableList calculations, + private static GrassCoverErosionOutwardsDesignWaterLevelCalculationsView ShowDesignWaterLevelCalculationsView(IObservableEnumerable calculations, IAssessmentSection assessmentSection, double norm, + string categoryName, Form form) { var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism @@ -623,7 +647,8 @@ var view = new GrassCoverErosionOutwardsDesignWaterLevelCalculationsView(calculations, failureMechanism, assessmentSection, - () => norm); + () => norm, + categoryName); form.Controls.Add(view); form.Show(); @@ -634,7 +659,7 @@ private static GrassCoverErosionOutwardsDesignWaterLevelCalculationsView ShowFullyConfiguredDesignWaterLevelCalculationsView(IAssessmentSection assessmentSection, Form form) { - return ShowDesignWaterLevelCalculationsView(GetTestHydraulicBoundaryLocationCalculations(), assessmentSection, 0.01, form); + return ShowDesignWaterLevelCalculationsView(GetTestHydraulicBoundaryLocationCalculations(), assessmentSection, 0.01, "Category", form); } private static ObservableList GetTestHydraulicBoundaryLocationCalculations() @@ -703,7 +728,7 @@ protected override CalculationsView ShowFullyConfiguredCalculationsView(Form form) { - return ShowDesignWaterLevelCalculationsView(calculations, new AssessmentSectionStub(), 0.01, form); + return ShowDesignWaterLevelCalculationsView(calculations, new AssessmentSectionStub(), 0.01, "Category", form); } protected override ObservableList GetCalculationsInView(CalculationsView view) Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs =================================================================== diff -u -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 -rb6f3b68404cad00988843342f68022dc743e74c1 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs) (revision b6f3b68404cad00988843342f68022dc743e74c1) @@ -44,7 +44,6 @@ using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects; using Ringtoets.GrassCoverErosionOutwards.Forms.Views; -using Ringtoets.GrassCoverErosionOutwards.Service.MessageProviders; namespace Ringtoets.GrassCoverErosionOutwards.Forms.Test.Views { @@ -86,7 +85,8 @@ using (var view = new GrassCoverErosionOutwardsWaveHeightCalculationsView(new ObservableList(), new GrassCoverErosionOutwardsFailureMechanism(), assessmentSection, - () => 0.01)) + () => 0.01, + "Category")) { // Assert Assert.IsInstanceOf(view); @@ -105,7 +105,8 @@ TestDelegate call = () => new GrassCoverErosionOutwardsWaveHeightCalculationsView(new ObservableList(), null, assessmentSection, - () => 0.01); + () => 0.01, + "Category"); // Assert var exception = Assert.Throws(call); @@ -123,7 +124,8 @@ TestDelegate call = () => new GrassCoverErosionOutwardsWaveHeightCalculationsView(new ObservableList(), new GrassCoverErosionOutwardsFailureMechanism(), assessmentSection, - null); + null, + "Category"); // Assert var exception = Assert.Throws(call); @@ -138,7 +140,7 @@ mockRepository.ReplayAll(); // Call - ShowWaveHeightCalculationsView(new ObservableList(), assessmentSection, 0.01, testForm); + ShowWaveHeightCalculationsView(new ObservableList(), assessmentSection, 0.01, "Category", testForm); // Assert DataGridView calculationsDataGridView = GetCalculationsDataGridView(); @@ -227,7 +229,7 @@ ObservableList calculations = GetTestHydraulicBoundaryLocationCalculations(); - ShowWaveHeightCalculationsView(calculations, assessmentSection, 0.01, testForm); + ShowWaveHeightCalculationsView(calculations, assessmentSection, 0.01, "Category", testForm); // Precondition DataGridView calculationsDataGridView = GetCalculationsDataGridView(); @@ -274,7 +276,7 @@ ObservableList calculations = GetTestHydraulicBoundaryLocationCalculations(); - ShowWaveHeightCalculationsView(calculations, assessmentSection, 0.01, testForm); + ShowWaveHeightCalculationsView(calculations, assessmentSection, 0.01, "Category", testForm); IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl(); DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl(); @@ -322,7 +324,7 @@ ObservableList calculations = GetTestHydraulicBoundaryLocationCalculations(); - GrassCoverErosionOutwardsWaveHeightCalculationsView view = ShowWaveHeightCalculationsView(calculations, assessmentSection, 0.01, testForm); + GrassCoverErosionOutwardsWaveHeightCalculationsView view = ShowWaveHeightCalculationsView(calculations, assessmentSection, 0.01, "Category", testForm); DataGridView calculationsDataGridView = GetCalculationsDataGridView(); object dataGridViewSource = calculationsDataGridView.DataSource; DataGridViewRowCollection rows = calculationsDataGridView.Rows; @@ -406,6 +408,7 @@ // Setup const string databaseFilePath = "DatabaseFilePath"; const double norm = 0.01; + const string categoryBoundaryName = "Category"; IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mockRepository); assessmentSection.Stub(a => a.Id).Return(string.Empty); @@ -437,7 +440,11 @@ ObservableList calculations = GetTestHydraulicBoundaryLocationCalculations(); - GrassCoverErosionOutwardsWaveHeightCalculationsView view = ShowWaveHeightCalculationsView(calculations, assessmentSection, norm, testForm); + GrassCoverErosionOutwardsWaveHeightCalculationsView view = ShowWaveHeightCalculationsView(calculations, + assessmentSection, + norm, + categoryBoundaryName, + testForm); DataGridView calculationsDataGridView = GetCalculationsDataGridView(); DataGridViewRowCollection rows = calculationsDataGridView.Rows; rows[0].Cells[calculateColumnIndex].Value = true; @@ -449,7 +456,9 @@ button.Click(); // Assert - Assert.IsInstanceOf(messageProviderValue); + Assert.IsInstanceOf(messageProviderValue); + Assert.AreEqual($"Golfhoogte berekenen voor locatie 'Location name' ({categoryBoundaryName})", + messageProviderValue.GetActivityDescription("Location name")); Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue); Assert.AreEqual("", preprocessorDirectoryValue); Assert.AreEqual(norm, normValue); @@ -464,6 +473,7 @@ const string databaseFilePath = "DatabaseFilePath"; string preprocessorDirectory = TestHelper.GetScratchPadPath(); const double norm = 0.01; + const string categoryBoundaryName = "Category"; IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mockRepository); assessmentSection.Stub(a => a.Id).Return(string.Empty); @@ -499,7 +509,11 @@ ObservableList calculations = GetTestHydraulicBoundaryLocationCalculations(); - GrassCoverErosionOutwardsWaveHeightCalculationsView view = ShowWaveHeightCalculationsView(calculations, assessmentSection, norm, testForm); + GrassCoverErosionOutwardsWaveHeightCalculationsView view = ShowWaveHeightCalculationsView(calculations, + assessmentSection, + norm, + categoryBoundaryName, + testForm); DataGridView calculationsDataGridView = GetCalculationsDataGridView(); DataGridViewRowCollection rows = calculationsDataGridView.Rows; rows[0].Cells[calculateColumnIndex].Value = true; @@ -511,7 +525,9 @@ button.Click(); // Assert - Assert.IsInstanceOf(messageProviderValue); + Assert.IsInstanceOf(messageProviderValue); + Assert.AreEqual($"Golfhoogte berekenen voor locatie 'Location name' ({categoryBoundaryName})", + messageProviderValue.GetActivityDescription("Location name")); Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue); Assert.AreEqual(preprocessorDirectory, preprocessorDirectoryValue); Assert.AreEqual(norm, normValue); @@ -525,6 +541,7 @@ // Setup const string databaseFilePath = "DatabaseFilePath"; const double norm = 0.01; + const string categoryBoundaryName = "Category"; IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mockRepository); assessmentSection.Stub(a => a.Id).Return(string.Empty); @@ -560,7 +577,11 @@ ObservableList calculations = GetTestHydraulicBoundaryLocationCalculations(); - GrassCoverErosionOutwardsWaveHeightCalculationsView view = ShowWaveHeightCalculationsView(calculations, assessmentSection, norm, testForm); + GrassCoverErosionOutwardsWaveHeightCalculationsView view = ShowWaveHeightCalculationsView(calculations, + assessmentSection, + norm, + categoryBoundaryName, + testForm); DataGridView calculationsDataGridView = GetCalculationsDataGridView(); DataGridViewRowCollection rows = calculationsDataGridView.Rows; rows[0].Cells[calculateColumnIndex].Value = true; @@ -572,7 +593,9 @@ button.Click(); // Assert - Assert.IsInstanceOf(messageProviderValue); + Assert.IsInstanceOf(messageProviderValue); + Assert.AreEqual($"Golfhoogte berekenen voor locatie 'Location name' ({categoryBoundaryName})", + messageProviderValue.GetActivityDescription("Location name")); Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue); Assert.AreEqual("", preprocessorDirectoryValue); Assert.AreEqual(norm, normValue); @@ -613,6 +636,7 @@ private static GrassCoverErosionOutwardsWaveHeightCalculationsView ShowWaveHeightCalculationsView(ObservableList calculations, IAssessmentSection assessmentSection, double norm, + string categoryName, Form form) { var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism @@ -623,7 +647,8 @@ var view = new GrassCoverErosionOutwardsWaveHeightCalculationsView(calculations, failureMechanism, assessmentSection, - () => norm); + () => norm, + categoryName); form.Controls.Add(view); form.Show(); @@ -634,7 +659,7 @@ private static GrassCoverErosionOutwardsWaveHeightCalculationsView ShowFullyConfiguredWaveHeightCalculationsView(IAssessmentSection assessmentSection, Form form) { - return ShowWaveHeightCalculationsView(GetTestHydraulicBoundaryLocationCalculations(), assessmentSection, 0.01, form); + return ShowWaveHeightCalculationsView(GetTestHydraulicBoundaryLocationCalculations(), assessmentSection, 0.01, "Category", form); } private static ObservableList GetTestHydraulicBoundaryLocationCalculations() @@ -703,7 +728,7 @@ protected override CalculationsView ShowFullyConfiguredCalculationsView(Form form) { - return ShowWaveHeightCalculationsView(calculations, new AssessmentSectionStub(), 0.01, form); + return ShowWaveHeightCalculationsView(calculations, new AssessmentSectionStub(), 0.01, "category", form); } protected override ObservableList GetCalculationsInView(CalculationsView view) Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewIntegrationTest.cs =================================================================== diff -u -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 -rb6f3b68404cad00988843342f68022dc743e74c1 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewIntegrationTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewIntegrationTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewIntegrationTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewIntegrationTest.cs) (revision b6f3b68404cad00988843342f68022dc743e74c1) @@ -116,7 +116,8 @@ var view = new GrassCoverErosionOutwardsDesignWaterLevelCalculationsView(calculations, failureMechanism, new AssessmentSection(AssessmentSectionComposition.Dike), - () => 0.01); + () => 0.01, + "Category"); testForm.Controls.Add(view); testForm.Show(); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveHeightCalculationsViewIntegrationTest.cs =================================================================== diff -u -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 -rb6f3b68404cad00988843342f68022dc743e74c1 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveHeightCalculationsViewIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsViewIntegrationTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveHeightCalculationsViewIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsViewIntegrationTest.cs) (revision b6f3b68404cad00988843342f68022dc743e74c1) @@ -116,7 +116,8 @@ var view = new GrassCoverErosionOutwardsWaveHeightCalculationsView(calculations, failureMechanism, new AssessmentSection(AssessmentSectionComposition.Dike), - () => 0.01); + () => 0.01, + "Category"); testForm.Controls.Add(view); testForm.Show(); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 -rb6f3b68404cad00988843342f68022dc743e74c1 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision b6f3b68404cad00988843342f68022dc743e74c1) @@ -578,13 +578,14 @@ HydraulicBoundaryLocation hydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations[0]; var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation); + const string categoryBoundaryName = "Category"; var context = new GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext( new ObservableList { hydraulicBoundaryLocationCalculation }, failureMechanism, assessmentSection, () => 0.01, - "Category"); + categoryBoundaryName); using (var treeViewControl = new TreeViewControl()) { @@ -617,14 +618,14 @@ { string[] msgs = messages.ToArray(); Assert.AreEqual(8, msgs.Length); - Assert.AreEqual($"Waterstand bij doorsnede-eis berekenen voor locatie '{hydraulicBoundaryLocation.Name}' is gestart.", msgs[0]); + Assert.AreEqual($"Waterstand berekenen voor locatie '{hydraulicBoundaryLocation.Name}' ({categoryBoundaryName}) is gestart.", msgs[0]); CalculationServiceTestHelper.AssertValidationStartMessage(msgs[1]); CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]); CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[3]); - Assert.AreEqual($"Waterstand bij doorsnede-eis berekening voor locatie '{hydraulicBoundaryLocation.Name}' is niet geconvergeerd.", msgs[4]); - StringAssert.StartsWith("Toetspeil berekening is uitgevoerd op de tijdelijke locatie", msgs[5]); + Assert.AreEqual($"Waterstand berekening voor locatie '{hydraulicBoundaryLocation.Name}' ({categoryBoundaryName}) is niet geconvergeerd.", msgs[4]); + StringAssert.StartsWith("Waterstand berekening is uitgevoerd op de tijdelijke locatie", msgs[5]); CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[6]); - Assert.AreEqual($"Waterstand bij doorsnede-eis berekenen voor locatie '{hydraulicBoundaryLocation.Name}' is gelukt.", msgs[7]); + Assert.AreEqual($"Waterstand berekenen voor locatie '{hydraulicBoundaryLocation.Name}' ({categoryBoundaryName}) is gelukt.", msgs[7]); }); HydraulicBoundaryLocationCalculationOutput output = hydraulicBoundaryLocationCalculation.Output; Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs =================================================================== diff -u -r61f1174cf2e321ad5b691a93f242557f8a0d3ad6 -rb6f3b68404cad00988843342f68022dc743e74c1 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs) (revision 61f1174cf2e321ad5b691a93f242557f8a0d3ad6) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs) (revision b6f3b68404cad00988843342f68022dc743e74c1) @@ -198,7 +198,8 @@ using (var view = new GrassCoverErosionOutwardsDesignWaterLevelCalculationsView(new ObservableList(), grassCoverErosionOutwardsFailureMechanism, assessmentSection, - () => 0.01)) + () => 0.01, + "Category")) { // Call info.AfterCreate(view, data); @@ -230,7 +231,8 @@ using (var view = new GrassCoverErosionOutwardsDesignWaterLevelCalculationsView(new ObservableList(), failureMechanism, assessmentSection, - () => 0.01)) + () => 0.01, + "Category")) using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ViewInfo info = GetInfo(plugin); @@ -269,7 +271,8 @@ using (var view = new GrassCoverErosionOutwardsDesignWaterLevelCalculationsView(new ObservableList(), failureMechanism, assessmentSectionA, - () => 0.01)) + () => 0.01, + "Category")) using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ViewInfo info = GetInfo(plugin); @@ -305,7 +308,8 @@ using (var view = new GrassCoverErosionOutwardsDesignWaterLevelCalculationsView(new ObservableList(), new GrassCoverErosionOutwardsFailureMechanism(), assessmentSection, - () => 0.01)) + () => 0.01, + "Category")) using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ViewInfo info = GetInfo(plugin); @@ -346,7 +350,8 @@ using (var view = new GrassCoverErosionOutwardsDesignWaterLevelCalculationsView(new ObservableList(), new GrassCoverErosionOutwardsFailureMechanism(), assessmentSectionA, - () => 0.01)) + () => 0.01, + "Category")) using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ViewInfo info = GetInfo(plugin); @@ -378,7 +383,8 @@ using (var view = new GrassCoverErosionOutwardsDesignWaterLevelCalculationsView(new ObservableList(), new GrassCoverErosionOutwardsFailureMechanism(), assessmentSection, - () => 0.01)) + () => 0.01, + "Category")) using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ViewInfo info = GetInfo(plugin); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs =================================================================== diff -u -r61f1174cf2e321ad5b691a93f242557f8a0d3ad6 -rb6f3b68404cad00988843342f68022dc743e74c1 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs) (revision 61f1174cf2e321ad5b691a93f242557f8a0d3ad6) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs) (revision b6f3b68404cad00988843342f68022dc743e74c1) @@ -187,7 +187,8 @@ using (var view = new GrassCoverErosionOutwardsWaveHeightCalculationsView(new ObservableList(), failureMechanism, assessmentSection, - () => 0.01)) + () => 0.01, + "Category")) { info.AfterCreate(view, data); @@ -218,7 +219,8 @@ using (var view = new GrassCoverErosionOutwardsWaveHeightCalculationsView(new ObservableList(), failureMechanism, assessmentSection, - () => 0.01)) + () => 0.01, + "Category")) using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ViewInfo info = GetInfo(plugin); @@ -257,7 +259,8 @@ using (var view = new GrassCoverErosionOutwardsWaveHeightCalculationsView(new ObservableList(), failureMechanism, assessmentSectionA, - () => 0.01)) + () => 0.01, + "Category")) using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ViewInfo info = GetInfo(plugin); @@ -293,7 +296,8 @@ using (var view = new GrassCoverErosionOutwardsWaveHeightCalculationsView(new ObservableList(), new GrassCoverErosionOutwardsFailureMechanism(), assessmentSection, - () => 0.01)) + () => 0.01, + "Category")) using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ViewInfo info = GetInfo(plugin); @@ -334,7 +338,8 @@ using (var view = new GrassCoverErosionOutwardsWaveHeightCalculationsView(new ObservableList(), new GrassCoverErosionOutwardsFailureMechanism(), assessmentSectionA, - () => 0.01)) + () => 0.01, + "Category")) using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ViewInfo info = GetInfo(plugin); @@ -366,7 +371,8 @@ using (var view = new GrassCoverErosionOutwardsWaveHeightCalculationsView(new ObservableList(), new GrassCoverErosionOutwardsFailureMechanism(), assessmentSection, - () => 0.01)) + () => 0.01, + "Category")) using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ViewInfo info = GetInfo(plugin); Fisheye: Tag b6f3b68404cad00988843342f68022dc743e74c1 refers to a dead (removed) revision in file `Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/MessageProviders/GrassCoverErosionOutwardsDesignWaterLevelCalculationMessageProviderTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b6f3b68404cad00988843342f68022dc743e74c1 refers to a dead (removed) revision in file `Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/MessageProviders/GrassCoverErosionOutwardsWaveHeightCalculationMessageProviderTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj =================================================================== diff -u -rf1d92a5cb2eebdf9f6c093b9ae66bb7ff95b6e41 -rb6f3b68404cad00988843342f68022dc743e74c1 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj (.../Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj) (revision f1d92a5cb2eebdf9f6c093b9ae66bb7ff95b6e41) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj (.../Ringtoets.GrassCoverErosionOutwards.Service.Test.csproj) (revision b6f3b68404cad00988843342f68022dc743e74c1) @@ -22,8 +22,6 @@ - - Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs =================================================================== diff -u -rd3b14a0f327184e0239e5239c826805c565fe8be -rb6f3b68404cad00988843342f68022dc743e74c1 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs (.../DesignWaterLevelCalculationsViewTest.cs) (revision d3b14a0f327184e0239e5239c826805c565fe8be) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs (.../DesignWaterLevelCalculationsViewTest.cs) (revision b6f3b68404cad00988843342f68022dc743e74c1) @@ -405,7 +405,7 @@ // Assert Assert.IsInstanceOf(messageProviderValue); - Assert.AreEqual($"Toetspeil berekenen voor locatie 'Location name' ({categoryBoundaryName})", + Assert.AreEqual($"Waterstand berekenen voor locatie 'Location name' ({categoryBoundaryName})", messageProviderValue.GetActivityDescription("Location name")); Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue); Assert.AreEqual("", preprocessorDirectoryValue); @@ -477,7 +477,7 @@ // Assert Assert.IsInstanceOf(messageProviderValue); - Assert.AreEqual($"Toetspeil berekenen voor locatie 'Location name' ({categoryBoundaryName})", + Assert.AreEqual($"Waterstand berekenen voor locatie 'Location name' ({categoryBoundaryName})", messageProviderValue.GetActivityDescription("Location name")); Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue); Assert.AreEqual(preprocessorDirectory, preprocessorDirectoryValue); @@ -548,7 +548,7 @@ // Assert Assert.IsInstanceOf(messageProviderValue); - Assert.AreEqual($"Toetspeil berekenen voor locatie 'Location name' ({categoryBoundaryName})", + Assert.AreEqual($"Waterstand berekenen voor locatie 'Location name' ({categoryBoundaryName})", messageProviderValue.GetActivityDescription("Location name")); Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue); Assert.AreEqual(string.Empty, preprocessorDirectoryValue);