Index: Ringtoets/Common/src/Ringtoets.Common.Forms/HydraulicBoundaryLocationSelectionDialog.cs =================================================================== diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da --- Ringtoets/Common/src/Ringtoets.Common.Forms/HydraulicBoundaryLocationSelectionDialog.cs (.../HydraulicBoundaryLocationSelectionDialog.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/HydraulicBoundaryLocationSelectionDialog.cs (.../HydraulicBoundaryLocationSelectionDialog.cs) (revision 25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da) @@ -50,7 +50,7 @@ } Text = Resources.HydraulicBoundaryLocationSelectionDialog_Select_HydraulicBoundaryLocations; - InitializeDataGridView(Resources.HydraulicBoundaryLocationSelectionDialog_Location_Name); + InitializeDataGridView(Resources.HydraulicBoundaryLocation_DisplayName); SetDataSource(hydraulicBoundaryLocations.Select(loc => new SelectableRow(loc, loc.Name)).ToArray()); } Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r4a568c24a6db2807c63646526c8cb5fa74b52ed2 -r25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4a568c24a6db2807c63646526c8cb5fa74b52ed2) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da) @@ -2278,15 +2278,6 @@ } /// - /// Looks up a localized string similar to Hydraulische belastingenlocatie. - /// - public static string HydraulicBoundaryLocationSelectionDialog_Location_Name { - get { - return ResourceManager.GetString("HydraulicBoundaryLocationSelectionDialog_Location_Name", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Selecteer hydraulische belastingenlocaties. /// public static string HydraulicBoundaryLocationSelectionDialog_Select_HydraulicBoundaryLocations { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx =================================================================== diff -u -r4a568c24a6db2807c63646526c8cb5fa74b52ed2 -r25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 4a568c24a6db2807c63646526c8cb5fa74b52ed2) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da) @@ -653,9 +653,6 @@ Annuleren - - Hydraulische belastingenlocatie - Genereer belastingenberekeningen. Fisheye: Tag 25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/CalculationConfigurationWriter/structureCalculationWithAllParametersSet.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.Plugin.TestUtil/HydraulicBoundaryLocationCalculationActivityLogTestHelper.cs =================================================================== diff -u -r9fb6b330d45af8ac4ebdf127bb5907781cdb5155 -r25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da --- Ringtoets/Common/test/Ringtoets.Common.Plugin.TestUtil/HydraulicBoundaryLocationCalculationActivityLogTestHelper.cs (.../HydraulicBoundaryLocationCalculationActivityLogTestHelper.cs) (revision 9fb6b330d45af8ac4ebdf127bb5907781cdb5155) +++ Ringtoets/Common/test/Ringtoets.Common.Plugin.TestUtil/HydraulicBoundaryLocationCalculationActivityLogTestHelper.cs (.../HydraulicBoundaryLocationCalculationActivityLogTestHelper.cs) (revision 25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da) @@ -37,28 +37,30 @@ /// /// The name of the location. /// The display name of the type of calculation being performed. + /// The display name of the calculation being performed. /// The category boundary name of the calculation. /// The log messages to assert. /// The index to start asserting from. /// Thrown when /// contains incorrect messages. public static void AssertHydraulicBoundaryLocationCalculationMessages(string locationName, string calculationTypeDisplayName, + string calculationDisplayName, string categoryName, IEnumerable actualMessages, int startIndex) { - Assert.AreEqual($"{calculationTypeDisplayName} berekenen voor locatie '{locationName}' (Categorie {categoryName}) is gestart.", + Assert.AreEqual($"{calculationTypeDisplayName} berekenen voor locatie '{locationName}' (Categorie {categoryName}) is gestart.", actualMessages.ElementAt(startIndex)); CalculationServiceTestHelper.AssertValidationStartMessage(actualMessages.ElementAt(startIndex + 1)); CalculationServiceTestHelper.AssertValidationEndMessage(actualMessages.ElementAt(startIndex + 2)); CalculationServiceTestHelper.AssertCalculationStartMessage(actualMessages.ElementAt(startIndex + 3)); - Assert.AreEqual($"{calculationTypeDisplayName} berekening voor locatie '{locationName}' (Categorie {categoryName}) is niet geconvergeerd.", + Assert.AreEqual($"{calculationDisplayName} voor locatie '{locationName}' (Categorie {categoryName}) is niet geconvergeerd.", actualMessages.ElementAt(startIndex + 4)); - StringAssert.StartsWith($"{calculationTypeDisplayName} berekening is uitgevoerd op de tijdelijke locatie", + StringAssert.StartsWith($"{calculationDisplayName} is uitgevoerd op de tijdelijke locatie", actualMessages.ElementAt(startIndex + 5)); CalculationServiceTestHelper.AssertCalculationEndMessage(actualMessages.ElementAt(startIndex + 6)); - Assert.AreEqual($"{calculationTypeDisplayName} berekenen voor locatie '{locationName}' (Categorie {categoryName}) is gelukt.", + Assert.AreEqual($"{calculationTypeDisplayName} berekenen voor locatie '{locationName}' (Categorie {categoryName}) is gelukt.", actualMessages.ElementAt(startIndex + 7)); } } Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rf12c66e6855a6c5bec7e6ccd7ac73e5b58c9b534 -r25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs (.../DuneErosionFailureMechanismContextTreeNodeInfoTest.cs) (revision f12c66e6855a6c5bec7e6ccd7ac73e5b58c9b534) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs (.../DuneErosionFailureMechanismContextTreeNodeInfoTest.cs) (revision 25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Collections.Generic; using System.IO; using System.Linq; using System.Windows.Forms; @@ -41,7 +40,7 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.PresentationObjects; -using Ringtoets.Common.Service.TestUtil; +using Ringtoets.Common.Plugin.TestUtil; using Ringtoets.DuneErosion.Data; using Ringtoets.DuneErosion.Data.TestUtil; using Ringtoets.DuneErosion.Forms.PresentationObjects; @@ -544,33 +543,22 @@ string[] msgs = messages.ToArray(); Assert.AreEqual(40, msgs.Length); - AssertDuneLocationCalculationMessages(duneLocation.Name, "Iv->IIv", msgs, 0); - AssertDuneLocationCalculationMessages(duneLocation.Name, "IIv->IIIv", msgs, 8); - AssertDuneLocationCalculationMessages(duneLocation.Name, "IIIv->IVv", msgs, 16); - AssertDuneLocationCalculationMessages(duneLocation.Name, "IVv->Vv", msgs, 24); - AssertDuneLocationCalculationMessages(duneLocation.Name, "Vv->VIv", msgs, 32); + const string calculationTypeDisplayName = "Hydraulische belastingen"; + const string calculationDisplayName = "Hydraulische belastingenberekening"; + + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Iv->IIv", msgs, 0); + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIv->IIIv", msgs, 8); + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIIv->IVv", msgs, 16); + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IVv->Vv", msgs, 24); + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Vv->VIv", msgs, 32); }); } } } - - private static void AssertDuneLocationCalculationMessages(string duneLocationName, - string categoryName, - IEnumerable actualMessages, - int startIndex) - { - Assert.AreEqual($"Hydraulische belastingen berekenen voor locatie '{duneLocationName}' (Categorie {categoryName}) is gestart.", - actualMessages.ElementAt(startIndex)); - CalculationServiceTestHelper.AssertValidationStartMessage(actualMessages.ElementAt(startIndex + 1)); - CalculationServiceTestHelper.AssertValidationEndMessage(actualMessages.ElementAt(startIndex + 2)); - CalculationServiceTestHelper.AssertCalculationStartMessage(actualMessages.ElementAt(startIndex + 3)); - Assert.AreEqual($"Hydraulische belastingenberekening voor locatie '{duneLocationName}' (Categorie {categoryName}) is niet geconvergeerd.", - actualMessages.ElementAt(startIndex + 4)); - StringAssert.StartsWith("Hydraulische belastingenberekening is uitgevoerd op de tijdelijke locatie", - actualMessages.ElementAt(startIndex + 5)); - CalculationServiceTestHelper.AssertCalculationEndMessage(actualMessages.ElementAt(startIndex + 6)); - Assert.AreEqual($"Hydraulische belastingen berekenen voor locatie '{duneLocationName}' (Categorie {categoryName}) is gelukt.", - actualMessages.ElementAt(startIndex + 7)); - } } } \ No newline at end of file Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rf12c66e6855a6c5bec7e6ccd7ac73e5b58c9b534 -r25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs) (revision f12c66e6855a6c5bec7e6ccd7ac73e5b58c9b534) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs) (revision 25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Collections.Generic; using System.Drawing; using System.IO; using System.Linq; @@ -37,7 +36,7 @@ using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.Common.Service.TestUtil; +using Ringtoets.Common.Plugin.TestUtil; using Ringtoets.DuneErosion.Data; using Ringtoets.DuneErosion.Data.TestUtil; using Ringtoets.DuneErosion.Forms.PresentationObjects; @@ -464,11 +463,19 @@ string[] msgs = messages.ToArray(); Assert.AreEqual(40, msgs.Length); - AssertDuneLocationCalculationMessages(duneLocation.Name, "Iv->IIv", msgs, 0); - AssertDuneLocationCalculationMessages(duneLocation.Name, "IIv->IIIv", msgs, 8); - AssertDuneLocationCalculationMessages(duneLocation.Name, "IIIv->IVv", msgs, 16); - AssertDuneLocationCalculationMessages(duneLocation.Name, "IVv->Vv", msgs, 24); - AssertDuneLocationCalculationMessages(duneLocation.Name, "Vv->VIv", msgs, 32); + const string calculationTypeDisplayName = "Hydraulische belastingen"; + const string calculationDisplayName = "Hydraulische belastingenberekening"; + + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Iv->IIv", msgs, 0); + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIv->IIIv", msgs, 8); + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIIv->IVv", msgs, 16); + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IVv->Vv", msgs, 24); + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Vv->VIv", msgs, 32); }); } } @@ -477,25 +484,6 @@ mocks.VerifyAll(); } - private static void AssertDuneLocationCalculationMessages(string duneLocationName, - string categoryName, - IEnumerable actualMessages, - int startIndex) - { - Assert.AreEqual($"Hydraulische belastingen berekenen voor locatie '{duneLocationName}' (Categorie {categoryName}) is gestart.", - actualMessages.ElementAt(startIndex)); - CalculationServiceTestHelper.AssertValidationStartMessage(actualMessages.ElementAt(startIndex + 1)); - CalculationServiceTestHelper.AssertValidationEndMessage(actualMessages.ElementAt(startIndex + 2)); - CalculationServiceTestHelper.AssertCalculationStartMessage(actualMessages.ElementAt(startIndex + 3)); - Assert.AreEqual($"Hydraulische belastingenberekening voor locatie '{duneLocationName}' (Categorie {categoryName}) is niet geconvergeerd.", - actualMessages.ElementAt(startIndex + 4)); - StringAssert.StartsWith("Hydraulische belastingenberekening is uitgevoerd op de tijdelijke locatie", - actualMessages.ElementAt(startIndex + 5)); - CalculationServiceTestHelper.AssertCalculationEndMessage(actualMessages.ElementAt(startIndex + 6)); - Assert.AreEqual($"Hydraulische belastingen berekenen voor locatie '{duneLocationName}' (Categorie {categoryName}) is gelukt.", - actualMessages.ElementAt(startIndex + 7)); - } - private static double GetExpectedNorm(DuneErosionFailureMechanism failureMechanism, double norm) { return failureMechanismSpecificNormFactor * norm * (failureMechanism.Contribution / 100) / failureMechanism.GeneralInput.N; Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rb9ae753b52b2b198f264bd2f825d4a66305ad5c9 -r25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision b9ae753b52b2b198f264bd2f825d4a66305ad5c9) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision 25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da) @@ -371,17 +371,19 @@ string[] msgs = messages.ToArray(); Assert.AreEqual(40, msgs.Length); - const string designWaterLevelName = "Waterstand"; + const string calculationTypeDisplayName = "Waterstand"; + const string calculationDisplayName = "Waterstand berekening"; + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelName, "Iv->IIv", msgs, 0); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Iv->IIv", msgs, 0); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelName, "IIv->IIIv", msgs, 8); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIv->IIIv", msgs, 8); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelName, "IIIv->IVv", msgs, 16); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIIv->IVv", msgs, 16); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelName, "IVv->Vv", msgs, 24); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IVv->Vv", msgs, 24); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelName, "Vv->VIv", msgs, 32); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Vv->VIv", msgs, 32); }); AssertHydraulicBoundaryLocationCalculationOutput(designWaterLevelCalculator, failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rb9ae753b52b2b198f264bd2f825d4a66305ad5c9 -r25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision b9ae753b52b2b198f264bd2f825d4a66305ad5c9) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da) @@ -592,29 +592,33 @@ string[] msgs = messages.ToArray(); Assert.AreEqual(95, msgs.Length); - const string designWaterLevelName = "Waterstand"; + const string designWaterLevelCalculationTypeDisplayName = "Waterstand"; + const string designWaterLevelCalculationDisplayName = "Waterstand berekening"; + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelName, "Iv->IIv", msgs, 0); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Iv->IIv", msgs, 0); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelName, "IIv->IIIv", msgs, 8); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "IIv->IIIv", msgs, 8); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelName, "IIIv->IVv", msgs, 16); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "IIIv->IVv", msgs, 16); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelName, "IVv->Vv", msgs, 24); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "IVv->Vv", msgs, 24); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelName, "Vv->VIv", msgs, 32); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Vv->VIv", msgs, 32); - const string waveHeightName = "Golfhoogte"; + const string waveHeightCalculationTypeDisplayName = "Golfhoogte"; + const string waveHeightCalculationDisplayName = "Golfhoogte berekening"; + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightName, "Iv->IIv", msgs, 40); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Iv->IIv", msgs, 40); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightName, "IIv->IIIv", msgs, 48); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "IIv->IIIv", msgs, 48); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightName, "IIIv->IVv", msgs, 56); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "IIIv->IVv", msgs, 56); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightName, "IVv->Vv", msgs, 64); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "IVv->Vv", msgs, 64); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightName, "Vv->VIv", msgs, 72); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Vv->VIv", msgs, 72); Assert.AreEqual($"Golfcondities berekenen voor '{calculation.Name}' is gestart.", msgs.ElementAt(80)); CalculationServiceTestHelper.AssertValidationStartMessage(msgs.ElementAt(81)); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs =================================================================== diff -u -rb9ae753b52b2b198f264bd2f825d4a66305ad5c9 -r25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision b9ae753b52b2b198f264bd2f825d4a66305ad5c9) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision 25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da) @@ -317,29 +317,33 @@ string[] msgs = messages.ToArray(); Assert.AreEqual(95, msgs.Length); - const string designWaterLevelName = "Waterstand"; + const string designWaterLevelCalculationTypeDisplayName = "Waterstand"; + const string designWaterLevelCalculationDisplayName = "Waterstand berekening"; + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelName, "Iv->IIv", msgs, 0); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Iv->IIv", msgs, 0); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelName, "IIv->IIIv", msgs, 8); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "IIv->IIIv", msgs, 8); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelName, "IIIv->IVv", msgs, 16); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "IIIv->IVv", msgs, 16); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelName, "IVv->Vv", msgs, 24); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "IVv->Vv", msgs, 24); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelName, "Vv->VIv", msgs, 32); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Vv->VIv", msgs, 32); - const string waveHeightName = "Golfhoogte"; + const string waveHeightCalculationTypeDisplayName = "Golfhoogte"; + const string waveHeightCalculationDisplayName = "Golfhoogte berekening"; + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightName, "Iv->IIv", msgs, 40); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Iv->IIv", msgs, 40); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightName, "IIv->IIIv", msgs, 48); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "IIv->IIIv", msgs, 48); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightName, "IIIv->IVv", msgs, 56); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "IIIv->IVv", msgs, 56); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightName, "IVv->Vv", msgs, 64); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "IVv->Vv", msgs, 64); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightName, "Vv->VIv", msgs, 72); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Vv->VIv", msgs, 72); Assert.AreEqual($"Golfcondities berekenen voor '{calculation.Name}' is gestart.", msgs.ElementAt(80)); CalculationServiceTestHelper.AssertValidationStartMessage(msgs.ElementAt(81)); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rb9ae753b52b2b198f264bd2f825d4a66305ad5c9 -r25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs) (revision b9ae753b52b2b198f264bd2f825d4a66305ad5c9) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs) (revision 25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da) @@ -371,17 +371,19 @@ string[] msgs = messages.ToArray(); Assert.AreEqual(40, msgs.Length); - const string waveHeightName = "Golfhoogte"; + const string calculationTypeDisplayName = "Golfhoogte"; + const string calculationDisplayName = "Golfhoogte berekening"; + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightName, "Iv->IIv", msgs, 0); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Iv->IIv", msgs, 0); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightName, "IIv->IIIv", msgs, 8); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIv->IIIv", msgs, 8); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightName, "IIIv->IVv", msgs, 16); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIIv->IVv", msgs, 16); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightName, "IVv->Vv", msgs, 24); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IVv->Vv", msgs, 24); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightName, "Vv->VIv", msgs, 32); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Vv->VIv", msgs, 32); }); AssertHydraulicBoundaryLocationCalculationOutput(waveHeightCalculator, failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output); Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r4a568c24a6db2807c63646526c8cb5fa74b52ed2 -r25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4a568c24a6db2807c63646526c8cb5fa74b52ed2) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da) @@ -854,15 +854,6 @@ } /// - /// Looks up a localized string similar to Hydraulische belastingendatabase. - /// - public static string SelectHydraulicBoundaryDatabaseFile_FilterName { - get { - return ResourceManager.GetString("SelectHydraulicBoundaryDatabaseFile_FilterName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Overstromingskans van het dijktraject waarvan overschrijding gemeld moet worden aan de Minister van I en M.. /// public static string SignalingNorm_Description { Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx =================================================================== diff -u -r4a568c24a6db2807c63646526c8cb5fa74b52ed2 -r25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 4a568c24a6db2807c63646526c8cb5fa74b52ed2) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da) @@ -156,9 +156,6 @@ Database op pad '{0}' gekoppeld. - - Hydraulische belastingendatabase - n.v.t Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -r4a568c24a6db2807c63646526c8cb5fa74b52ed2 -r25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 4a568c24a6db2807c63646526c8cb5fa74b52ed2) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da) @@ -2097,7 +2097,7 @@ { using (var dialog = new OpenFileDialog { - Filter = $@"{RingtoetsFormsResources.SelectHydraulicBoundaryDatabaseFile_FilterName} (*.sqlite)|*.sqlite", + Filter = $@"{RingtoetsFormsResources.HydraulicBoundaryDatabase_FilePath_DisplayName} (*.sqlite)|*.sqlite", Title = GuiResources.OpenFileDialog_Title }) { Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rb9ae753b52b2b198f264bd2f825d4a66305ad5c9 -r25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision b9ae753b52b2b198f264bd2f825d4a66305ad5c9) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision 25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da) @@ -349,15 +349,18 @@ { string[] msgs = messages.ToArray(); Assert.AreEqual(32, msgs.Length); - const string designWaterLevelName = "Waterstand"; + + const string calculationTypeDisplayName = "Waterstand"; + const string calculationDisplayName = "Waterstand berekening"; + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelName, "A+->A", msgs, 0); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "A+->A", msgs, 0); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelName, "A->B", msgs, 8); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "A->B", msgs, 8); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelName, "B->C", msgs, 16); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "B->C", msgs, 16); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelName, "C->D", msgs, 24); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "C->D", msgs, 24); }); AssertHydraulicBoundaryLocationCalculationOutput(designWaterLevelCalculator, assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.Single().Output); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs =================================================================== diff -u -r7cd4d0359f49280683cc284c633b220e139fd5a6 -r25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision 7cd4d0359f49280683cc284c633b220e139fd5a6) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision 25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da) @@ -861,25 +861,29 @@ string[] msgs = messages.ToArray(); Assert.AreEqual(64, msgs.Length); - const string designWaterLevelName = "Waterstand"; + const string designWaterLevelCalculationTypeDisplayName = "Waterstand"; + const string designWaterLevelCalculationDisplayName = "Waterstand berekening"; + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelName, "A+->A", msgs, 0); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "A+->A", msgs, 0); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelName, "A->B", msgs, 8); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "A->B", msgs, 8); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelName, "B->C", msgs, 16); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "B->C", msgs, 16); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelName, "C->D", msgs, 24); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "C->D", msgs, 24); - const string waveHeightName = "Golfhoogte"; + const string waveHeightCalculationTypeDisplayName = "Golfhoogte"; + const string waveHeightCalculationDisplayName = "Golfhoogte berekening"; + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightName, "A+->A", msgs, 32); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "A+->A", msgs, 32); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightName, "A->B", msgs, 40); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "A->B", msgs, 40); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightName, "B->C", msgs, 48); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "B->C", msgs, 48); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightName, "C->D", msgs, 56); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "C->D", msgs, 56); }); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rb9ae753b52b2b198f264bd2f825d4a66305ad5c9 -r25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs) (revision b9ae753b52b2b198f264bd2f825d4a66305ad5c9) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs) (revision 25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da) @@ -351,15 +351,17 @@ string[] msgs = messages.ToArray(); Assert.AreEqual(32, msgs.Length); - const string waveHeightName = "Golfhoogte"; + const string calculationTypeDisplayName = "Golfhoogte"; + const string calculationDisplayName = "Golfhoogte berekening"; + HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightName, "A+->A", msgs, 0); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "A+->A", msgs, 0); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightName, "A->B", msgs, 8); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "A->B", msgs, 8); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightName, "B->C", msgs, 16); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "B->C", msgs, 16); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightName, "C->D", msgs, 24); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "C->D", msgs, 24); }); AssertHydraulicBoundaryLocationCalculationOutput(waveHeightCalculator, assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm.Single().Output);