Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs =================================================================== diff -u -r36af0dd60aa8c8e97cd35183f0355224109831c3 -rc17810351d2a429bfb308d7c1f854f535a00983e --- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 36af0dd60aa8c8e97cd35183f0355224109831c3) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) @@ -1,25 +1,4 @@ -// Copyright (C) Stichting Deltares 2017. All rights reserved. -// -// This file is part of Ringtoets. -// -// Ringtoets is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// -// All names, logos, and references to "Deltares" are registered trademarks of -// Stichting Deltares and remain full property of Stichting Deltares at all times. -// All rights reserved. - -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated by a tool. // Runtime Version:4.0.30319.42000 @@ -443,7 +422,7 @@ } /// - /// Looks up a localized string similar to Vv->VIv. + /// Looks up a localized string similar to Categoriegrens Vv. /// public static string FailureMechanismCategoryType_FactorizedLowerLimitNorm_DisplayName { get { @@ -452,7 +431,7 @@ } /// - /// Looks up a localized string similar to IVv->Vv. + /// Looks up a localized string similar to Categoriegrens IVv. /// public static string FailureMechanismCategoryType_LowerLimitNorm_DisplayName { get { @@ -461,7 +440,7 @@ } /// - /// Looks up a localized string similar to Iv->IIv. + /// Looks up a localized string similar to Categoriegrens Iv. /// public static string FailureMechanismCategoryType_MechanismSpecificFactorizedSignalingNorm_DisplayName { get { @@ -471,7 +450,7 @@ } /// - /// Looks up a localized string similar to IIIv->IVv. + /// Looks up a localized string similar to Categoriegrens IIIv. /// public static string FailureMechanismCategoryType_MechanismSpecificLowerLimitNorm_DisplayName { get { @@ -480,7 +459,7 @@ } /// - /// Looks up a localized string similar to IIv->IIIv. + /// Looks up a localized string similar to Categoriegrens IIv. /// public static string FailureMechanismCategoryType_MechanismSpecificSignalingNorm_DisplayName { get { Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx =================================================================== diff -u -r36af0dd60aa8c8e97cd35183f0355224109831c3 -rc17810351d2a429bfb308d7c1f854f535a00983e --- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision 36af0dd60aa8c8e97cd35183f0355224109831c3) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision c17810351d2a429bfb308d7c1f854f535a00983e) @@ -400,19 +400,19 @@ Categoriegrens C - Iv->IIv + Categoriegrens Iv - IIv->IIIv + Categoriegrens IIv - IIIv->IVv + Categoriegrens IIIv - IVv->Vv + Categoriegrens IVv - Vv->VIv + Categoriegrens Vv Voor een of meerdere vakken kan geen resultaat worden bepaald. Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismCategoryTypeTest.cs =================================================================== diff -u -r903859df2a7a66a74eb63abca9a8fa49741ad262 -rc17810351d2a429bfb308d7c1f854f535a00983e --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismCategoryTypeTest.cs (.../FailureMechanismCategoryTypeTest.cs) (revision 903859df2a7a66a74eb63abca9a8fa49741ad262) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismCategoryTypeTest.cs (.../FailureMechanismCategoryTypeTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) @@ -36,19 +36,19 @@ return new Dictionary { { - FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm, "Iv->IIv" + FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm, "Categoriegrens Iv" }, { - FailureMechanismCategoryType.MechanismSpecificSignalingNorm, "IIv->IIIv" + FailureMechanismCategoryType.MechanismSpecificSignalingNorm, "Categoriegrens IIv" }, { - FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm, "IIIv->IVv" + FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm, "Categoriegrens IIIv" }, { - FailureMechanismCategoryType.LowerLimitNorm, "IVv->Vv" + FailureMechanismCategoryType.LowerLimitNorm, "Categoriegrens IVv" }, { - FailureMechanismCategoryType.FactorizedLowerLimitNorm, "Vv->VIv" + FailureMechanismCategoryType.FactorizedLowerLimitNorm, "Categoriegrens Vv" } }; } Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rd68597572782f79b39b7d74844040cec22584b6d -rc17810351d2a429bfb308d7c1f854f535a00983e --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs (.../DuneErosionFailureMechanismContextTreeNodeInfoTest.cs) (revision d68597572782f79b39b7d74844040cec22584b6d) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs (.../DuneErosionFailureMechanismContextTreeNodeInfoTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) @@ -549,15 +549,15 @@ const string calculationDisplayName = "Hydraulische belastingenberekening"; HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Iv->IIv", msgs, 0); + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens Iv", msgs, 0); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIv->IIIv", msgs, 8); + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens IIv", msgs, 8); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIIv->IVv", msgs, 16); + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens IIIv", msgs, 16); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IVv->Vv", msgs, 24); + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens IVv", msgs, 24); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Vv->VIv", msgs, 32); + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens Vv", msgs, 32); }); } } Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r643a67a28ec8d9edda4a5bd0844e45692452332e -rc17810351d2a429bfb308d7c1f854f535a00983e --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsContextTreeNodeInfoTest.cs) (revision 643a67a28ec8d9edda4a5bd0844e45692452332e) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsContextTreeNodeInfoTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) @@ -122,7 +122,7 @@ string text = info.Text(context); // Assert - Assert.AreEqual("Categorie " + categoryBoundaryName, text); + Assert.AreEqual(categoryBoundaryName, text); } [Test] Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da -rc17810351d2a429bfb308d7c1f854f535a00983e --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs) (revision 25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) @@ -251,23 +251,23 @@ Assert.IsTrue(calculationsContexts.All(c => ReferenceEquals(assessmentSection, c.AssessmentSection))); Assert.IsTrue(calculationsContexts.All(c => ReferenceEquals(failureMechanism, c.FailureMechanism))); - Assert.AreEqual("Iv->IIv", calculationsContexts[0].CategoryBoundaryName); + Assert.AreEqual("Categoriegrens Iv", calculationsContexts[0].CategoryBoundaryName); Assert.AreSame(failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm, calculationsContexts[0].WrappedData); Assert.AreEqual(GetExpectedNorm(failureMechanism, signalingNorm / 30), calculationsContexts[0].GetNormFunc(), 1e-6); - Assert.AreEqual("IIv->IIIv", calculationsContexts[1].CategoryBoundaryName); + Assert.AreEqual("Categoriegrens IIv", calculationsContexts[1].CategoryBoundaryName); Assert.AreSame(failureMechanism.CalculationsForMechanismSpecificSignalingNorm, calculationsContexts[1].WrappedData); Assert.AreEqual(GetExpectedNorm(failureMechanism, signalingNorm), calculationsContexts[1].GetNormFunc(), 1e-6); - Assert.AreEqual("IIIv->IVv", calculationsContexts[2].CategoryBoundaryName); + Assert.AreEqual("Categoriegrens IIIv", calculationsContexts[2].CategoryBoundaryName); Assert.AreSame(failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm, calculationsContexts[2].WrappedData); Assert.AreEqual(GetExpectedNorm(failureMechanism, lowerLimitNorm), calculationsContexts[2].GetNormFunc(), 1e-6); - Assert.AreEqual("IVv->Vv", calculationsContexts[3].CategoryBoundaryName); + Assert.AreEqual("Categoriegrens IVv", calculationsContexts[3].CategoryBoundaryName); Assert.AreSame(failureMechanism.CalculationsForLowerLimitNorm, calculationsContexts[3].WrappedData); Assert.AreEqual(failureMechanismSpecificNormFactor * lowerLimitNorm, calculationsContexts[3].GetNormFunc(), 1e-6); - Assert.AreEqual("Vv->VIv", calculationsContexts[4].CategoryBoundaryName); + Assert.AreEqual("Categoriegrens Vv", calculationsContexts[4].CategoryBoundaryName); Assert.AreSame(failureMechanism.CalculationsForFactorizedLowerLimitNorm, calculationsContexts[4].WrappedData); Assert.AreEqual(failureMechanismSpecificNormFactor * lowerLimitNorm * 30, calculationsContexts[4].GetNormFunc(), 1e-6); } @@ -467,15 +467,15 @@ const string calculationDisplayName = "Hydraulische belastingenberekening"; HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Iv->IIv", msgs, 0); + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens Iv", msgs, 0); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIv->IIIv", msgs, 8); + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens IIv", msgs, 8); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIIv->IVv", msgs, 16); + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens IIIv", msgs, 16); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IVv->Vv", msgs, 24); + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens IVv", msgs, 24); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Vv->VIv", msgs, 32); + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens Vv", msgs, 32); }); } } Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs =================================================================== diff -u -rbf351b0eb02d0dd7a632d200015aa0007621eadd -rc17810351d2a429bfb308d7c1f854f535a00983e --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs (.../DuneLocationCalculationsViewInfoTest.cs) (revision bf351b0eb02d0dd7a632d200015aa0007621eadd) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs (.../DuneLocationCalculationsViewInfoTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) @@ -77,7 +77,7 @@ string viewName = info.GetViewName(null, context); // Assert - Assert.AreEqual($"Hydraulische belastingen - Categorie {categoryBoundaryName}", viewName); + Assert.AreEqual($"Hydraulische belastingen - {categoryBoundaryName}", viewName); mocks.VerifyAll(); } Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs =================================================================== diff -u -raac77dabbe6b2ef98dcd61bd84fc5f3efd06bded -rc17810351d2a429bfb308d7c1f854f535a00983e --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs (.../DuneLocationCalculationActivityFactoryTest.cs) (revision aac77dabbe6b2ef98dcd61bd84fc5f3efd06bded) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs (.../DuneLocationCalculationActivityFactoryTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) @@ -173,69 +173,69 @@ double mechanismSpecificFactorizedSignalingNorm = failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm); AssertDuneLocationCalculationActivity(activities[0], - "Iv->IIv", + "Categoriegrens Iv", duneLocation1.Name, duneLocation1.Id, mechanismSpecificFactorizedSignalingNorm, usePreprocessor); AssertDuneLocationCalculationActivity(activities[1], - "Iv->IIv", + "Categoriegrens Iv", duneLocation2.Name, duneLocation2.Id, mechanismSpecificFactorizedSignalingNorm, usePreprocessor); double mechanismSpecificSignalingNorm = failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificSignalingNorm); AssertDuneLocationCalculationActivity(activities[2], - "IIv->IIIv", + "Categoriegrens IIv", duneLocation1.Name, duneLocation1.Id, mechanismSpecificSignalingNorm, usePreprocessor); AssertDuneLocationCalculationActivity(activities[3], - "IIv->IIIv", + "Categoriegrens IIv", duneLocation2.Name, duneLocation2.Id, mechanismSpecificSignalingNorm, usePreprocessor); double mechanismSpecificLowerLimitNorm = failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm); AssertDuneLocationCalculationActivity(activities[4], - "IIIv->IVv", + "Categoriegrens IIIv", duneLocation1.Name, duneLocation1.Id, mechanismSpecificLowerLimitNorm, usePreprocessor); AssertDuneLocationCalculationActivity(activities[5], - "IIIv->IVv", + "Categoriegrens IIIv", duneLocation2.Name, duneLocation2.Id, mechanismSpecificLowerLimitNorm, usePreprocessor); double lowerLimitNorm = failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.LowerLimitNorm); AssertDuneLocationCalculationActivity(activities[6], - "IVv->Vv", + "Categoriegrens IVv", duneLocation1.Name, duneLocation1.Id, lowerLimitNorm, usePreprocessor); AssertDuneLocationCalculationActivity(activities[7], - "IVv->Vv", + "Categoriegrens IVv", duneLocation2.Name, duneLocation2.Id, lowerLimitNorm, usePreprocessor); double factorizedLowerLimitNorm = failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.FactorizedLowerLimitNorm); AssertDuneLocationCalculationActivity(activities[8], - "Vv->VIv", + "Categoriegrens Vv", duneLocation1.Name, duneLocation1.Id, factorizedLowerLimitNorm, usePreprocessor); AssertDuneLocationCalculationActivity(activities[9], - "Vv->VIv", + "Categoriegrens Vv", duneLocation2.Name, duneLocation2.Id, factorizedLowerLimitNorm, Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -r36af0dd60aa8c8e97cd35183f0355224109831c3 -rc17810351d2a429bfb308d7c1f854f535a00983e --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 36af0dd60aa8c8e97cd35183f0355224109831c3) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) @@ -172,7 +172,7 @@ IObservableEnumerable, DesignWaterLevelCalculationsView> { - GetViewName = (view, context) => $"{RingtoetsCommonFormsResources.WaterLevelCalculations_DisplayName} + {context.CategoryBoundaryName}", + GetViewName = (view, context) => $"{RingtoetsCommonFormsResources.WaterLevelCalculations_DisplayName} - {context.CategoryBoundaryName}", GetViewData = context => context.WrappedData, Image = RingtoetsCommonFormsResources.GenericInputOutputIcon, CreateInstance = context => new DesignWaterLevelCalculationsView(context.WrappedData, Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs =================================================================== diff -u -r7f82700e0d8246e4db3598222beafda406d03f77 -rc17810351d2a429bfb308d7c1f854f535a00983e --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs (.../GrassCoverErosionOutwardsWaveConditionsExporterTest.cs) (revision 7f82700e0d8246e4db3598222beafda406d03f77) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs (.../GrassCoverErosionOutwardsWaveConditionsExporterTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) @@ -177,7 +177,7 @@ Assert.IsTrue(File.Exists(filePath)); string fileContent = File.ReadAllText(filePath); string expectedText = $"Naam berekening, Naam HB locatie, X HB locatie (RD) [m], Y HB locatie (RD) [m], Naam voorlandprofiel, Dam gebruikt, Voorlandgeometrie gebruikt, Type bekleding, Categoriegrens, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]{Environment.NewLine}" + - $"aCalculation, aLocation, 44.000, 123.456, foreshoreA, nee, nee, Gras, IVv->Vv, 1.10, 2.20, 3.30, 4.40, 5.50{Environment.NewLine}"; + $"aCalculation, aLocation, 44.000, 123.456, foreshoreA, nee, nee, Gras, Categoriegrens IVv, 1.10, 2.20, 3.30, 4.40, 5.50{Environment.NewLine}"; Assert.AreEqual(expectedText, fileContent); } } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -re4e651ef6dc88bacd83779f7128206d9ee0bd836 -rc17810351d2a429bfb308d7c1f854f535a00983e --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision e4e651ef6dc88bacd83779f7128206d9ee0bd836) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) @@ -115,7 +115,7 @@ string nodeText = info.Text(context); // Assert - Assert.AreEqual("Categorie " + categoryBoundaryName, nodeText); + Assert.AreEqual(categoryBoundaryName, nodeText); } mockRepository.VerifyAll(); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da -rc17810351d2a429bfb308d7c1f854f535a00983e --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision 25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) @@ -375,15 +375,15 @@ const string calculationDisplayName = "Waterstand berekening"; HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Iv->IIv", msgs, 0); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens Iv", msgs, 0); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIv->IIIv", msgs, 8); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens IIv", msgs, 8); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIIv->IVv", msgs, 16); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens IIIv", msgs, 16); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IVv->Vv", msgs, 24); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens IVv", msgs, 24); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Vv->VIv", msgs, 32); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens Vv", msgs, 32); }); AssertHydraulicBoundaryLocationCalculationOutput(designWaterLevelCalculator, failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output); @@ -433,23 +433,23 @@ Assert.IsTrue(calculationsContexts.All(c => ReferenceEquals(assessmentSection, c.AssessmentSection))); Assert.IsTrue(calculationsContexts.All(c => ReferenceEquals(failureMechanism, c.FailureMechanism))); - Assert.AreEqual("Iv->IIv", calculationsContexts[0].CategoryBoundaryName); + Assert.AreEqual("Categoriegrens Iv", calculationsContexts[0].CategoryBoundaryName); Assert.AreSame(failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm, calculationsContexts[0].WrappedData); Assert.AreEqual(GetExpectedNorm(failureMechanism, () => signalingNorm / 30), calculationsContexts[0].GetNormFunc(), 1e-6); - Assert.AreEqual("IIv->IIIv", calculationsContexts[1].CategoryBoundaryName); + Assert.AreEqual("Categoriegrens IIv", calculationsContexts[1].CategoryBoundaryName); Assert.AreSame(failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm, calculationsContexts[1].WrappedData); Assert.AreEqual(GetExpectedNorm(failureMechanism, () => signalingNorm), calculationsContexts[1].GetNormFunc()); - Assert.AreEqual("IIIv->IVv", calculationsContexts[2].CategoryBoundaryName); + Assert.AreEqual("Categoriegrens IIIv", calculationsContexts[2].CategoryBoundaryName); Assert.AreSame(failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm, calculationsContexts[2].WrappedData); Assert.AreEqual(GetExpectedNorm(failureMechanism, () => lowerLimitNorm), calculationsContexts[2].GetNormFunc()); - Assert.AreEqual("IVv->Vv", calculationsContexts[3].CategoryBoundaryName); + Assert.AreEqual("Categoriegrens IVv", calculationsContexts[3].CategoryBoundaryName); Assert.AreSame(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, calculationsContexts[3].WrappedData); Assert.AreEqual(lowerLimitNorm, calculationsContexts[3].GetNormFunc()); - Assert.AreEqual("Vv->VIv", calculationsContexts[4].CategoryBoundaryName); + Assert.AreEqual("Categoriegrens Vv", calculationsContexts[4].CategoryBoundaryName); Assert.AreSame(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, calculationsContexts[4].WrappedData); Assert.AreEqual(lowerLimitNorm * 30, calculationsContexts[4].GetNormFunc()); } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rd68597572782f79b39b7d74844040cec22584b6d -rc17810351d2a429bfb308d7c1f854f535a00983e --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision d68597572782f79b39b7d74844040cec22584b6d) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) @@ -598,29 +598,29 @@ const string designWaterLevelCalculationDisplayName = "Waterstand berekening"; HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Iv->IIv", msgs, 0); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Categoriegrens Iv", msgs, 0); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "IIv->IIIv", msgs, 8); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Categoriegrens IIv", msgs, 8); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "IIIv->IVv", msgs, 16); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Categoriegrens IIIv", msgs, 16); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "IVv->Vv", msgs, 24); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Categoriegrens IVv", msgs, 24); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Vv->VIv", msgs, 32); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Categoriegrens Vv", msgs, 32); const string waveHeightCalculationTypeDisplayName = "Golfhoogte"; const string waveHeightCalculationDisplayName = "Golfhoogte berekening"; HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Iv->IIv", msgs, 40); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Categoriegrens Iv", msgs, 40); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "IIv->IIIv", msgs, 48); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Categoriegrens IIv", msgs, 48); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "IIIv->IVv", msgs, 56); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Categoriegrens IIIv", msgs, 56); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "IVv->Vv", msgs, 64); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Categoriegrens IVv", msgs, 64); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Vv->VIv", msgs, 72); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Categoriegrens Vv", 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 -r25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da -rc17810351d2a429bfb308d7c1f854f535a00983e --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision 25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) @@ -321,29 +321,29 @@ const string designWaterLevelCalculationDisplayName = "Waterstand berekening"; HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Iv->IIv", msgs, 0); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Categoriegrens Iv", msgs, 0); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "IIv->IIIv", msgs, 8); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Categoriegrens IIv", msgs, 8); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "IIIv->IVv", msgs, 16); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Categoriegrens IIIv", msgs, 16); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "IVv->Vv", msgs, 24); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Categoriegrens IVv", msgs, 24); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Vv->VIv", msgs, 32); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Categoriegrens Vv", msgs, 32); const string waveHeightCalculationTypeDisplayName = "Golfhoogte"; const string waveHeightCalculationDisplayName = "Golfhoogte berekening"; HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Iv->IIv", msgs, 40); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Categoriegrens Iv", msgs, 40); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "IIv->IIIv", msgs, 48); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Categoriegrens IIv", msgs, 48); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "IIIv->IVv", msgs, 56); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Categoriegrens IIIv", msgs, 56); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "IVv->Vv", msgs, 64); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Categoriegrens IVv", msgs, 64); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Vv->VIv", msgs, 72); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Categoriegrens Vv", 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/GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -re4e651ef6dc88bacd83779f7128206d9ee0bd836 -rc17810351d2a429bfb308d7c1f854f535a00983e --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs) (revision e4e651ef6dc88bacd83779f7128206d9ee0bd836) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) @@ -111,7 +111,7 @@ string nodeText = info.Text(context); // Assert - Assert.AreEqual("Categorie " + categoryBoundaryName, nodeText); + Assert.AreEqual(categoryBoundaryName, nodeText); } mockRepository.VerifyAll(); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da -rc17810351d2a429bfb308d7c1f854f535a00983e --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs) (revision 25bf6e3f781ca5dec80f4fbf88ae640dbf40e2da) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) @@ -375,15 +375,15 @@ const string calculationDisplayName = "Golfhoogte berekening"; HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Iv->IIv", msgs, 0); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens Iv", msgs, 0); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIv->IIIv", msgs, 8); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens IIv", msgs, 8); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIIv->IVv", msgs, 16); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens IIIv", msgs, 16); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IVv->Vv", msgs, 24); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens IVv", msgs, 24); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Vv->VIv", msgs, 32); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens Vv", msgs, 32); }); AssertHydraulicBoundaryLocationCalculationOutput(waveHeightCalculator, failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output); @@ -433,23 +433,23 @@ Assert.IsTrue(calculationsContexts.All(c => ReferenceEquals(assessmentSection, c.AssessmentSection))); Assert.IsTrue(calculationsContexts.All(c => ReferenceEquals(failureMechanism, c.FailureMechanism))); - Assert.AreEqual("Iv->IIv", calculationsContexts[0].CategoryBoundaryName); + Assert.AreEqual("Categoriegrens Iv", calculationsContexts[0].CategoryBoundaryName); Assert.AreSame(failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm, calculationsContexts[0].WrappedData); Assert.AreEqual(GetExpectedNorm(failureMechanism, () => signalingNorm / 30), calculationsContexts[0].GetNormFunc(), 1e-6); - Assert.AreEqual("IIv->IIIv", calculationsContexts[1].CategoryBoundaryName); + Assert.AreEqual("Categoriegrens IIv", calculationsContexts[1].CategoryBoundaryName); Assert.AreSame(failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm, calculationsContexts[1].WrappedData); Assert.AreEqual(GetExpectedNorm(failureMechanism, () => signalingNorm), calculationsContexts[1].GetNormFunc()); - Assert.AreEqual("IIIv->IVv", calculationsContexts[2].CategoryBoundaryName); + Assert.AreEqual("Categoriegrens IIIv", calculationsContexts[2].CategoryBoundaryName); Assert.AreSame(failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm, calculationsContexts[2].WrappedData); Assert.AreEqual(GetExpectedNorm(failureMechanism, () => lowerLimitNorm), calculationsContexts[2].GetNormFunc()); - Assert.AreEqual("IVv->Vv", calculationsContexts[3].CategoryBoundaryName); + Assert.AreEqual("Categoriegrens IVv", calculationsContexts[3].CategoryBoundaryName); Assert.AreSame(assessmentSection.WaveHeightCalculationsForLowerLimitNorm, calculationsContexts[3].WrappedData); Assert.AreEqual(lowerLimitNorm, calculationsContexts[3].GetNormFunc()); - Assert.AreEqual("Vv->VIv", calculationsContexts[4].CategoryBoundaryName); + Assert.AreEqual("Categoriegrens Vv", calculationsContexts[4].CategoryBoundaryName); Assert.AreSame(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, calculationsContexts[4].WrappedData); Assert.AreEqual(lowerLimitNorm * 30, calculationsContexts[4].GetNormFunc()); } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs =================================================================== diff -u -r5d13bf8acfe93e7edaeae98d7ef0c0978a74aae2 -rc17810351d2a429bfb308d7c1f854f535a00983e --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs) (revision 5d13bf8acfe93e7edaeae98d7ef0c0978a74aae2) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) @@ -164,7 +164,7 @@ string name = info.GetViewName(null, context); // Assert - Assert.AreEqual($"Waterstanden - Categorie {categoryBoundaryName}", name); + Assert.AreEqual($"Waterstanden - {categoryBoundaryName}", name); mocks.VerifyAll(); } } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs =================================================================== diff -u -r6df6afb7996de2e8e5af761982e2cd34bf02a4a2 -rc17810351d2a429bfb308d7c1f854f535a00983e --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs) (revision 6df6afb7996de2e8e5af761982e2cd34bf02a4a2) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) @@ -160,7 +160,7 @@ string name = info.GetViewName(null, context); // Assert - Assert.AreEqual($"Golfhoogten - Categorie {categoryBoundaryName}", name); + Assert.AreEqual($"Golfhoogten - {categoryBoundaryName}", name); } } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs =================================================================== diff -u -r74d0528380e5607f4d2646b8b7daf40acad6e3f6 -rc17810351d2a429bfb308d7c1f854f535a00983e --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs (.../GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs) (revision 74d0528380e5607f4d2646b8b7daf40acad6e3f6) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs (.../GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) @@ -120,46 +120,46 @@ AssertDesignWaterLevelCalculationActivity(activities.First(), hydraulicBoundaryLocation, mechanismSpecificFactorizedSignalingNorm, - "Iv->IIv"); + "Categoriegrens Iv"); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(1), hydraulicBoundaryLocation, mechanismSpecificSignalingNorm, - "IIv->IIIv"); + "Categoriegrens IIv"); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(2), hydraulicBoundaryLocation, mechanismSpecificLowerLimitNorm, - "IIIv->IVv"); + "Categoriegrens IIIv"); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(3), hydraulicBoundaryLocation, lowerLimitNorm, - "IVv->Vv"); + "Categoriegrens IVv"); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(4), hydraulicBoundaryLocation, factorizedLowerLimitNorm, - "Vv->VIv"); + "Categoriegrens Vv"); AssertWaveHeightCalculationActivity(activities.ElementAt(5), hydraulicBoundaryLocation, mechanismSpecificFactorizedSignalingNorm, - "Iv->IIv"); + "Categoriegrens Iv"); AssertWaveHeightCalculationActivity(activities.ElementAt(6), hydraulicBoundaryLocation, mechanismSpecificSignalingNorm, - "IIv->IIIv"); + "Categoriegrens IIv"); AssertWaveHeightCalculationActivity(activities.ElementAt(7), hydraulicBoundaryLocation, mechanismSpecificLowerLimitNorm, - "IIIv->IVv"); + "Categoriegrens IIIv"); AssertWaveHeightCalculationActivity(activities.ElementAt(8), hydraulicBoundaryLocation, lowerLimitNorm, - "IVv->Vv"); + "Categoriegrens IVv"); AssertWaveHeightCalculationActivity(activities.ElementAt(9), hydraulicBoundaryLocation, factorizedLowerLimitNorm, - "Vv->VIv"); + "Categoriegrens Vv"); var hydraulicBoundaryLocationCalculationOutput = new TestHydraulicBoundaryLocationCalculationOutput(2.0); failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output = hydraulicBoundaryLocationCalculationOutput; @@ -237,30 +237,30 @@ AssertDesignWaterLevelCalculationActivity(activities.First(), hydraulicBoundaryLocation, mechanismSpecificFactorizedSignalingNorm, - "Iv->IIv"); + "Categoriegrens Iv"); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(1), hydraulicBoundaryLocation, mechanismSpecificSignalingNorm, - "IIv->IIIv"); + "Categoriegrens IIv"); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(2), hydraulicBoundaryLocation, mechanismSpecificLowerLimitNorm, - "IIIv->IVv"); + "Categoriegrens IIIv"); AssertWaveHeightCalculationActivity(activities.ElementAt(3), hydraulicBoundaryLocation, mechanismSpecificFactorizedSignalingNorm, - "Iv->IIv"); + "Categoriegrens Iv"); AssertWaveHeightCalculationActivity(activities.ElementAt(4), hydraulicBoundaryLocation, mechanismSpecificSignalingNorm, - "IIv->IIIv"); + "Categoriegrens IIv"); AssertWaveHeightCalculationActivity(activities.ElementAt(5), hydraulicBoundaryLocation, mechanismSpecificLowerLimitNorm, - "IIIv->IVv"); + "Categoriegrens IIIv"); var hydraulicBoundaryLocationCalculationOutput = new TestHydraulicBoundaryLocationCalculationOutput(2.0); failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output = hydraulicBoundaryLocationCalculationOutput; @@ -581,51 +581,51 @@ AssertDesignWaterLevelCalculationActivity(activities.First(), hydraulicBoundaryLocation1, mechanismSpecificFactorizedSignalingNorm, - "Iv->IIv"); + "Categoriegrens Iv"); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(1), hydraulicBoundaryLocation2, mechanismSpecificFactorizedSignalingNorm, - "Iv->IIv"); + "Categoriegrens Iv"); double mechanismSpecificSignalingNorm = GetExpectedNorm(failureMechanism, assessmentSection.FailureMechanismContribution.SignalingNorm); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(2), hydraulicBoundaryLocation1, mechanismSpecificSignalingNorm, - "IIv->IIIv"); + "Categoriegrens IIv"); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(3), hydraulicBoundaryLocation2, mechanismSpecificSignalingNorm, - "IIv->IIIv"); + "Categoriegrens IIv"); double mechanismSpecificLowerLimitNorm = GetExpectedNorm(failureMechanism, assessmentSection.FailureMechanismContribution.LowerLimitNorm); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(4), hydraulicBoundaryLocation1, mechanismSpecificLowerLimitNorm, - "IIIv->IVv"); + "Categoriegrens IIIv"); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(5), hydraulicBoundaryLocation2, mechanismSpecificLowerLimitNorm, - "IIIv->IVv"); + "Categoriegrens IIIv"); double lowerLimitNorm = assessmentSection.FailureMechanismContribution.LowerLimitNorm; AssertDesignWaterLevelCalculationActivity(activities.ElementAt(6), hydraulicBoundaryLocation1, lowerLimitNorm, - "IVv->Vv"); + "Categoriegrens IVv"); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(7), hydraulicBoundaryLocation2, lowerLimitNorm, - "IVv->Vv"); + "Categoriegrens IVv"); double factorizedLowerLimitNorm = lowerLimitNorm * 30; AssertDesignWaterLevelCalculationActivity(activities.ElementAt(8), hydraulicBoundaryLocation1, factorizedLowerLimitNorm, - "Vv->VIv"); + "Categoriegrens Vv"); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(9), hydraulicBoundaryLocation2, factorizedLowerLimitNorm, - "Vv->VIv"); + "Categoriegrens Vv"); } [Test] @@ -694,51 +694,51 @@ AssertWaveHeightCalculationActivity(activities.First(), hydraulicBoundaryLocation1, mechanismSpecificFactorizedSignalingNorm, - "Iv->IIv"); + "Categoriegrens Iv"); AssertWaveHeightCalculationActivity(activities.ElementAt(1), hydraulicBoundaryLocation2, mechanismSpecificFactorizedSignalingNorm, - "Iv->IIv"); + "Categoriegrens Iv"); double mechanismSpecificSignalingNorm = GetExpectedNorm(failureMechanism, assessmentSection.FailureMechanismContribution.SignalingNorm); AssertWaveHeightCalculationActivity(activities.ElementAt(2), hydraulicBoundaryLocation1, mechanismSpecificSignalingNorm, - "IIv->IIIv"); + "Categoriegrens IIv"); AssertWaveHeightCalculationActivity(activities.ElementAt(3), hydraulicBoundaryLocation2, mechanismSpecificSignalingNorm, - "IIv->IIIv"); + "Categoriegrens IIv"); double mechanismSpecificLowerLimitNorm = GetExpectedNorm(failureMechanism, assessmentSection.FailureMechanismContribution.LowerLimitNorm); AssertWaveHeightCalculationActivity(activities.ElementAt(4), hydraulicBoundaryLocation1, mechanismSpecificLowerLimitNorm, - "IIIv->IVv"); + "Categoriegrens IIIv"); AssertWaveHeightCalculationActivity(activities.ElementAt(5), hydraulicBoundaryLocation2, mechanismSpecificLowerLimitNorm, - "IIIv->IVv"); + "Categoriegrens IIIv"); double lowerLimitNorm = assessmentSection.FailureMechanismContribution.LowerLimitNorm; AssertWaveHeightCalculationActivity(activities.ElementAt(6), hydraulicBoundaryLocation1, lowerLimitNorm, - "IVv->Vv"); + "Categoriegrens IVv"); AssertWaveHeightCalculationActivity(activities.ElementAt(7), hydraulicBoundaryLocation2, lowerLimitNorm, - "IVv->Vv"); + "Categoriegrens IVv"); double factorizedLowerLimitNorm = lowerLimitNorm * 30; AssertWaveHeightCalculationActivity(activities.ElementAt(8), hydraulicBoundaryLocation1, factorizedLowerLimitNorm, - "Vv->VIv"); + "Categoriegrens Vv"); AssertWaveHeightCalculationActivity(activities.ElementAt(9), hydraulicBoundaryLocation2, factorizedLowerLimitNorm, - "Vv->VIv"); + "Categoriegrens Vv"); } private static void AssertDesignWaterLevelCalculationActivity(Activity activity, Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -rb9ae753b52b2b198f264bd2f825d4a66305ad5c9 -rc17810351d2a429bfb308d7c1f854f535a00983e --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision b9ae753b52b2b198f264bd2f825d4a66305ad5c9) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) @@ -111,7 +111,7 @@ string text = info.Text(context); // Assert - Assert.AreEqual("Categorie " + categoryBoundaryName, text); + Assert.AreEqual(categoryBoundaryName, text); } mockRepository.VerifyAll(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -rb9ae753b52b2b198f264bd2f825d4a66305ad5c9 -rc17810351d2a429bfb308d7c1f854f535a00983e --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsContextTreeNodeInfoTest.cs) (revision b9ae753b52b2b198f264bd2f825d4a66305ad5c9) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsContextTreeNodeInfoTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) @@ -111,7 +111,7 @@ string text = info.Text(context); // Assert - Assert.AreEqual("Categorie " + categoryBoundaryName, text); + Assert.AreEqual(categoryBoundaryName, text); } mockRepository.VerifyAll(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelCalculationsViewInfoTest.cs =================================================================== diff -u -r23c940f51a71d2130a7539d5cf418aa19e6cda6e -rc17810351d2a429bfb308d7c1f854f535a00983e --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelCalculationsViewInfoTest.cs (.../DesignWaterLevelCalculationsViewInfoTest.cs) (revision 23c940f51a71d2130a7539d5cf418aa19e6cda6e) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelCalculationsViewInfoTest.cs (.../DesignWaterLevelCalculationsViewInfoTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) @@ -82,7 +82,7 @@ string viewName = info.GetViewName(null, context); // Assert - Assert.AreEqual($"Waterstanden - Categorie {categoryBoundaryName}", viewName); + Assert.AreEqual($"Waterstanden - {categoryBoundaryName}", viewName); } [Test] Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsViewInfoTest.cs =================================================================== diff -u -r6df6afb7996de2e8e5af761982e2cd34bf02a4a2 -rc17810351d2a429bfb308d7c1f854f535a00983e --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsViewInfoTest.cs (.../WaveHeightCalculationsViewInfoTest.cs) (revision 6df6afb7996de2e8e5af761982e2cd34bf02a4a2) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsViewInfoTest.cs (.../WaveHeightCalculationsViewInfoTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) @@ -82,7 +82,7 @@ string viewName = info.GetViewName(null, context); // Assert - Assert.AreEqual($"Golfhoogten - Categorie {categoryBoundaryName}", viewName); + Assert.AreEqual($"Golfhoogten - {categoryBoundaryName}", viewName); } [Test] Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditions/ExportableWaveConditionsFactoryTest.cs =================================================================== diff -u -rc393fd833b822c93b77a888a499d4f7259b078fc -rc17810351d2a429bfb308d7c1f854f535a00983e --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditions/ExportableWaveConditionsFactoryTest.cs (.../ExportableWaveConditionsFactoryTest.cs) (revision c393fd833b822c93b77a888a499d4f7259b078fc) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditions/ExportableWaveConditionsFactoryTest.cs (.../ExportableWaveConditionsFactoryTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) @@ -226,7 +226,7 @@ Assert.AreEqual(false, exportableWaveConditions.UseBreakWater); Assert.AreEqual(true, exportableWaveConditions.UseForeshore); Assert.AreEqual(CoverType.Grass, exportableWaveConditions.CoverType); - Assert.AreEqual("Iv->IIv", exportableWaveConditions.CategoryBoundaryName); + Assert.AreEqual("Categoriegrens Iv", exportableWaveConditions.CategoryBoundaryName); Assert.AreEqual(2, exportableWaveConditions.WaterLevel.NumberOfDecimalPlaces); Assert.AreEqual(2, exportableWaveConditions.WaveHeight.NumberOfDecimalPlaces); Assert.AreEqual(2, exportableWaveConditions.WavePeriod.NumberOfDecimalPlaces);