Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs =================================================================== diff -u -rfd449c3c338407f419fbc0a3ad4c1ec29e56a18b -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision fd449c3c338407f419fbc0a3ad4c1ec29e56a18b) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2017. All rights reserved. +// Copyright (C) Stichting Deltares 2017. All rights reserved. // // This file is part of Ringtoets. // @@ -92,7 +92,7 @@ } /// - /// Looks up a localized string similar to Categoriegrens C. + /// Looks up a localized string similar to C. /// public static string AssessmentSectionCategoryType_FactorizedLowerLimitNorm_DisplayName { get { @@ -101,7 +101,7 @@ } /// - /// Looks up a localized string similar to Categoriegrens A+. + /// Looks up a localized string similar to A+. /// public static string AssessmentSectionCategoryType_FactorizedSignalingNorm_DisplayName { get { @@ -110,7 +110,7 @@ } /// - /// Looks up a localized string similar to Categoriegrens B. + /// Looks up a localized string similar to B. /// public static string AssessmentSectionCategoryType_LowerLimitNorm_DisplayName { get { @@ -119,7 +119,7 @@ } /// - /// Looks up a localized string similar to Categoriegrens A. + /// Looks up a localized string similar to A. /// public static string AssessmentSectionCategoryType_SignalingNorm_DisplayName { get { @@ -443,7 +443,7 @@ } /// - /// Looks up a localized string similar to Categoriegrens Vv. + /// Looks up a localized string similar to Vv. /// public static string FailureMechanismCategoryType_FactorizedLowerLimitNorm_DisplayName { get { @@ -452,7 +452,7 @@ } /// - /// Looks up a localized string similar to Categoriegrens IVv. + /// Looks up a localized string similar to IVv. /// public static string FailureMechanismCategoryType_LowerLimitNorm_DisplayName { get { @@ -461,7 +461,7 @@ } /// - /// Looks up a localized string similar to Categoriegrens Iv. + /// Looks up a localized string similar to Iv. /// public static string FailureMechanismCategoryType_MechanismSpecificFactorizedSignalingNorm_DisplayName { get { @@ -471,7 +471,7 @@ } /// - /// Looks up a localized string similar to Categoriegrens IIIv. + /// Looks up a localized string similar to IIIv. /// public static string FailureMechanismCategoryType_MechanismSpecificLowerLimitNorm_DisplayName { get { @@ -480,7 +480,7 @@ } /// - /// Looks up a localized string similar to Categoriegrens IIv. + /// Looks up a localized string similar to IIv. /// public static string FailureMechanismCategoryType_MechanismSpecificSignalingNorm_DisplayName { get { @@ -574,7 +574,7 @@ } /// - /// Looks up a localized string similar to Categorie {0}. + /// Looks up a localized string similar to Categoriegrens {0}. /// public static string Hydraulic_category_boundary_0_ { get { Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx =================================================================== diff -u -rfd449c3c338407f419fbc0a3ad4c1ec29e56a18b -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision fd449c3c338407f419fbc0a3ad4c1ec29e56a18b) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -388,34 +388,34 @@ De waarde voor 'a' moet in het bereik {0} liggen. - Categoriegrens A+ + A+ - Categoriegrens A + A - Categoriegrens B + B - Categoriegrens C + C - Categoriegrens Iv + Iv - Categoriegrens IIv + IIv - Categoriegrens IIIv + IIIv - Categoriegrens IVv + IVv - Categoriegrens Vv + Vv - Categorie {0} + Categoriegrens {0} Voor een of meerdere vakken kan geen resultaat worden bepaald. Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/AssessmentSectionCategoryTypeTest.cs =================================================================== diff -u -rc393fd833b822c93b77a888a499d4f7259b078fc -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/AssessmentSectionCategoryTypeTest.cs (.../AssessmentSectionCategoryTypeTest.cs) (revision c393fd833b822c93b77a888a499d4f7259b078fc) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/AssessmentSectionCategoryTypeTest.cs (.../AssessmentSectionCategoryTypeTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -36,16 +36,16 @@ return new Dictionary { { - AssessmentSectionCategoryType.FactorizedSignalingNorm, "Categoriegrens A+" + AssessmentSectionCategoryType.FactorizedSignalingNorm, "A+" }, { - AssessmentSectionCategoryType.SignalingNorm, "Categoriegrens A" + AssessmentSectionCategoryType.SignalingNorm, "A" }, { - AssessmentSectionCategoryType.LowerLimitNorm, "Categoriegrens B" + AssessmentSectionCategoryType.LowerLimitNorm, "B" }, { - AssessmentSectionCategoryType.FactorizedLowerLimitNorm, "Categoriegrens C" + AssessmentSectionCategoryType.FactorizedLowerLimitNorm, "C" } }; } Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismCategoryTypeTest.cs =================================================================== diff -u -rc17810351d2a429bfb308d7c1f854f535a00983e -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismCategoryTypeTest.cs (.../FailureMechanismCategoryTypeTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismCategoryTypeTest.cs (.../FailureMechanismCategoryTypeTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -36,19 +36,19 @@ return new Dictionary { { - FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm, "Categoriegrens Iv" + FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm, "Iv" }, { - FailureMechanismCategoryType.MechanismSpecificSignalingNorm, "Categoriegrens IIv" + FailureMechanismCategoryType.MechanismSpecificSignalingNorm, "IIv" }, { - FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm, "Categoriegrens IIIv" + FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm, "IIIv" }, { - FailureMechanismCategoryType.LowerLimitNorm, "Categoriegrens IVv" + FailureMechanismCategoryType.LowerLimitNorm, "IVv" }, { - FailureMechanismCategoryType.FactorizedLowerLimitNorm, "Categoriegrens Vv" + FailureMechanismCategoryType.FactorizedLowerLimitNorm, "Vv" } }; } Index: Ringtoets/Common/test/Ringtoets.Common.Plugin.Test/RingtoetsPluginHelperTest.cs =================================================================== diff -u -rfd449c3c338407f419fbc0a3ad4c1ec29e56a18b -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/Common/test/Ringtoets.Common.Plugin.Test/RingtoetsPluginHelperTest.cs (.../RingtoetsPluginHelperTest.cs) (revision fd449c3c338407f419fbc0a3ad4c1ec29e56a18b) +++ Ringtoets/Common/test/Ringtoets.Common.Plugin.Test/RingtoetsPluginHelperTest.cs (.../RingtoetsPluginHelperTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -55,7 +55,7 @@ string formattedCategoryBoundaryName = RingtoetsPluginHelper.FormatCategoryBoundaryName(categoryBoundaryName); // Assert - Assert.AreEqual("Categorie " + categoryBoundaryName, formattedCategoryBoundaryName); + Assert.AreEqual("Categoriegrens " + categoryBoundaryName, formattedCategoryBoundaryName); } [TestFixture] Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rc17810351d2a429bfb308d7c1f854f535a00983e -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs (.../DuneErosionFailureMechanismContextTreeNodeInfoTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs (.../DuneErosionFailureMechanismContextTreeNodeInfoTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -549,15 +549,15 @@ const string calculationDisplayName = "Hydraulische belastingenberekening"; HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens Iv", msgs, 0); + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Iv", msgs, 0); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens IIv", msgs, 8); + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIv", msgs, 8); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens IIIv", msgs, 16); + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIIv", msgs, 16); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens IVv", msgs, 24); + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IVv", msgs, 24); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens Vv", msgs, 32); + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Vv", msgs, 32); }); } } Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -rfd449c3c338407f419fbc0a3ad4c1ec29e56a18b -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsContextTreeNodeInfoTest.cs) (revision fd449c3c338407f419fbc0a3ad4c1ec29e56a18b) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsContextTreeNodeInfoTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -122,7 +122,7 @@ string text = info.Text(context); // Assert - Assert.AreEqual($"Categorie {categoryBoundaryName}", text); + Assert.AreEqual($"Categoriegrens {categoryBoundaryName}", text); } [Test] Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rc17810351d2a429bfb308d7c1f854f535a00983e -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -251,23 +251,23 @@ Assert.IsTrue(calculationsContexts.All(c => ReferenceEquals(assessmentSection, c.AssessmentSection))); Assert.IsTrue(calculationsContexts.All(c => ReferenceEquals(failureMechanism, c.FailureMechanism))); - Assert.AreEqual("Categoriegrens Iv", calculationsContexts[0].CategoryBoundaryName); + Assert.AreEqual("Iv", calculationsContexts[0].CategoryBoundaryName); Assert.AreSame(failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm, calculationsContexts[0].WrappedData); Assert.AreEqual(GetExpectedNorm(failureMechanism, signalingNorm / 30), calculationsContexts[0].GetNormFunc(), 1e-6); - Assert.AreEqual("Categoriegrens IIv", calculationsContexts[1].CategoryBoundaryName); + Assert.AreEqual("IIv", calculationsContexts[1].CategoryBoundaryName); Assert.AreSame(failureMechanism.CalculationsForMechanismSpecificSignalingNorm, calculationsContexts[1].WrappedData); Assert.AreEqual(GetExpectedNorm(failureMechanism, signalingNorm), calculationsContexts[1].GetNormFunc(), 1e-6); - Assert.AreEqual("Categoriegrens IIIv", calculationsContexts[2].CategoryBoundaryName); + Assert.AreEqual("IIIv", calculationsContexts[2].CategoryBoundaryName); Assert.AreSame(failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm, calculationsContexts[2].WrappedData); Assert.AreEqual(GetExpectedNorm(failureMechanism, lowerLimitNorm), calculationsContexts[2].GetNormFunc(), 1e-6); - Assert.AreEqual("Categoriegrens IVv", calculationsContexts[3].CategoryBoundaryName); + Assert.AreEqual("IVv", calculationsContexts[3].CategoryBoundaryName); Assert.AreSame(failureMechanism.CalculationsForLowerLimitNorm, calculationsContexts[3].WrappedData); Assert.AreEqual(failureMechanismSpecificNormFactor * lowerLimitNorm, calculationsContexts[3].GetNormFunc(), 1e-6); - Assert.AreEqual("Categoriegrens Vv", calculationsContexts[4].CategoryBoundaryName); + Assert.AreEqual("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, "Categoriegrens Iv", msgs, 0); + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Iv", msgs, 0); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens IIv", msgs, 8); + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIv", msgs, 8); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens IIIv", msgs, 16); + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIIv", msgs, 16); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens IVv", msgs, 24); + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IVv", msgs, 24); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens Vv", msgs, 32); + duneLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Vv", msgs, 32); }); } } Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs =================================================================== diff -u -rfd449c3c338407f419fbc0a3ad4c1ec29e56a18b -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs (.../DuneLocationCalculationsViewInfoTest.cs) (revision fd449c3c338407f419fbc0a3ad4c1ec29e56a18b) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs (.../DuneLocationCalculationsViewInfoTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -77,7 +77,7 @@ string viewName = info.GetViewName(null, context); // Assert - Assert.AreEqual($"Hydraulische belastingen - Categorie {categoryBoundaryName}", viewName); + Assert.AreEqual($"Hydraulische belastingen - Categoriegrens {categoryBoundaryName}", viewName); mocks.VerifyAll(); } Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs =================================================================== diff -u -rc17810351d2a429bfb308d7c1f854f535a00983e -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs (.../DuneLocationCalculationActivityFactoryTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs (.../DuneLocationCalculationActivityFactoryTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -173,69 +173,69 @@ double mechanismSpecificFactorizedSignalingNorm = failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm); AssertDuneLocationCalculationActivity(activities[0], - "Categoriegrens Iv", + "Iv", duneLocation1.Name, duneLocation1.Id, mechanismSpecificFactorizedSignalingNorm, usePreprocessor); AssertDuneLocationCalculationActivity(activities[1], - "Categoriegrens Iv", + "Iv", duneLocation2.Name, duneLocation2.Id, mechanismSpecificFactorizedSignalingNorm, usePreprocessor); double mechanismSpecificSignalingNorm = failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificSignalingNorm); AssertDuneLocationCalculationActivity(activities[2], - "Categoriegrens IIv", + "IIv", duneLocation1.Name, duneLocation1.Id, mechanismSpecificSignalingNorm, usePreprocessor); AssertDuneLocationCalculationActivity(activities[3], - "Categoriegrens IIv", + "IIv", duneLocation2.Name, duneLocation2.Id, mechanismSpecificSignalingNorm, usePreprocessor); double mechanismSpecificLowerLimitNorm = failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm); AssertDuneLocationCalculationActivity(activities[4], - "Categoriegrens IIIv", + "IIIv", duneLocation1.Name, duneLocation1.Id, mechanismSpecificLowerLimitNorm, usePreprocessor); AssertDuneLocationCalculationActivity(activities[5], - "Categoriegrens IIIv", + "IIIv", duneLocation2.Name, duneLocation2.Id, mechanismSpecificLowerLimitNorm, usePreprocessor); double lowerLimitNorm = failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.LowerLimitNorm); AssertDuneLocationCalculationActivity(activities[6], - "Categoriegrens IVv", + "IVv", duneLocation1.Name, duneLocation1.Id, lowerLimitNorm, usePreprocessor); AssertDuneLocationCalculationActivity(activities[7], - "Categoriegrens IVv", + "IVv", duneLocation2.Name, duneLocation2.Id, lowerLimitNorm, usePreprocessor); double factorizedLowerLimitNorm = failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.FactorizedLowerLimitNorm); AssertDuneLocationCalculationActivity(activities[8], - "Categoriegrens Vv", + "Vv", duneLocation1.Name, duneLocation1.Id, factorizedLowerLimitNorm, usePreprocessor); AssertDuneLocationCalculationActivity(activities[9], - "Categoriegrens Vv", + "Vv", duneLocation2.Name, duneLocation2.Id, factorizedLowerLimitNorm, Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs =================================================================== diff -u -rc17810351d2a429bfb308d7c1f854f535a00983e -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs (.../GrassCoverErosionOutwardsWaveConditionsExporterTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs (.../GrassCoverErosionOutwardsWaveConditionsExporterTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -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, Categoriegrens IVv, 1.10, 2.20, 3.30, 4.40, 5.50{Environment.NewLine}"; + $"aCalculation, aLocation, 44.000, 123.456, foreshoreA, nee, nee, Gras, 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 -rfd449c3c338407f419fbc0a3ad4c1ec29e56a18b -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision fd449c3c338407f419fbc0a3ad4c1ec29e56a18b) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -115,7 +115,7 @@ string nodeText = info.Text(context); // Assert - Assert.AreEqual($"Categorie {categoryBoundaryName}", nodeText); + Assert.AreEqual($"Categoriegrens {categoryBoundaryName}", nodeText); } mockRepository.VerifyAll(); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rc17810351d2a429bfb308d7c1f854f535a00983e -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -375,15 +375,15 @@ const string calculationDisplayName = "Waterstand berekening"; HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens Iv", msgs, 0); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Iv", msgs, 0); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens IIv", msgs, 8); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIv", msgs, 8); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens IIIv", msgs, 16); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIIv", msgs, 16); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens IVv", msgs, 24); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IVv", msgs, 24); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens Vv", msgs, 32); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "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("Categoriegrens Iv", calculationsContexts[0].CategoryBoundaryName); + Assert.AreEqual("Iv", calculationsContexts[0].CategoryBoundaryName); Assert.AreSame(failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm, calculationsContexts[0].WrappedData); Assert.AreEqual(GetExpectedNorm(failureMechanism, () => signalingNorm / 30), calculationsContexts[0].GetNormFunc(), 1e-6); - Assert.AreEqual("Categoriegrens IIv", calculationsContexts[1].CategoryBoundaryName); + Assert.AreEqual("IIv", calculationsContexts[1].CategoryBoundaryName); Assert.AreSame(failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm, calculationsContexts[1].WrappedData); Assert.AreEqual(GetExpectedNorm(failureMechanism, () => signalingNorm), calculationsContexts[1].GetNormFunc()); - Assert.AreEqual("Categoriegrens IIIv", calculationsContexts[2].CategoryBoundaryName); + Assert.AreEqual("IIIv", calculationsContexts[2].CategoryBoundaryName); Assert.AreSame(failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm, calculationsContexts[2].WrappedData); Assert.AreEqual(GetExpectedNorm(failureMechanism, () => lowerLimitNorm), calculationsContexts[2].GetNormFunc()); - Assert.AreEqual("Categoriegrens IVv", calculationsContexts[3].CategoryBoundaryName); + Assert.AreEqual("IVv", calculationsContexts[3].CategoryBoundaryName); Assert.AreSame(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, calculationsContexts[3].WrappedData); Assert.AreEqual(lowerLimitNorm, calculationsContexts[3].GetNormFunc()); - Assert.AreEqual("Categoriegrens Vv", calculationsContexts[4].CategoryBoundaryName); + Assert.AreEqual("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 -rc17810351d2a429bfb308d7c1f854f535a00983e -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -598,29 +598,29 @@ const string designWaterLevelCalculationDisplayName = "Waterstand berekening"; HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Categoriegrens Iv", msgs, 0); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Iv", msgs, 0); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Categoriegrens IIv", msgs, 8); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "IIv", msgs, 8); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Categoriegrens IIIv", msgs, 16); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "IIIv", msgs, 16); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Categoriegrens IVv", msgs, 24); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "IVv", msgs, 24); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Categoriegrens Vv", msgs, 32); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Vv", msgs, 32); const string waveHeightCalculationTypeDisplayName = "Golfhoogte"; const string waveHeightCalculationDisplayName = "Golfhoogte berekening"; HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Categoriegrens Iv", msgs, 40); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Iv", msgs, 40); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Categoriegrens IIv", msgs, 48); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "IIv", msgs, 48); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Categoriegrens IIIv", msgs, 56); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "IIIv", msgs, 56); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Categoriegrens IVv", msgs, 64); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "IVv", msgs, 64); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Categoriegrens Vv", msgs, 72); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "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 -rc17810351d2a429bfb308d7c1f854f535a00983e -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -321,29 +321,29 @@ const string designWaterLevelCalculationDisplayName = "Waterstand berekening"; HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Categoriegrens Iv", msgs, 0); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Iv", msgs, 0); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Categoriegrens IIv", msgs, 8); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "IIv", msgs, 8); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Categoriegrens IIIv", msgs, 16); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "IIIv", msgs, 16); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Categoriegrens IVv", msgs, 24); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "IVv", msgs, 24); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Categoriegrens Vv", msgs, 32); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Vv", msgs, 32); const string waveHeightCalculationTypeDisplayName = "Golfhoogte"; const string waveHeightCalculationDisplayName = "Golfhoogte berekening"; HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Categoriegrens Iv", msgs, 40); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Iv", msgs, 40); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Categoriegrens IIv", msgs, 48); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "IIv", msgs, 48); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Categoriegrens IIIv", msgs, 56); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "IIIv", msgs, 56); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Categoriegrens IVv", msgs, 64); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "IVv", msgs, 64); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Categoriegrens Vv", msgs, 72); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "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 -rfd449c3c338407f419fbc0a3ad4c1ec29e56a18b -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs) (revision fd449c3c338407f419fbc0a3ad4c1ec29e56a18b) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -111,7 +111,7 @@ string nodeText = info.Text(context); // Assert - Assert.AreEqual($"Categorie {categoryBoundaryName}", nodeText); + Assert.AreEqual($"Categoriegrens {categoryBoundaryName}", nodeText); } mockRepository.VerifyAll(); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rc17810351d2a429bfb308d7c1f854f535a00983e -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -375,15 +375,15 @@ const string calculationDisplayName = "Golfhoogte berekening"; HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens Iv", msgs, 0); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Iv", msgs, 0); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens IIv", msgs, 8); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIv", msgs, 8); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens IIIv", msgs, 16); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IIIv", msgs, 16); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens IVv", msgs, 24); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "IVv", msgs, 24); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens Vv", msgs, 32); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "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("Categoriegrens Iv", calculationsContexts[0].CategoryBoundaryName); + Assert.AreEqual("Iv", calculationsContexts[0].CategoryBoundaryName); Assert.AreSame(failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm, calculationsContexts[0].WrappedData); Assert.AreEqual(GetExpectedNorm(failureMechanism, () => signalingNorm / 30), calculationsContexts[0].GetNormFunc(), 1e-6); - Assert.AreEqual("Categoriegrens IIv", calculationsContexts[1].CategoryBoundaryName); + Assert.AreEqual("IIv", calculationsContexts[1].CategoryBoundaryName); Assert.AreSame(failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm, calculationsContexts[1].WrappedData); Assert.AreEqual(GetExpectedNorm(failureMechanism, () => signalingNorm), calculationsContexts[1].GetNormFunc()); - Assert.AreEqual("Categoriegrens IIIv", calculationsContexts[2].CategoryBoundaryName); + Assert.AreEqual("IIIv", calculationsContexts[2].CategoryBoundaryName); Assert.AreSame(failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm, calculationsContexts[2].WrappedData); Assert.AreEqual(GetExpectedNorm(failureMechanism, () => lowerLimitNorm), calculationsContexts[2].GetNormFunc()); - Assert.AreEqual("Categoriegrens IVv", calculationsContexts[3].CategoryBoundaryName); + Assert.AreEqual("IVv", calculationsContexts[3].CategoryBoundaryName); Assert.AreSame(assessmentSection.WaveHeightCalculationsForLowerLimitNorm, calculationsContexts[3].WrappedData); Assert.AreEqual(lowerLimitNorm, calculationsContexts[3].GetNormFunc()); - Assert.AreEqual("Categoriegrens Vv", calculationsContexts[4].CategoryBoundaryName); + Assert.AreEqual("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 -rfd449c3c338407f419fbc0a3ad4c1ec29e56a18b -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs) (revision fd449c3c338407f419fbc0a3ad4c1ec29e56a18b) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -164,7 +164,7 @@ string name = info.GetViewName(null, context); // Assert - Assert.AreEqual($"Waterstanden - Categorie {categoryBoundaryName}", name); + Assert.AreEqual($"Waterstanden - Categoriegrens {categoryBoundaryName}", name); mocks.VerifyAll(); } } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs =================================================================== diff -u -rfd449c3c338407f419fbc0a3ad4c1ec29e56a18b -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs) (revision fd449c3c338407f419fbc0a3ad4c1ec29e56a18b) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -160,7 +160,7 @@ string name = info.GetViewName(null, context); // Assert - Assert.AreEqual($"Golfhoogten - Categorie {categoryBoundaryName}", name); + Assert.AreEqual($"Golfhoogten - Categoriegrens {categoryBoundaryName}", name); } } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs =================================================================== diff -u -rc17810351d2a429bfb308d7c1f854f535a00983e -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs (.../GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs (.../GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -120,46 +120,46 @@ AssertDesignWaterLevelCalculationActivity(activities.First(), hydraulicBoundaryLocation, mechanismSpecificFactorizedSignalingNorm, - "Categoriegrens Iv"); + "Iv"); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(1), hydraulicBoundaryLocation, mechanismSpecificSignalingNorm, - "Categoriegrens IIv"); + "IIv"); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(2), hydraulicBoundaryLocation, mechanismSpecificLowerLimitNorm, - "Categoriegrens IIIv"); + "IIIv"); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(3), hydraulicBoundaryLocation, lowerLimitNorm, - "Categoriegrens IVv"); + "IVv"); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(4), hydraulicBoundaryLocation, factorizedLowerLimitNorm, - "Categoriegrens Vv"); + "Vv"); AssertWaveHeightCalculationActivity(activities.ElementAt(5), hydraulicBoundaryLocation, mechanismSpecificFactorizedSignalingNorm, - "Categoriegrens Iv"); + "Iv"); AssertWaveHeightCalculationActivity(activities.ElementAt(6), hydraulicBoundaryLocation, mechanismSpecificSignalingNorm, - "Categoriegrens IIv"); + "IIv"); AssertWaveHeightCalculationActivity(activities.ElementAt(7), hydraulicBoundaryLocation, mechanismSpecificLowerLimitNorm, - "Categoriegrens IIIv"); + "IIIv"); AssertWaveHeightCalculationActivity(activities.ElementAt(8), hydraulicBoundaryLocation, lowerLimitNorm, - "Categoriegrens IVv"); + "IVv"); AssertWaveHeightCalculationActivity(activities.ElementAt(9), hydraulicBoundaryLocation, factorizedLowerLimitNorm, - "Categoriegrens Vv"); + "Vv"); var hydraulicBoundaryLocationCalculationOutput = new TestHydraulicBoundaryLocationCalculationOutput(2.0); failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output = hydraulicBoundaryLocationCalculationOutput; @@ -237,30 +237,30 @@ AssertDesignWaterLevelCalculationActivity(activities.First(), hydraulicBoundaryLocation, mechanismSpecificFactorizedSignalingNorm, - "Categoriegrens Iv"); + "Iv"); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(1), hydraulicBoundaryLocation, mechanismSpecificSignalingNorm, - "Categoriegrens IIv"); + "IIv"); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(2), hydraulicBoundaryLocation, mechanismSpecificLowerLimitNorm, - "Categoriegrens IIIv"); + "IIIv"); AssertWaveHeightCalculationActivity(activities.ElementAt(3), hydraulicBoundaryLocation, mechanismSpecificFactorizedSignalingNorm, - "Categoriegrens Iv"); + "Iv"); AssertWaveHeightCalculationActivity(activities.ElementAt(4), hydraulicBoundaryLocation, mechanismSpecificSignalingNorm, - "Categoriegrens IIv"); + "IIv"); AssertWaveHeightCalculationActivity(activities.ElementAt(5), hydraulicBoundaryLocation, mechanismSpecificLowerLimitNorm, - "Categoriegrens IIIv"); + "IIIv"); var hydraulicBoundaryLocationCalculationOutput = new TestHydraulicBoundaryLocationCalculationOutput(2.0); failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output = hydraulicBoundaryLocationCalculationOutput; @@ -581,51 +581,51 @@ AssertDesignWaterLevelCalculationActivity(activities.First(), hydraulicBoundaryLocation1, mechanismSpecificFactorizedSignalingNorm, - "Categoriegrens Iv"); + "Iv"); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(1), hydraulicBoundaryLocation2, mechanismSpecificFactorizedSignalingNorm, - "Categoriegrens Iv"); + "Iv"); double mechanismSpecificSignalingNorm = GetExpectedNorm(failureMechanism, assessmentSection.FailureMechanismContribution.SignalingNorm); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(2), hydraulicBoundaryLocation1, mechanismSpecificSignalingNorm, - "Categoriegrens IIv"); + "IIv"); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(3), hydraulicBoundaryLocation2, mechanismSpecificSignalingNorm, - "Categoriegrens IIv"); + "IIv"); double mechanismSpecificLowerLimitNorm = GetExpectedNorm(failureMechanism, assessmentSection.FailureMechanismContribution.LowerLimitNorm); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(4), hydraulicBoundaryLocation1, mechanismSpecificLowerLimitNorm, - "Categoriegrens IIIv"); + "IIIv"); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(5), hydraulicBoundaryLocation2, mechanismSpecificLowerLimitNorm, - "Categoriegrens IIIv"); + "IIIv"); double lowerLimitNorm = assessmentSection.FailureMechanismContribution.LowerLimitNorm; AssertDesignWaterLevelCalculationActivity(activities.ElementAt(6), hydraulicBoundaryLocation1, lowerLimitNorm, - "Categoriegrens IVv"); + "IVv"); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(7), hydraulicBoundaryLocation2, lowerLimitNorm, - "Categoriegrens IVv"); + "IVv"); double factorizedLowerLimitNorm = lowerLimitNorm * 30; AssertDesignWaterLevelCalculationActivity(activities.ElementAt(8), hydraulicBoundaryLocation1, factorizedLowerLimitNorm, - "Categoriegrens Vv"); + "Vv"); AssertDesignWaterLevelCalculationActivity(activities.ElementAt(9), hydraulicBoundaryLocation2, factorizedLowerLimitNorm, - "Categoriegrens Vv"); + "Vv"); } [Test] @@ -694,51 +694,51 @@ AssertWaveHeightCalculationActivity(activities.First(), hydraulicBoundaryLocation1, mechanismSpecificFactorizedSignalingNorm, - "Categoriegrens Iv"); + "Iv"); AssertWaveHeightCalculationActivity(activities.ElementAt(1), hydraulicBoundaryLocation2, mechanismSpecificFactorizedSignalingNorm, - "Categoriegrens Iv"); + "Iv"); double mechanismSpecificSignalingNorm = GetExpectedNorm(failureMechanism, assessmentSection.FailureMechanismContribution.SignalingNorm); AssertWaveHeightCalculationActivity(activities.ElementAt(2), hydraulicBoundaryLocation1, mechanismSpecificSignalingNorm, - "Categoriegrens IIv"); + "IIv"); AssertWaveHeightCalculationActivity(activities.ElementAt(3), hydraulicBoundaryLocation2, mechanismSpecificSignalingNorm, - "Categoriegrens IIv"); + "IIv"); double mechanismSpecificLowerLimitNorm = GetExpectedNorm(failureMechanism, assessmentSection.FailureMechanismContribution.LowerLimitNorm); AssertWaveHeightCalculationActivity(activities.ElementAt(4), hydraulicBoundaryLocation1, mechanismSpecificLowerLimitNorm, - "Categoriegrens IIIv"); + "IIIv"); AssertWaveHeightCalculationActivity(activities.ElementAt(5), hydraulicBoundaryLocation2, mechanismSpecificLowerLimitNorm, - "Categoriegrens IIIv"); + "IIIv"); double lowerLimitNorm = assessmentSection.FailureMechanismContribution.LowerLimitNorm; AssertWaveHeightCalculationActivity(activities.ElementAt(6), hydraulicBoundaryLocation1, lowerLimitNorm, - "Categoriegrens IVv"); + "IVv"); AssertWaveHeightCalculationActivity(activities.ElementAt(7), hydraulicBoundaryLocation2, lowerLimitNorm, - "Categoriegrens IVv"); + "IVv"); double factorizedLowerLimitNorm = lowerLimitNorm * 30; AssertWaveHeightCalculationActivity(activities.ElementAt(8), hydraulicBoundaryLocation1, factorizedLowerLimitNorm, - "Categoriegrens Vv"); + "Vv"); AssertWaveHeightCalculationActivity(activities.ElementAt(9), hydraulicBoundaryLocation2, factorizedLowerLimitNorm, - "Categoriegrens Vv"); + "Vv"); } private static void AssertDesignWaterLevelCalculationActivity(Activity activity, Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -rfd449c3c338407f419fbc0a3ad4c1ec29e56a18b -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision fd449c3c338407f419fbc0a3ad4c1ec29e56a18b) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -111,7 +111,7 @@ string text = info.Text(context); // Assert - Assert.AreEqual($"Categorie {categoryBoundaryName}", text); + Assert.AreEqual($"Categoriegrens {categoryBoundaryName}", text); } mockRepository.VerifyAll(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rc393fd833b822c93b77a888a499d4f7259b078fc -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision c393fd833b822c93b77a888a499d4f7259b078fc) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -354,13 +354,13 @@ const string calculationDisplayName = "Waterstand berekening"; HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens A+", msgs, 0); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "A+", msgs, 0); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens A", msgs, 8); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "A", msgs, 8); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens B", msgs, 16); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "B", msgs, 16); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens C", msgs, 24); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "C", msgs, 24); }); AssertHydraulicBoundaryLocationCalculationOutput(designWaterLevelCalculator, assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.Single().Output); @@ -403,19 +403,19 @@ Assert.IsTrue(calculationsContexts.All(c => ReferenceEquals(assessmentSection, c.AssessmentSection))); - Assert.AreEqual("Categoriegrens A+", calculationsContexts[0].CategoryBoundaryName); + Assert.AreEqual("A+", calculationsContexts[0].CategoryBoundaryName); Assert.AreSame(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, calculationsContexts[0].WrappedData); Assert.AreEqual(signalingNorm / 30, calculationsContexts[0].GetNormFunc()); - Assert.AreEqual("Categoriegrens A", calculationsContexts[1].CategoryBoundaryName); + Assert.AreEqual("A", calculationsContexts[1].CategoryBoundaryName); Assert.AreSame(assessmentSection.WaterLevelCalculationsForSignalingNorm, calculationsContexts[1].WrappedData); Assert.AreEqual(signalingNorm, calculationsContexts[1].GetNormFunc()); - Assert.AreEqual("Categoriegrens B", calculationsContexts[2].CategoryBoundaryName); + Assert.AreEqual("B", calculationsContexts[2].CategoryBoundaryName); Assert.AreSame(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, calculationsContexts[2].WrappedData); Assert.AreEqual(lowerLimitNorm, calculationsContexts[2].GetNormFunc()); - Assert.AreEqual("Categoriegrens C", calculationsContexts[3].CategoryBoundaryName); + Assert.AreEqual("C", calculationsContexts[3].CategoryBoundaryName); Assert.AreSame(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, calculationsContexts[3].WrappedData); Assert.AreEqual(lowerLimitNorm * 30, calculationsContexts[3].GetNormFunc()); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs =================================================================== diff -u -rc393fd833b822c93b77a888a499d4f7259b078fc -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision c393fd833b822c93b77a888a499d4f7259b078fc) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -865,25 +865,25 @@ const string designWaterLevelCalculationDisplayName = "Waterstand berekening"; HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Categoriegrens A+", msgs, 0); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "A+", msgs, 0); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Categoriegrens A", msgs, 8); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "A", msgs, 8); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Categoriegrens B", msgs, 16); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "B", msgs, 16); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "Categoriegrens C", msgs, 24); + hydraulicBoundaryLocation.Name, designWaterLevelCalculationTypeDisplayName, designWaterLevelCalculationDisplayName, "C", msgs, 24); const string waveHeightCalculationTypeDisplayName = "Golfhoogte"; const string waveHeightCalculationDisplayName = "Golfhoogte berekening"; HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Categoriegrens A+", msgs, 32); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "A+", msgs, 32); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Categoriegrens A", msgs, 40); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "A", msgs, 40); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Categoriegrens B", msgs, 48); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "B", msgs, 48); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "Categoriegrens C", msgs, 56); + hydraulicBoundaryLocation.Name, waveHeightCalculationTypeDisplayName, waveHeightCalculationDisplayName, "C", msgs, 56); }); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -rfd449c3c338407f419fbc0a3ad4c1ec29e56a18b -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsContextTreeNodeInfoTest.cs) (revision fd449c3c338407f419fbc0a3ad4c1ec29e56a18b) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsContextTreeNodeInfoTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -111,7 +111,7 @@ string text = info.Text(context); // Assert - Assert.AreEqual($"Categorie {categoryBoundaryName}", text); + Assert.AreEqual($"Categoriegrens {categoryBoundaryName}", text); } mockRepository.VerifyAll(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rc393fd833b822c93b77a888a499d4f7259b078fc -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs) (revision c393fd833b822c93b77a888a499d4f7259b078fc) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -355,13 +355,13 @@ const string calculationDisplayName = "Golfhoogte berekening"; HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens A+", msgs, 0); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "A+", msgs, 0); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens A", msgs, 8); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "A", msgs, 8); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens B", msgs, 16); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "B", msgs, 16); HydraulicBoundaryLocationCalculationActivityLogTestHelper.AssertHydraulicBoundaryLocationCalculationMessages( - hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "Categoriegrens C", msgs, 24); + hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "C", msgs, 24); }); AssertHydraulicBoundaryLocationCalculationOutput(waveHeightCalculator, assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm.Single().Output); @@ -404,19 +404,19 @@ Assert.IsTrue(calculationsContexts.All(c => ReferenceEquals(assessmentSection, c.AssessmentSection))); - Assert.AreEqual("Categoriegrens A+", calculationsContexts[0].CategoryBoundaryName); + Assert.AreEqual("A+", calculationsContexts[0].CategoryBoundaryName); Assert.AreSame(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm, calculationsContexts[0].WrappedData); Assert.AreEqual(signalingNorm / 30, calculationsContexts[0].GetNormFunc()); - Assert.AreEqual("Categoriegrens A", calculationsContexts[1].CategoryBoundaryName); + Assert.AreEqual("A", calculationsContexts[1].CategoryBoundaryName); Assert.AreSame(assessmentSection.WaveHeightCalculationsForSignalingNorm, calculationsContexts[1].WrappedData); Assert.AreEqual(signalingNorm, calculationsContexts[1].GetNormFunc()); - Assert.AreEqual("Categoriegrens B", calculationsContexts[2].CategoryBoundaryName); + Assert.AreEqual("B", calculationsContexts[2].CategoryBoundaryName); Assert.AreSame(assessmentSection.WaveHeightCalculationsForLowerLimitNorm, calculationsContexts[2].WrappedData); Assert.AreEqual(lowerLimitNorm, calculationsContexts[2].GetNormFunc()); - Assert.AreEqual("Categoriegrens C", calculationsContexts[3].CategoryBoundaryName); + Assert.AreEqual("C", calculationsContexts[3].CategoryBoundaryName); Assert.AreSame(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, calculationsContexts[3].WrappedData); Assert.AreEqual(lowerLimitNorm * 30, calculationsContexts[3].GetNormFunc()); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelCalculationsViewInfoTest.cs =================================================================== diff -u -rfd449c3c338407f419fbc0a3ad4c1ec29e56a18b -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelCalculationsViewInfoTest.cs (.../DesignWaterLevelCalculationsViewInfoTest.cs) (revision fd449c3c338407f419fbc0a3ad4c1ec29e56a18b) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelCalculationsViewInfoTest.cs (.../DesignWaterLevelCalculationsViewInfoTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -82,7 +82,7 @@ string viewName = info.GetViewName(null, context); // Assert - Assert.AreEqual($"Waterstanden - Categorie {categoryBoundaryName}", viewName); + Assert.AreEqual($"Waterstanden - Categoriegrens {categoryBoundaryName}", viewName); } [Test] Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsViewInfoTest.cs =================================================================== diff -u -rfd449c3c338407f419fbc0a3ad4c1ec29e56a18b -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsViewInfoTest.cs (.../WaveHeightCalculationsViewInfoTest.cs) (revision fd449c3c338407f419fbc0a3ad4c1ec29e56a18b) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsViewInfoTest.cs (.../WaveHeightCalculationsViewInfoTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -82,7 +82,7 @@ string viewName = info.GetViewName(null, context); // Assert - Assert.AreEqual($"Golfhoogten - Categorie {categoryBoundaryName}", viewName); + Assert.AreEqual($"Golfhoogten - Categoriegrens {categoryBoundaryName}", viewName); } [Test] Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs =================================================================== diff -u -rc393fd833b822c93b77a888a499d4f7259b078fc -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs (.../AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs) (revision c393fd833b822c93b77a888a499d4f7259b078fc) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs (.../AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -40,10 +40,10 @@ [TestFixture] public class AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest { - private const string expectedCategoryBoundaryName1 = "Categoriegrens A+"; - private const string expectedCategoryBoundaryName2 = "Categoriegrens A"; - private const string expectedCategoryBoundaryName3 = "Categoriegrens B"; - private const string expectedCategoryBoundaryName4 = "Categoriegrens C"; + private const string expectedCategoryBoundaryName1 = "A+"; + private const string expectedCategoryBoundaryName2 = "A"; + private const string expectedCategoryBoundaryName3 = "B"; + private const string expectedCategoryBoundaryName4 = "C"; private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); private static readonly string validFilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite"); Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditions/ExportableWaveConditionsFactoryTest.cs =================================================================== diff -u -rc17810351d2a429bfb308d7c1f854f535a00983e -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditions/ExportableWaveConditionsFactoryTest.cs (.../ExportableWaveConditionsFactoryTest.cs) (revision c17810351d2a429bfb308d7c1f854f535a00983e) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditions/ExportableWaveConditionsFactoryTest.cs (.../ExportableWaveConditionsFactoryTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -146,7 +146,7 @@ Assert.AreEqual(false, exportableWaveConditions.UseBreakWater); Assert.AreEqual(true, exportableWaveConditions.UseForeshore); Assert.AreEqual(CoverType.StoneCoverColumns, exportableWaveConditions.CoverType); - Assert.AreEqual("Categoriegrens A", exportableWaveConditions.CategoryBoundaryName); + Assert.AreEqual("A", exportableWaveConditions.CategoryBoundaryName); Assert.AreEqual(2, exportableWaveConditions.WaterLevel.NumberOfDecimalPlaces); Assert.AreEqual(2, exportableWaveConditions.WaveHeight.NumberOfDecimalPlaces); Assert.AreEqual(2, exportableWaveConditions.WavePeriod.NumberOfDecimalPlaces); @@ -226,7 +226,7 @@ Assert.AreEqual(false, exportableWaveConditions.UseBreakWater); Assert.AreEqual(true, exportableWaveConditions.UseForeshore); Assert.AreEqual(CoverType.Grass, exportableWaveConditions.CoverType); - Assert.AreEqual("Categoriegrens Iv", exportableWaveConditions.CategoryBoundaryName); + Assert.AreEqual("Iv", exportableWaveConditions.CategoryBoundaryName); Assert.AreEqual(2, exportableWaveConditions.WaterLevel.NumberOfDecimalPlaces); Assert.AreEqual(2, exportableWaveConditions.WaveHeight.NumberOfDecimalPlaces); Assert.AreEqual(2, exportableWaveConditions.WavePeriod.NumberOfDecimalPlaces); @@ -306,7 +306,7 @@ Assert.AreEqual(false, exportableWaveConditions.UseBreakWater); Assert.AreEqual(true, exportableWaveConditions.UseForeshore); Assert.AreEqual(CoverType.Asphalt, exportableWaveConditions.CoverType); - Assert.AreEqual("Categoriegrens B", exportableWaveConditions.CategoryBoundaryName); + Assert.AreEqual("B", exportableWaveConditions.CategoryBoundaryName); Assert.AreEqual(2, exportableWaveConditions.WaterLevel.NumberOfDecimalPlaces); Assert.AreEqual(2, exportableWaveConditions.WaveHeight.NumberOfDecimalPlaces); Assert.AreEqual(2, exportableWaveConditions.WavePeriod.NumberOfDecimalPlaces); Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.IO.Test/Exporters/StabilityStoneCoverWaveConditionsExporterTest.cs =================================================================== diff -u -rc393fd833b822c93b77a888a499d4f7259b078fc -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.IO.Test/Exporters/StabilityStoneCoverWaveConditionsExporterTest.cs (.../StabilityStoneCoverWaveConditionsExporterTest.cs) (revision c393fd833b822c93b77a888a499d4f7259b078fc) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.IO.Test/Exporters/StabilityStoneCoverWaveConditionsExporterTest.cs (.../StabilityStoneCoverWaveConditionsExporterTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -173,8 +173,8 @@ 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, Steen (zuilen), Categoriegrens A, 1.10, 2.20, 3.30, 4.40, 5.50{Environment.NewLine}" + - $"aCalculation, aLocation, 44.000, 123.456, foreshoreA, nee, nee, Steen (blokken), Categoriegrens A, 1.10, 2.20, 3.30, 4.40, 5.50{Environment.NewLine}"; + $"aCalculation, aLocation, 44.000, 123.456, foreshoreA, nee, nee, Steen (zuilen), A, 1.10, 2.20, 3.30, 4.40, 5.50{Environment.NewLine}" + + $"aCalculation, aLocation, 44.000, 123.456, foreshoreA, nee, nee, Steen (blokken), A, 1.10, 2.20, 3.30, 4.40, 5.50{Environment.NewLine}"; Assert.AreEqual(expectedText, fileContent); } } Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.IO.Test/Exporters/WaveImpactAsphaltCoverWaveConditionsExporterTest.cs =================================================================== diff -u -rc393fd833b822c93b77a888a499d4f7259b078fc -ree314954d778270b8c41fc7ab1db663ab89566a1 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.IO.Test/Exporters/WaveImpactAsphaltCoverWaveConditionsExporterTest.cs (.../WaveImpactAsphaltCoverWaveConditionsExporterTest.cs) (revision c393fd833b822c93b77a888a499d4f7259b078fc) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.IO.Test/Exporters/WaveImpactAsphaltCoverWaveConditionsExporterTest.cs (.../WaveImpactAsphaltCoverWaveConditionsExporterTest.cs) (revision ee314954d778270b8c41fc7ab1db663ab89566a1) @@ -181,7 +181,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, Asfalt, Categoriegrens C, 1.10, 2.20, 3.30, 4.40, 5.50{Environment.NewLine}"; + $"aCalculation, aLocation, 44.000, 123.456, foreshoreA, nee, nee, Asfalt, C, 1.10, 2.20, 3.30, 4.40, 5.50{Environment.NewLine}"; Assert.AreEqual(expectedText, fileContent); } }