Index: Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/AssessmentSectionExtensions.cs =================================================================== diff -u -r7b7731a59cf0e7174ed0de97dac62c4252549580 -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/AssessmentSectionExtensions.cs (.../AssessmentSectionExtensions.cs) (revision 7b7731a59cf0e7174ed0de97dac62c4252549580) +++ Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/AssessmentSectionExtensions.cs (.../AssessmentSectionExtensions.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -123,10 +123,10 @@ switch (normType) { - case NormType.Signaling: + case NormType.SignalFloodingProbability: calculations = assessmentSection.WaterLevelCalculationsForSignalingNorm; break; - case NormType.LowerLimit: + case NormType.MaximumAllowableFloodingProbability: calculations = assessmentSection.WaterLevelCalculationsForLowerLimitNorm; break; default: Index: Riskeer/Common/src/Riskeer.Common.Data/Contribution/FailureMechanismContribution.cs =================================================================== diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Common/src/Riskeer.Common.Data/Contribution/FailureMechanismContribution.cs (.../FailureMechanismContribution.cs) (revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a) +++ Riskeer/Common/src/Riskeer.Common.Data/Contribution/FailureMechanismContribution.cs (.../FailureMechanismContribution.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -55,7 +55,7 @@ this.lowerLimitNorm = lowerLimitNorm; this.signalingNorm = signalingNorm; - NormativeNorm = NormType.LowerLimit; + NormativeNorm = NormType.MaximumAllowableFloodingProbability; } /// @@ -118,7 +118,7 @@ { get { - return NormativeNorm == NormType.LowerLimit + return NormativeNorm == NormType.MaximumAllowableFloodingProbability ? LowerLimitNorm : SignalingNorm; } Index: Riskeer/Common/src/Riskeer.Common.Data/Contribution/NormType.cs =================================================================== diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Common/src/Riskeer.Common.Data/Contribution/NormType.cs (.../NormType.cs) (revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a) +++ Riskeer/Common/src/Riskeer.Common.Data/Contribution/NormType.cs (.../NormType.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -30,15 +30,15 @@ public enum NormType { /// - /// The lower limit norm type. + /// The maximum allowable flooding probability norm type. /// - [ResourcesDisplayName(typeof(Resources), nameof(Resources.NormType_LowerLimit_DisplayName))] - LowerLimit = 1, + [ResourcesDisplayName(typeof(Resources), nameof(Resources.NormType_MaximumAllowableFloodingProbability_DisplayName))] + MaximumAllowableFloodingProbability = 1, /// - /// The signaling norm type. + /// The signal flooding probability norm type. /// - [ResourcesDisplayName(typeof(Resources), nameof(Resources.NormType_Signaling_DisplayName))] - Signaling = 2 + [ResourcesDisplayName(typeof(Resources), nameof(Resources.NormType_SignalFloodingProbability_DisplayName))] + SignalFloodingProbability = 2 } } \ No newline at end of file Index: Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.Designer.cs =================================================================== diff -u -rd567f88de093bf2ebe8e26f7402a6c6a2f3e89aa -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d567f88de093bf2ebe8e26f7402a6c6a2f3e89aa) +++ Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2021. All rights reserved. +// Copyright (C) Stichting Deltares 2021. All rights reserved. // // This file is part of Riskeer. // @@ -655,20 +655,20 @@ } /// - /// Looks up a localized string similar to Ondergrens. + /// Looks up a localized string similar to Omgevingswaarde. /// - public static string NormType_LowerLimit_DisplayName { + public static string NormType_MaximumAllowableFloodingProbability_DisplayName { get { - return ResourceManager.GetString("NormType_LowerLimit_DisplayName", resourceCulture); + return ResourceManager.GetString("NormType_MaximumAllowableFloodingProbability_DisplayName", resourceCulture); } } /// - /// Looks up a localized string similar to Signaleringswaarde. + /// Looks up a localized string similar to Signaleringsparameter. /// - public static string NormType_Signaling_DisplayName { + public static string NormType_SignalFloodingProbability_DisplayName { get { - return ResourceManager.GetString("NormType_Signaling_DisplayName", resourceCulture); + return ResourceManager.GetString("NormType_SignalFloodingProbability_DisplayName", resourceCulture); } } Index: Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.resx =================================================================== diff -u -rd567f88de093bf2ebe8e26f7402a6c6a2f3e89aa -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision d567f88de093bf2ebe8e26f7402a6c6a2f3e89aa) +++ Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -318,11 +318,11 @@ De geometrie bevat geen punt op locatie {0} om als '{1}' in te stellen. - - Ondergrens + + Omgevingswaarde - - Signaleringswaarde + + Signaleringsparameter De waarde van de norm moet in het bereik {0} liggen. Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs =================================================================== diff -u -r7b7731a59cf0e7174ed0de97dac62c4252549580 -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs (.../AssessmentSectionExtensionsTest.cs) (revision 7b7731a59cf0e7174ed0de97dac62c4252549580) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs (.../AssessmentSectionExtensionsTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -254,13 +254,13 @@ yield return new TestCaseData( assessmentSection, hydraulicBoundaryLocation, - NormType.Signaling, + NormType.SignalFloodingProbability, assessmentSection.WaterLevelCalculationsForSignalingNorm.ElementAt(0)); yield return new TestCaseData( assessmentSection, hydraulicBoundaryLocation, - NormType.LowerLimit, + NormType.MaximumAllowableFloodingProbability, assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(0)); } } Index: Riskeer/Common/test/Riskeer.Common.Data.Test/Contribution/FailureMechanismContributionTest.cs =================================================================== diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Common/test/Riskeer.Common.Data.Test/Contribution/FailureMechanismContributionTest.cs (.../FailureMechanismContributionTest.cs) (revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/Contribution/FailureMechanismContributionTest.cs (.../FailureMechanismContributionTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -87,7 +87,7 @@ Assert.AreEqual(norm, result.Norm); Assert.AreEqual(norm, result.SignalingNorm); Assert.AreEqual(norm, result.LowerLimitNorm); - Assert.AreEqual(NormType.LowerLimit, result.NormativeNorm); + Assert.AreEqual(NormType.MaximumAllowableFloodingProbability, result.NormativeNorm); } [Test] @@ -199,8 +199,8 @@ } [Test] - [TestCase(NormType.Signaling, 0.01)] - [TestCase(NormType.LowerLimit, 0.1)] + [TestCase(NormType.SignalFloodingProbability, 0.01)] + [TestCase(NormType.MaximumAllowableFloodingProbability, 0.1)] public void Norm_DifferentNormativeNormTypes_ReturnNorm(NormType normType, double expectedNorm) { // Setup Index: Riskeer/Common/test/Riskeer.Common.Data.Test/Contribution/NormTypeTest.cs =================================================================== diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Common/test/Riskeer.Common.Data.Test/Contribution/NormTypeTest.cs (.../NormTypeTest.cs) (revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/Contribution/NormTypeTest.cs (.../NormTypeTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -36,10 +36,10 @@ return new Dictionary { { - NormType.LowerLimit, "Ondergrens" + NormType.MaximumAllowableFloodingProbability, "Omgevingswaarde" }, { - NormType.Signaling, "Signaleringswaarde" + NormType.SignalFloodingProbability, "Signaleringsparameter" } }; } @@ -52,10 +52,10 @@ return new Dictionary { { - NormType.LowerLimit, 1 + NormType.MaximumAllowableFloodingProbability, 1 }, { - NormType.Signaling, 2 + NormType.SignalFloodingProbability, 2 } }; } Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsWaveConditionsCalculationHelperTest.cs =================================================================== diff -u -r3b1aea305fa3407ef2d830bac9096ea670c86321 -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsWaveConditionsCalculationHelperTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationHelperTest.cs) (revision 3b1aea305fa3407ef2d830bac9096ea670c86321) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsWaveConditionsCalculationHelperTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationHelperTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -81,8 +81,8 @@ } [Test] - [TestCase(NormType.LowerLimit, WaveConditionsInputWaterLevelType.LowerLimit)] - [TestCase(NormType.Signaling, WaveConditionsInputWaterLevelType.Signaling)] + [TestCase(NormType.MaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.LowerLimit)] + [TestCase(NormType.SignalFloodingProbability, WaveConditionsInputWaterLevelType.Signaling)] public void AddCalculationsFromLocations_MultipleLocationsEmptyCalculationBase_ReturnsUniquelyNamedCalculationsWithCorrectInputSet( NormType normType, WaveConditionsInputWaterLevelType expectedWaveConditionsInputWaterLevelType) @@ -115,8 +115,8 @@ } [Test] - [TestCase(NormType.LowerLimit, WaveConditionsInputWaterLevelType.LowerLimit)] - [TestCase(NormType.Signaling, WaveConditionsInputWaterLevelType.Signaling)] + [TestCase(NormType.MaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.LowerLimit)] + [TestCase(NormType.SignalFloodingProbability, WaveConditionsInputWaterLevelType.Signaling)] public void AddCalculationsFromLocations_MultipleLocationsAndDuplicateNameInCalculationBase_ReturnsUniquelyNamedCalculationsWithCorrectInputSet( NormType normType, WaveConditionsInputWaterLevelType expectedWaveConditionsInputWaterLevelType) Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r43d5c05c6ac93418aafe870fac4c8386bc5c66cc -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 43d5c05c6ac93418aafe870fac4c8386bc5c66cc) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -1451,8 +1451,8 @@ } [Test] - [TestCase(NormType.Signaling)] - [TestCase(NormType.LowerLimit)] + [TestCase(NormType.SignalFloodingProbability)] + [TestCase(NormType.MaximumAllowableFloodingProbability)] public void ContextMenuStrip_ClickOnAddCalculationItem_AddCalculationToCalculationGroupAndNotifyObservers( NormType normType) { @@ -1946,9 +1946,9 @@ { switch (normType) { - case NormType.LowerLimit: + case NormType.MaximumAllowableFloodingProbability: return WaveConditionsInputWaterLevelType.LowerLimit; - case NormType.Signaling: + case NormType.SignalFloodingProbability: return WaveConditionsInputWaterLevelType.Signaling; default: throw new NotSupportedException(); Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Dialogs/ReferenceLineMetaSelectionDialog.cs =================================================================== diff -u -rb2b238492bb0d500e3a5e376dadee75f506b2273 -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Dialogs/ReferenceLineMetaSelectionDialog.cs (.../ReferenceLineMetaSelectionDialog.cs) (revision b2b238492bb0d500e3a5e376dadee75f506b2273) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Dialogs/ReferenceLineMetaSelectionDialog.cs (.../ReferenceLineMetaSelectionDialog.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -108,8 +108,8 @@ SelectedReferenceLineMeta = referenceLineMetaSelectionRow.ReferenceLineMeta; SelectedNormativeNorm = SignalingValueRadioButton.Checked - ? NormType.Signaling - : NormType.LowerLimit; + ? NormType.SignalFloodingProbability + : NormType.MaximumAllowableFloodingProbability; double lowerLimitNormValue = GetNormValue(referenceLineMetaSelectionRow.LowerLimitValueReturnPeriod); Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/NormProperties.cs =================================================================== diff -u -r01c6afa9989e82a7114a3c028e800f52d3fb433b -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/NormProperties.cs (.../NormProperties.cs) (revision 01c6afa9989e82a7114a3c028e800f52d3fb433b) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/NormProperties.cs (.../NormProperties.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -72,7 +72,7 @@ get => data.LowerLimitNorm; set { - ChangeNorm(() => data.LowerLimitNorm = value, NormType.LowerLimit); + ChangeNorm(() => data.LowerLimitNorm = value, NormType.MaximumAllowableFloodingProbability); } } @@ -86,7 +86,7 @@ get => data.SignalingNorm; set { - ChangeNorm(() => data.SignalingNorm = value, NormType.Signaling); + ChangeNorm(() => data.SignalingNorm = value, NormType.SignalFloodingProbability); } } Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs =================================================================== diff -u -r2512e1d3bbadf2a96761bd456e5eeafbf8c79f2c -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs (.../FailureMechanismContributionNormChangeHandler.cs) (revision 2512e1d3bbadf2a96761bd456e5eeafbf8c79f2c) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs (.../FailureMechanismContributionNormChangeHandler.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -169,14 +169,14 @@ return normativeNormType; } - return normativeNormType == NormType.LowerLimit - ? NormType.Signaling - : NormType.LowerLimit; + return normativeNormType == NormType.MaximumAllowableFloodingProbability + ? NormType.SignalFloodingProbability + : NormType.MaximumAllowableFloodingProbability; } private IEnumerable GetHydraulicBoundaryLocationCalculationsToClear(NormType normToClearFor) { - return normToClearFor == NormType.LowerLimit + return normToClearFor == NormType.MaximumAllowableFloodingProbability ? assessmentSection.WaterLevelCalculationsForLowerLimitNorm : assessmentSection.WaterLevelCalculationsForSignalingNorm; } Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/NormPropertiesTest.cs =================================================================== diff -u -rec3cdad79a768b4e033bd56836446198df108609 -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/NormPropertiesTest.cs (.../NormPropertiesTest.cs) (revision ec3cdad79a768b4e033bd56836446198df108609) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/NormPropertiesTest.cs (.../NormPropertiesTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -190,7 +190,7 @@ { // Given FailureMechanismContribution failureMechanismContribution = FailureMechanismContributionTestFactory.CreateFailureMechanismContribution(); - failureMechanismContribution.NormativeNorm = NormType.Signaling; + failureMechanismContribution.NormativeNorm = NormType.SignalFloodingProbability; var mocks = new MockRepository(); var failureMechanismContributionNormChangeHandler = mocks.StrictMock(); @@ -220,7 +220,7 @@ { // Given FailureMechanismContribution failureMechanismContribution = FailureMechanismContributionTestFactory.CreateFailureMechanismContribution(); - failureMechanismContribution.NormativeNorm = NormType.Signaling; + failureMechanismContribution.NormativeNorm = NormType.SignalFloodingProbability; var mocks = new MockRepository(); var failureMechanismContributionNormChangeHandler = mocks.StrictMock(); @@ -293,7 +293,7 @@ var properties = new NormProperties(failureMechanismContribution, failureMechanismContributionNormChangeHandler); - const NormType newValue = NormType.Signaling; + const NormType newValue = NormType.SignalFloodingProbability; // Call properties.NormativeNorm = newValue; Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/AssessmentSectionFromFileHandlerTest.cs =================================================================== diff -u -r8fb1e7931c200eb758e14f16cd23e20973b52709 -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/AssessmentSectionFromFileHandlerTest.cs (.../AssessmentSectionFromFileHandlerTest.cs) (revision 8fb1e7931c200eb758e14f16cd23e20973b52709) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/AssessmentSectionFromFileHandlerTest.cs (.../AssessmentSectionFromFileHandlerTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -375,7 +375,7 @@ Name = "Traject 1-2", FailureMechanismContribution = { - NormativeNorm = useSignalingValue ? NormType.Signaling : NormType.LowerLimit + NormativeNorm = useSignalingValue ? NormType.SignalFloodingProbability : NormType.MaximumAllowableFloodingProbability } }; assessmentSection.GrassCoverErosionInwards.GeneralInput.N = (RoundedDouble) 2.0; @@ -400,7 +400,7 @@ Name = "Traject 2-1", FailureMechanismContribution = { - NormativeNorm = NormType.Signaling + NormativeNorm = NormType.SignalFloodingProbability }, GrassCoverErosionInwards = { @@ -444,7 +444,7 @@ Name = "Traject 3-3", FailureMechanismContribution = { - NormativeNorm = NormType.Signaling + NormativeNorm = NormType.SignalFloodingProbability } }; assessmentSection.ReferenceLine.SetGeometry(new[] Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs =================================================================== diff -u -r976b9242f7fa5c88c176c86544091059027d05f2 -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs (.../FailureMechanismContributionNormChangeHandlerTest.cs) (revision 976b9242f7fa5c88c176c86544091059027d05f2) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs (.../FailureMechanismContributionNormChangeHandlerTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -602,23 +602,23 @@ private static IEnumerable GetChangeNormativeNormCases() { yield return new TestCaseData( - NormType.LowerLimit, new Func>( + NormType.MaximumAllowableFloodingProbability, new Func>( section => section.WaterLevelCalculationsForLowerLimitNorm), WaveConditionsInputWaterLevelType.LowerLimit); yield return new TestCaseData( - NormType.Signaling, new Func>( + NormType.SignalFloodingProbability, new Func>( section => section.WaterLevelCalculationsForSignalingNorm), WaveConditionsInputWaterLevelType.Signaling); } private static IEnumerable GetChangeNormCases() { yield return new TestCaseData( - NormType.LowerLimit, new Func>( + NormType.MaximumAllowableFloodingProbability, new Func>( section => section.WaterLevelCalculationsForSignalingNorm), WaveConditionsInputWaterLevelType.Signaling); yield return new TestCaseData( - NormType.Signaling, new Func>( + NormType.SignalFloodingProbability, new Func>( section => section.WaterLevelCalculationsForLowerLimitNorm), WaveConditionsInputWaterLevelType.LowerLimit); } Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/Comparers/AssessmentSectionMergeComparerTest.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/Comparers/AssessmentSectionMergeComparerTest.cs (.../AssessmentSectionMergeComparerTest.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/Comparers/AssessmentSectionMergeComparerTest.cs (.../AssessmentSectionMergeComparerTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -214,9 +214,9 @@ "LowerLimitNorm"); yield return new ChangePropertyData(sec => sec.FailureMechanismContribution.SignalingNorm = sec.FailureMechanismContribution.SignalingNorm - 1e-15, "SignalingNorm"); - yield return new ChangePropertyData(sec => sec.FailureMechanismContribution.NormativeNorm = sec.FailureMechanismContribution.NormativeNorm == NormType.LowerLimit - ? NormType.Signaling - : NormType.LowerLimit, + yield return new ChangePropertyData(sec => sec.FailureMechanismContribution.NormativeNorm = sec.FailureMechanismContribution.NormativeNorm == NormType.MaximumAllowableFloodingProbability + ? NormType.SignalFloodingProbability + : NormType.MaximumAllowableFloodingProbability, "NormType"); yield return new ChangePropertyData(sec => sec.ChangeComposition(AssessmentSectionComposition.DikeAndDune), "Composition"); Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs =================================================================== diff -u -rf38f39fd7c2509e125db1b575821286e383034c8 -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision f38f39fd7c2509e125db1b575821286e383034c8) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -530,7 +530,7 @@ public void ClearAllWaveConditionsCalculationOutputWithNormType_AssessmentSectionNull_ThrowsArgumentNullException() { // Call - void Call() => RiskeerDataSynchronizationService.ClearAllWaveConditionsCalculationOutput(null, NormType.LowerLimit); + void Call() => RiskeerDataSynchronizationService.ClearAllWaveConditionsCalculationOutput(null, NormType.MaximumAllowableFloodingProbability); // Assert var exception = Assert.Throws(Call); @@ -556,7 +556,7 @@ public void ClearAllWaveConditionsCalculationOutputWithNormType_WithData_ClearsOutputAndReturnsAffectedObjects() { // Setup - const NormType normType = NormType.LowerLimit; + const NormType normType = NormType.MaximumAllowableFloodingProbability; AssessmentSection assessmentSection = TestDataGenerator.GetAssessmentSectionWithAllCalculationConfigurations(); var waveConditionsCalculations = new List>(); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsInputContextPropertyInfoTest.cs =================================================================== diff -u -r4b889a77a0b2a44d9eadc54540334140415177c8 -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsInputContextPropertyInfoTest.cs (.../MacroStabilityInwardsInputContextPropertyInfoTest.cs) (revision 4b889a77a0b2a44d9eadc54540334140415177c8) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsInputContextPropertyInfoTest.cs (.../MacroStabilityInwardsInputContextPropertyInfoTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -60,7 +60,7 @@ { FailureMechanismContribution = { - NormativeNorm = NormType.Signaling + NormativeNorm = NormType.SignalFloodingProbability } }; @@ -106,7 +106,7 @@ { FailureMechanismContribution = { - NormativeNorm = NormType.LowerLimit + NormativeNorm = NormType.MaximumAllowableFloodingProbability } }; Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityFactoryTest.cs =================================================================== diff -u -r4b889a77a0b2a44d9eadc54540334140415177c8 -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityFactoryTest.cs (.../MacroStabilityInwardsCalculationActivityFactoryTest.cs) (revision 4b889a77a0b2a44d9eadc54540334140415177c8) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityFactoryTest.cs (.../MacroStabilityInwardsCalculationActivityFactoryTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -102,7 +102,7 @@ { FailureMechanismContribution = { - NormativeNorm = NormType.LowerLimit + NormativeNorm = NormType.MaximumAllowableFloodingProbability } }; assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] @@ -181,7 +181,7 @@ { FailureMechanismContribution = { - NormativeNorm = NormType.LowerLimit + NormativeNorm = NormType.MaximumAllowableFloodingProbability } }; assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] @@ -261,7 +261,7 @@ { FailureMechanismContribution = { - NormativeNorm = NormType.LowerLimit + NormativeNorm = NormType.MaximumAllowableFloodingProbability } }; assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] Index: Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo172IntegrationTest.cs =================================================================== diff -u -rdabcb057747ff6edfd9e1735cae761c45ae4c004 -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo172IntegrationTest.cs (.../MigrationTo172IntegrationTest.cs) (revision dabcb057747ff6edfd9e1735cae761c45ae4c004) +++ Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo172IntegrationTest.cs (.../MigrationTo172IntegrationTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -138,7 +138,7 @@ { databaseFile.OpenDatabaseConnection(); - double originalNorm = 1.0 / (setNormType == NormType.Signaling + double originalNorm = 1.0 / (setNormType == NormType.SignalFloodingProbability ? signalingReturnPeriod : lowerLimitReturnPeriod); databaseFile.ExecuteQuery("INSERT INTO ProjectEntity ([ProjectEntityId]) VALUES (1);"); @@ -151,7 +151,7 @@ // Then NormType expectedNormType = lowerLimitReturnPeriod == signalingReturnPeriod - ? NormType.Signaling + ? NormType.SignalFloodingProbability : setNormType; string expectedAssessmentSectionQuery = GetExpectedAssessmentSectionQuery(trajectId, @@ -189,8 +189,8 @@ [Test] [SetCulture("en-US")] - [TestCase(2, NormType.LowerLimit, TestName = "Given171ProjectWithNormLargerThenLowerLimit_WhenMigrated_ThenLowerLimitNormSetToNormAndExpectedLogDatabase")] - [TestCase(600, NormType.Signaling, TestName = "Given171ProjectWithNormLessThenLowerLimit_WhenMigrated_ThenSignalingNormSetToNormAndExpectedLogDatabase")] + [TestCase(2, NormType.MaximumAllowableFloodingProbability, TestName = "Given171ProjectWithNormLargerThenLowerLimit_WhenMigrated_ThenLowerLimitNormSetToNormAndExpectedLogDatabase")] + [TestCase(600, NormType.SignalFloodingProbability, TestName = "Given171ProjectWithNormLessThenLowerLimit_WhenMigrated_ThenSignalingNormSetToNormAndExpectedLogDatabase")] public void Given171ProjectWithNormNotInList_WhenMigrated_ThenDatabaseUpdatedAndExpectedLogDatabase(int originalReturnPeriod, NormType expectedNormType) { @@ -233,11 +233,11 @@ migrator.Migrate(fromVersionedFile, newVersion, targetFilePath); // Then - int expectedLowerLimitReturnPeriod = expectedNormType == NormType.LowerLimit + int expectedLowerLimitReturnPeriod = expectedNormType == NormType.MaximumAllowableFloodingProbability ? originalReturnPeriod : lowerLimitReturnPeriod; - int expectedSignalingReturnPeriod = expectedNormType == NormType.Signaling + int expectedSignalingReturnPeriod = expectedNormType == NormType.SignalFloodingProbability ? originalReturnPeriod : signalingReturnPeriod; @@ -289,7 +289,7 @@ private static string GetNormTypeString(NormType normType) { - return normType == NormType.LowerLimit + return normType == NormType.MaximumAllowableFloodingProbability ? "ondergrens" : "signaleringswaarde"; } @@ -313,7 +313,7 @@ } } - yield return new TestCaseData(NormType.Signaling, + yield return new TestCaseData(NormType.SignalFloodingProbability, "NoValidTrajectId", 30000, 30000) @@ -386,7 +386,7 @@ yield return new AssessmentSectionReturnPeriod("16-2", 30000, 10000); yield return new AssessmentSectionReturnPeriod("16-3", 30000, 10000); yield return new AssessmentSectionReturnPeriod("16-4", 30000, 10000); - yield return new AssessmentSectionReturnPeriod("16-5", 10, 10); // Signaling norm set to LowerLimit + yield return new AssessmentSectionReturnPeriod("16-5", 10, 10); // SignalFloodingProbability norm set to MaximumAllowableFloodingProbability yield return new AssessmentSectionReturnPeriod("17-1", 3000, 1000); yield return new AssessmentSectionReturnPeriod("17-2", 3000, 1000); yield return new AssessmentSectionReturnPeriod("17-3", 100000, 30000); @@ -1027,13 +1027,13 @@ { Assert.AreEqual(3, messages.Length); - string lowerLimitLogSuffix = normType == NormType.LowerLimit + string lowerLimitLogSuffix = normType == NormType.MaximumAllowableFloodingProbability ? " (voorheen de waarde van de norm)" : ""; MigrationLogTestHelper.AssertMigrationLogMessageEqual( new MigrationLogMessage("17.1", newVersion, $" + De ondergrens is gelijk gesteld aan 1/{lowerLimitReturnPeriod}{lowerLimitLogSuffix}."), messages[0]); - string signalingLogSuffix = normType == NormType.Signaling + string signalingLogSuffix = normType == NormType.SignalFloodingProbability ? " (voorheen de waarde van de norm)" : ""; MigrationLogTestHelper.AssertMigrationLogMessageEqual( @@ -1089,7 +1089,7 @@ messages[i++], messages[i++], messages[i++] - }, 30000, 30000, NormType.Signaling); + }, 30000, 30000, NormType.SignalFloodingProbability); MigrationLogTestHelper.AssertMigrationLogMessageEqual( new MigrationLogMessage("17.1", newVersion, " + Toetsspoor: 'Hoogte kunstwerk'"), messages[i++]); @@ -1129,7 +1129,7 @@ messages[i++], messages[i++], messages[i++] - }, 1000, 30000, NormType.Signaling); + }, 1000, 30000, NormType.SignalFloodingProbability); MigrationLogTestHelper.AssertMigrationLogMessageEqual( new MigrationLogMessage("17.1", newVersion, " + Toetsspoor: 'Betrouwbaarheid sluiting kunstwerk'"), messages[i++]); @@ -1151,7 +1151,7 @@ messages[i++], messages[i++], messages[i++] - }, 1000, 1000, NormType.Signaling); + }, 1000, 1000, NormType.SignalFloodingProbability); MigrationLogTestHelper.AssertMigrationLogMessageEqual( new MigrationLogMessage("17.1", newVersion, "* Traject: 'assessmentSectionResults'"), @@ -1161,7 +1161,7 @@ messages[i++], messages[i++], messages[i++] - }, 1000, 3000, NormType.Signaling); + }, 1000, 3000, NormType.SignalFloodingProbability); MigrationLogTestHelper.AssertMigrationLogMessageEqual( new MigrationLogMessage("17.1", newVersion, " + Toetsspoor: 'Piping'"), messages[i++]); Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/SemiProbabilistic/SemiProbabilisticPipingInputContextPropertyInfoTest.cs =================================================================== diff -u -r4b889a77a0b2a44d9eadc54540334140415177c8 -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/SemiProbabilistic/SemiProbabilisticPipingInputContextPropertyInfoTest.cs (.../SemiProbabilisticPipingInputContextPropertyInfoTest.cs) (revision 4b889a77a0b2a44d9eadc54540334140415177c8) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/SemiProbabilistic/SemiProbabilisticPipingInputContextPropertyInfoTest.cs (.../SemiProbabilisticPipingInputContextPropertyInfoTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -69,7 +69,7 @@ { FailureMechanismContribution = { - NormativeNorm = NormType.Signaling + NormativeNorm = NormType.SignalFloodingProbability } }; @@ -115,7 +115,7 @@ { FailureMechanismContribution = { - NormativeNorm = NormType.LowerLimit + NormativeNorm = NormType.MaximumAllowableFloodingProbability } }; Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs =================================================================== diff -u -r4b889a77a0b2a44d9eadc54540334140415177c8 -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs (.../PipingCalculationActivityFactoryTest.cs) (revision 4b889a77a0b2a44d9eadc54540334140415177c8) +++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs (.../PipingCalculationActivityFactoryTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -93,7 +93,7 @@ { FailureMechanismContribution = { - NormativeNorm = NormType.LowerLimit + NormativeNorm = NormType.MaximumAllowableFloodingProbability } }; @@ -246,7 +246,7 @@ { FailureMechanismContribution = { - NormativeNorm = NormType.LowerLimit + NormativeNorm = NormType.MaximumAllowableFloodingProbability } }; @@ -408,7 +408,7 @@ { FailureMechanismContribution = { - NormativeNorm = NormType.LowerLimit + NormativeNorm = NormType.MaximumAllowableFloodingProbability } }; Index: Riskeer/Revetment/src/Riskeer.Revetment.Data/WaveConditionsInputHelper.cs =================================================================== diff -u -r3ceac0408c340b2799fd8d43ee7228a5065617e1 -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Revetment/src/Riskeer.Revetment.Data/WaveConditionsInputHelper.cs (.../WaveConditionsInputHelper.cs) (revision 3ceac0408c340b2799fd8d43ee7228a5065617e1) +++ Riskeer/Revetment/src/Riskeer.Revetment.Data/WaveConditionsInputHelper.cs (.../WaveConditionsInputHelper.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -75,10 +75,10 @@ switch (normType) { - case NormType.LowerLimit: + case NormType.MaximumAllowableFloodingProbability: waveConditionsInput.WaterLevelType = WaveConditionsInputWaterLevelType.LowerLimit; break; - case NormType.Signaling: + case NormType.SignalFloodingProbability: waveConditionsInput.WaterLevelType = WaveConditionsInputWaterLevelType.Signaling; break; default: Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationImporter.cs =================================================================== diff -u -rcc7d01e84fd44fff418ea8b749ecbcd8e2855957 -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationImporter.cs (.../WaveConditionsCalculationConfigurationImporter.cs) (revision cc7d01e84fd44fff418ea8b749ecbcd8e2855957) +++ Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationImporter.cs (.../WaveConditionsCalculationConfigurationImporter.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -231,9 +231,9 @@ { switch (failureMechanismContribution.NormativeNorm) { - case NormType.LowerLimit: + case NormType.MaximumAllowableFloodingProbability: return WaveConditionsInputWaterLevelType.LowerLimit; - case NormType.Signaling: + case NormType.SignalFloodingProbability: return WaveConditionsInputWaterLevelType.Signaling; default: throw new NotSupportedException(); Index: Riskeer/Revetment/src/Riskeer.Revetment.Service/WaveConditionsDataSynchronizationService.cs =================================================================== diff -u -rc184b065b5909ce4a9bc542ba203075b8778eb56 -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Revetment/src/Riskeer.Revetment.Service/WaveConditionsDataSynchronizationService.cs (.../WaveConditionsDataSynchronizationService.cs) (revision c184b065b5909ce4a9bc542ba203075b8778eb56) +++ Riskeer/Revetment/src/Riskeer.Revetment.Service/WaveConditionsDataSynchronizationService.cs (.../WaveConditionsDataSynchronizationService.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -170,9 +170,9 @@ switch (normType) { - case NormType.LowerLimit: + case NormType.MaximumAllowableFloodingProbability: return WaveConditionsInputWaterLevelType.LowerLimit; - case NormType.Signaling: + case NormType.SignalFloodingProbability: return WaveConditionsInputWaterLevelType.Signaling; default: throw new NotSupportedException(); Index: Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/WaveConditionsInputHelperTest.cs =================================================================== diff -u -rb9ce34760e692ecfe64825c71e22acaf149c9d0d -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/WaveConditionsInputHelperTest.cs (.../WaveConditionsInputHelperTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) +++ Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/WaveConditionsInputHelperTest.cs (.../WaveConditionsInputHelperTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -82,8 +82,8 @@ } [Test] - [TestCase(NormType.LowerLimit, WaveConditionsInputWaterLevelType.LowerLimit)] - [TestCase(NormType.Signaling, WaveConditionsInputWaterLevelType.Signaling)] + [TestCase(NormType.MaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.LowerLimit)] + [TestCase(NormType.SignalFloodingProbability, WaveConditionsInputWaterLevelType.Signaling)] public void SetWaterLevelType_WithWaveConditionsInputAndVariousNormTypes_SetsWaterLevelType( NormType normType, WaveConditionsInputWaterLevelType expectedWaveConditionsInputWaterLevelType) Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationImporterTest.cs =================================================================== diff -u -r0e8c7b917d04bde4baaa2936590683894efc2f2d -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationImporterTest.cs (.../WaveConditionsCalculationConfigurationImporterTest.cs) (revision 0e8c7b917d04bde4baaa2936590683894efc2f2d) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationImporterTest.cs (.../WaveConditionsCalculationConfigurationImporterTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -300,8 +300,8 @@ } [Test] - [TestCase(NormType.LowerLimit, WaveConditionsInputWaterLevelType.LowerLimit)] - [TestCase(NormType.Signaling, WaveConditionsInputWaterLevelType.Signaling)] + [TestCase(NormType.MaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.LowerLimit)] + [TestCase(NormType.SignalFloodingProbability, WaveConditionsInputWaterLevelType.Signaling)] public void Import_TargetProbabilityNull_DataAddedToModel(NormType normType, WaveConditionsInputWaterLevelType expectedWaterLevelType) { // Setup Index: Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsDataSynchronizationServiceTest.cs =================================================================== diff -u -rb9ce34760e692ecfe64825c71e22acaf149c9d0d -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsDataSynchronizationServiceTest.cs (.../WaveConditionsDataSynchronizationServiceTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) +++ Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsDataSynchronizationServiceTest.cs (.../WaveConditionsDataSynchronizationServiceTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -45,7 +45,7 @@ { // Call void Call() => WaveConditionsDataSynchronizationService.ClearAllWaveConditionsCalculationOutput>( - null, NormType.Signaling); + null, NormType.SignalFloodingProbability); // Assert var exception = Assert.Throws(Call); @@ -69,8 +69,8 @@ } [Test] - [TestCase(NormType.LowerLimit)] - [TestCase(NormType.Signaling)] + [TestCase(NormType.MaximumAllowableFloodingProbability)] + [TestCase(NormType.SignalFloodingProbability)] public void ClearAllWaveConditionsCalculationOutputWithNormType_WithAllData_ClearsOutputAndReturnsAffectedObjects(NormType normType) { // Setup @@ -104,7 +104,7 @@ TestWaveConditionsCalculation[] expectedAffectedCalculations = { - normType == NormType.LowerLimit + normType == NormType.MaximumAllowableFloodingProbability ? calculation2 : calculation1 }; Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Forms.Test/StabilityStoneCoverCalculationConfigurationHelperTest.cs =================================================================== diff -u -rcfab785127fbc85d91c6bb2f259777e537448630 -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Forms.Test/StabilityStoneCoverCalculationConfigurationHelperTest.cs (.../StabilityStoneCoverCalculationConfigurationHelperTest.cs) (revision cfab785127fbc85d91c6bb2f259777e537448630) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Forms.Test/StabilityStoneCoverCalculationConfigurationHelperTest.cs (.../StabilityStoneCoverCalculationConfigurationHelperTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -81,8 +81,8 @@ } [Test] - [TestCase(NormType.LowerLimit, WaveConditionsInputWaterLevelType.LowerLimit)] - [TestCase(NormType.Signaling, WaveConditionsInputWaterLevelType.Signaling)] + [TestCase(NormType.MaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.LowerLimit)] + [TestCase(NormType.SignalFloodingProbability, WaveConditionsInputWaterLevelType.Signaling)] public void AddCalculationsFromLocations_MultipleCalculationsEmptyCalculationBase_ReturnsUniquelyNamedCalculationsWithCorrectInputSet( NormType normType, WaveConditionsInputWaterLevelType expectedWaveConditionsInputWaterLevelType) @@ -115,8 +115,8 @@ } [Test] - [TestCase(NormType.LowerLimit, WaveConditionsInputWaterLevelType.LowerLimit)] - [TestCase(NormType.Signaling, WaveConditionsInputWaterLevelType.Signaling)] + [TestCase(NormType.MaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.LowerLimit)] + [TestCase(NormType.SignalFloodingProbability, WaveConditionsInputWaterLevelType.Signaling)] public void AddCalculationsFromLocations_MultipleCalculationsAndDuplicateNameInCalculationBase_ReturnsUniquelyNamedCalculationsWithCorrectInputSet( NormType normType, WaveConditionsInputWaterLevelType expectedWaveConditionsInputWaterLevelType) Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r8f777e52ebf7549631b5bc0165db5e2a2435f227 -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 8f777e52ebf7549631b5bc0165db5e2a2435f227) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -1404,8 +1404,8 @@ } [Test] - [TestCase(NormType.Signaling)] - [TestCase(NormType.LowerLimit)] + [TestCase(NormType.SignalFloodingProbability)] + [TestCase(NormType.MaximumAllowableFloodingProbability)] public void ContextMenuStrip_ClickOnAddCalculationItem_AddCalculationToCalculationGroupAndNotifyObservers( NormType normType) { @@ -1912,9 +1912,9 @@ { switch (normType) { - case NormType.LowerLimit: + case NormType.MaximumAllowableFloodingProbability: return WaveConditionsInputWaterLevelType.LowerLimit; - case NormType.Signaling: + case NormType.SignalFloodingProbability: return WaveConditionsInputWaterLevelType.Signaling; default: throw new NotSupportedException(); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs =================================================================== diff -u -r965c72422cb75e67c3e6e014ab8f5b76a8adc600 -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 965c72422cb75e67c3e6e014ab8f5b76a8adc600) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -1182,7 +1182,7 @@ { LowerLimitNorm = 1.0 / 30000, SignalingNorm = 1.0 / 300000, - NormativeNormType = Convert.ToByte(NormType.Signaling), + NormativeNormType = Convert.ToByte(NormType.SignalFloodingProbability), Composition = Convert.ToByte(AssessmentSectionComposition.Dike) }; } Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs =================================================================== diff -u -r09651a80693da0708c1a2e745387645aa367d6d2 -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 09651a80693da0708c1a2e745387645aa367d6d2) +++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -94,7 +94,7 @@ { LowerLimitNorm = 1.0 / 10, SignalingNorm = 1.0 / 1000000, - NormativeNorm = NormType.Signaling + NormativeNorm = NormType.SignalFloodingProbability } }; SetHydraulicBoundaryLocationConfigurationSettings(assessmentSection.HydraulicBoundaryDatabase); Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelperTest.cs =================================================================== diff -u -rb7678858ad514d847ac8fe5c445e1327200b2ac3 -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelperTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelperTest.cs) (revision b7678858ad514d847ac8fe5c445e1327200b2ac3) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelperTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelperTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -83,8 +83,8 @@ } [Test] - [TestCase(NormType.LowerLimit, WaveConditionsInputWaterLevelType.LowerLimit)] - [TestCase(NormType.Signaling, WaveConditionsInputWaterLevelType.Signaling)] + [TestCase(NormType.MaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.LowerLimit)] + [TestCase(NormType.SignalFloodingProbability, WaveConditionsInputWaterLevelType.Signaling)] public void AddCalculationsFromLocations_MultipleCalculationsEmptyCalculationBase_ReturnsUniquelyNamedCalculationsWithCorrectInputSet( NormType normType, WaveConditionsInputWaterLevelType expectedWaveConditionsInputWaterLevelType) @@ -119,8 +119,8 @@ } [Test] - [TestCase(NormType.LowerLimit, WaveConditionsInputWaterLevelType.LowerLimit)] - [TestCase(NormType.Signaling, WaveConditionsInputWaterLevelType.Signaling)] + [TestCase(NormType.MaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.LowerLimit)] + [TestCase(NormType.SignalFloodingProbability, WaveConditionsInputWaterLevelType.Signaling)] public void AddCalculationsFromLocations_MultipleCalculationsAndDuplicateNameInCalculationBase_ReturnsUniquelyNamedCalculationsWithCorrectInputSet( NormType normType, WaveConditionsInputWaterLevelType expectedWaveConditionsInputWaterLevelType) Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r8f777e52ebf7549631b5bc0165db5e2a2435f227 -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 8f777e52ebf7549631b5bc0165db5e2a2435f227) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) @@ -1429,8 +1429,8 @@ } [Test] - [TestCase(NormType.Signaling)] - [TestCase(NormType.LowerLimit)] + [TestCase(NormType.SignalFloodingProbability)] + [TestCase(NormType.MaximumAllowableFloodingProbability)] public void ContextMenuStrip_ClickOnAddCalculationItem_AddCalculationToCalculationGroupAndNotifyObservers( NormType normType) { @@ -1935,9 +1935,9 @@ { switch (normType) { - case NormType.LowerLimit: + case NormType.MaximumAllowableFloodingProbability: return WaveConditionsInputWaterLevelType.LowerLimit; - case NormType.Signaling: + case NormType.SignalFloodingProbability: return WaveConditionsInputWaterLevelType.Signaling; default: throw new NotSupportedException();