Index: Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/AssessmentSectionExtensions.cs =================================================================== diff -u -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/AssessmentSectionExtensions.cs (.../AssessmentSectionExtensions.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) +++ Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/AssessmentSectionExtensions.cs (.../AssessmentSectionExtensions.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -49,9 +49,9 @@ /// Thrown when /// is null. /// Thrown when - /// contains an invalid value of . + /// contains an invalid value of . /// Thrown when - /// contains a valid value of , but unsupported. + /// contains a valid value of , but unsupported. public static RoundedDouble GetNormativeAssessmentLevel(this IAssessmentSection assessmentSection, HydraulicBoundaryLocation hydraulicBoundaryLocation) { @@ -81,9 +81,9 @@ /// Thrown when /// is null. /// Thrown when - /// contains an invalid value of . + /// contains an invalid value of . /// Thrown when - /// contains a valid value of , but unsupported. + /// contains a valid value of , but unsupported. public static HydraulicBoundaryLocationCalculation GetNormativeHydraulicBoundaryLocationCalculation(this IAssessmentSection assessmentSection, HydraulicBoundaryLocation hydraulicBoundaryLocation) { @@ -97,36 +97,36 @@ } /// - /// Gets the relevant collection of based on the of the + /// Gets the relevant collection of based on the of the /// assessment section. /// /// The to get the collections of /// from. /// A collection of from the - /// based on the . + /// based on the . /// Thrown when - /// contains an invalid value of . + /// contains an invalid value of . /// Thrown when - /// contains a valid value of , but unsupported. + /// contains a valid value of , but unsupported. private static IEnumerable GetHydraulicBoundaryLocationCalculations(IAssessmentSection assessmentSection) { - NormType normType = assessmentSection.FailureMechanismContribution.NormativeNorm; + NormativeProbabilityType normativeProbabilityType = assessmentSection.FailureMechanismContribution.NormativeNorm; - if (!Enum.IsDefined(typeof(NormType), normType)) + if (!Enum.IsDefined(typeof(NormativeProbabilityType), normativeProbabilityType)) { - throw new InvalidEnumArgumentException(nameof(normType), - (int) normType, - typeof(NormType)); + throw new InvalidEnumArgumentException(nameof(normativeProbabilityType), + (int) normativeProbabilityType, + typeof(NormativeProbabilityType)); } IEnumerable calculations; - switch (normType) + switch (normativeProbabilityType) { - case NormType.SignalFloodingProbability: + case NormativeProbabilityType.SignalFloodingProbability: calculations = assessmentSection.WaterLevelCalculationsForSignalingNorm; break; - case NormType.MaximumAllowableFloodingProbability: + case NormativeProbabilityType.MaximumAllowableFloodingProbability: calculations = assessmentSection.WaterLevelCalculationsForLowerLimitNorm; break; default: Index: Riskeer/Common/src/Riskeer.Common.Data/Contribution/FailureMechanismContribution.cs =================================================================== diff -u -ra7381cb6c743bed92eafbf3de68837111dbcbd06 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Common/src/Riskeer.Common.Data/Contribution/FailureMechanismContribution.cs (.../FailureMechanismContribution.cs) (revision a7381cb6c743bed92eafbf3de68837111dbcbd06) +++ Riskeer/Common/src/Riskeer.Common.Data/Contribution/FailureMechanismContribution.cs (.../FailureMechanismContribution.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -55,7 +55,7 @@ this.lowerLimitNorm = lowerLimitNorm; this.signalingNorm = signalingNorm; - NormativeNorm = NormType.MaximumAllowableFloodingProbability; + NormativeNorm = NormativeProbabilityType.MaximumAllowableFloodingProbability; } /// @@ -118,7 +118,7 @@ { get { - return NormativeNorm == NormType.MaximumAllowableFloodingProbability + return NormativeNorm == NormativeProbabilityType.MaximumAllowableFloodingProbability ? LowerLimitNorm : SignalingNorm; } @@ -127,7 +127,7 @@ /// /// Gets or sets the norm type which has been defined on the assessment section. /// - public NormType NormativeNorm { get; set; } + public NormativeProbabilityType NormativeNorm { get; set; } /// /// Validates the norm value; Fisheye: Tag 90867e7b6ad6feb087aae90b940ee6e5df421bd0 refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Data/Contribution/NormType.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Common/src/Riskeer.Common.Data/Contribution/NormativeProbabilityType.cs =================================================================== diff -u --- Riskeer/Common/src/Riskeer.Common.Data/Contribution/NormativeProbabilityType.cs (revision 0) +++ Riskeer/Common/src/Riskeer.Common.Data/Contribution/NormativeProbabilityType.cs (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -0,0 +1,44 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using Core.Common.Util.Attributes; +using Riskeer.Common.Data.Properties; + +namespace Riskeer.Common.Data.Contribution +{ + /// + /// Describes the normative probability types. + /// + public enum NormativeProbabilityType + { + /// + /// The maximum allowable flooding probability type. + /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.NormativeProbabilityType_MaximumAllowableFloodingProbability_DisplayName))] + MaximumAllowableFloodingProbability = 1, + + /// + /// The signal flooding probability type. + /// + [ResourcesDisplayName(typeof(Resources), nameof(Resources.NormativeProbabilityType_SignalFloodingProbability_DisplayName))] + SignalFloodingProbability = 2 + } +} \ No newline at end of file Index: Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.Designer.cs =================================================================== diff -u -reca862d8bd637624a02a303714795a8b710cbcb3 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision eca862d8bd637624a02a303714795a8b710cbcb3) +++ Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -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. // @@ -657,18 +657,18 @@ /// /// Looks up a localized string similar to Omgevingswaarde. /// - public static string NormType_MaximumAllowableFloodingProbability_DisplayName { + public static string NormativeProbabilityType_MaximumAllowableFloodingProbability_DisplayName { get { - return ResourceManager.GetString("NormType_MaximumAllowableFloodingProbability_DisplayName", resourceCulture); + return ResourceManager.GetString("NormativeProbabilityType_MaximumAllowableFloodingProbability_DisplayName", resourceCulture); } } /// /// Looks up a localized string similar to Signaleringsparameter. /// - public static string NormType_SignalFloodingProbability_DisplayName { + public static string NormativeProbabilityType_SignalFloodingProbability_DisplayName { get { - return ResourceManager.GetString("NormType_SignalFloodingProbability_DisplayName", resourceCulture); + return ResourceManager.GetString("NormativeProbabilityType_SignalFloodingProbability_DisplayName", resourceCulture); } } Index: Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.resx =================================================================== diff -u -reca862d8bd637624a02a303714795a8b710cbcb3 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision eca862d8bd637624a02a303714795a8b710cbcb3) +++ Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -318,10 +318,10 @@ De geometrie bevat geen punt op locatie {0} om als '{1}' in te stellen. - + Omgevingswaarde - + Signaleringsparameter Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs =================================================================== diff -u -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs (.../AssessmentSectionExtensionsTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs (.../AssessmentSectionExtensionsTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -57,17 +57,17 @@ { FailureMechanismContribution = { - NormativeNorm = (NormType) invalidValue + NormativeNorm = (NormativeProbabilityType) invalidValue } }; // Call void Call() => assessmentSection.GetNormativeAssessmentLevel(new TestHydraulicBoundaryLocation()); // Assert - var expectedMessage = $"The value of argument 'normType' ({invalidValue}) is invalid for Enum type '{nameof(NormType)}'."; + var expectedMessage = $"The value of argument 'normType' ({invalidValue}) is invalid for Enum type '{nameof(NormativeProbabilityType)}'."; string parameterName = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage).ParamName; - Assert.AreEqual("normType", parameterName); + Assert.AreEqual("normativeProbabilityType", parameterName); } [Test] @@ -78,7 +78,7 @@ { FailureMechanismContribution = { - NormativeNorm = new Random(32).NextEnumValue() + NormativeNorm = new Random(32).NextEnumValue() } }; @@ -97,7 +97,7 @@ { FailureMechanismContribution = { - NormativeNorm = new Random(32).NextEnumValue() + NormativeNorm = new Random(32).NextEnumValue() } }; @@ -115,7 +115,7 @@ var assessmentSection = new AssessmentSectionStub(); var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - assessmentSection.FailureMechanismContribution.NormativeNorm = new Random(32).NextEnumValue(); + assessmentSection.FailureMechanismContribution.NormativeNorm = new Random(32).NextEnumValue(); assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] { hydraulicBoundaryLocation @@ -133,11 +133,11 @@ public void GetNormativeAssessmentLevel_HydraulicBoundaryLocationWithOutput_ReturnsCorrespondingAssessmentLevel( IAssessmentSection assessmentSection, HydraulicBoundaryLocation hydraulicBoundaryLocation, - NormType normType, + NormativeProbabilityType normativeProbabilityType, HydraulicBoundaryLocationCalculation calculation) { // Setup - assessmentSection.FailureMechanismContribution.NormativeNorm = normType; + assessmentSection.FailureMechanismContribution.NormativeNorm = normativeProbabilityType; // Call RoundedDouble normativeAssessmentLevel = assessmentSection.GetNormativeAssessmentLevel(hydraulicBoundaryLocation); @@ -168,17 +168,17 @@ { FailureMechanismContribution = { - NormativeNorm = (NormType) invalidValue + NormativeNorm = (NormativeProbabilityType) invalidValue } }; // Call void Call() => assessmentSection.GetNormativeHydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()); // Assert - var expectedMessage = $"The value of argument 'normType' ({invalidValue}) is invalid for Enum type '{nameof(NormType)}'."; + var expectedMessage = $"The value of argument 'normType' ({invalidValue}) is invalid for Enum type '{nameof(NormativeProbabilityType)}'."; string parameterName = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage).ParamName; - Assert.AreEqual("normType", parameterName); + Assert.AreEqual("normativeProbabilityType", parameterName); } [Test] @@ -190,7 +190,7 @@ { FailureMechanismContribution = { - NormativeNorm = random.NextEnumValue() + NormativeNorm = random.NextEnumValue() } }; @@ -210,7 +210,7 @@ { FailureMechanismContribution = { - NormativeNorm = random.NextEnumValue() + NormativeNorm = random.NextEnumValue() } }; @@ -227,11 +227,11 @@ public void GetNormativeHydraulicBoundaryLocationCalculation_HydraulicBoundaryLocation_ReturnsCorrespondingCalculation( IAssessmentSection assessmentSection, HydraulicBoundaryLocation hydraulicBoundaryLocation, - NormType normType, + NormativeProbabilityType normativeProbabilityType, HydraulicBoundaryLocationCalculation calculation) { // Setup - assessmentSection.FailureMechanismContribution.NormativeNorm = normType; + assessmentSection.FailureMechanismContribution.NormativeNorm = normativeProbabilityType; // Call HydraulicBoundaryLocationCalculation normativeHydraulicBoundaryLocationCalculation = @@ -254,13 +254,13 @@ yield return new TestCaseData( assessmentSection, hydraulicBoundaryLocation, - NormType.SignalFloodingProbability, + NormativeProbabilityType.SignalFloodingProbability, assessmentSection.WaterLevelCalculationsForSignalingNorm.ElementAt(0)); yield return new TestCaseData( assessmentSection, hydraulicBoundaryLocation, - NormType.MaximumAllowableFloodingProbability, + NormativeProbabilityType.MaximumAllowableFloodingProbability, assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(0)); } } Index: Riskeer/Common/test/Riskeer.Common.Data.Test/Contribution/FailureMechanismContributionTest.cs =================================================================== diff -u -ra7381cb6c743bed92eafbf3de68837111dbcbd06 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Common/test/Riskeer.Common.Data.Test/Contribution/FailureMechanismContributionTest.cs (.../FailureMechanismContributionTest.cs) (revision a7381cb6c743bed92eafbf3de68837111dbcbd06) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/Contribution/FailureMechanismContributionTest.cs (.../FailureMechanismContributionTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -87,7 +87,7 @@ Assert.AreEqual(norm, result.Norm); Assert.AreEqual(norm, result.SignalingNorm); Assert.AreEqual(norm, result.LowerLimitNorm); - Assert.AreEqual(NormType.MaximumAllowableFloodingProbability, result.NormativeNorm); + Assert.AreEqual(NormativeProbabilityType.MaximumAllowableFloodingProbability, result.NormativeNorm); } [Test] @@ -199,14 +199,14 @@ } [Test] - [TestCase(NormType.SignalFloodingProbability, 0.01)] - [TestCase(NormType.MaximumAllowableFloodingProbability, 0.1)] - public void Norm_DifferentNormativeNormTypes_ReturnNorm(NormType normType, double expectedNorm) + [TestCase(NormativeProbabilityType.SignalFloodingProbability, 0.01)] + [TestCase(NormativeProbabilityType.MaximumAllowableFloodingProbability, 0.1)] + public void Norm_DifferentNormativeNormTypes_ReturnNorm(NormativeProbabilityType normativeProbabilityType, double expectedNorm) { // Setup var failureMechanismContribution = new FailureMechanismContribution(0.1, 0.01) { - NormativeNorm = normType + NormativeNorm = normativeProbabilityType }; // Call Fisheye: Tag 90867e7b6ad6feb087aae90b940ee6e5df421bd0 refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Data.Test/Contribution/NormTypeTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Common/test/Riskeer.Common.Data.Test/Contribution/NormativeProbabilityTypeTest.cs =================================================================== diff -u --- Riskeer/Common/test/Riskeer.Common.Data.Test/Contribution/NormativeProbabilityTypeTest.cs (revision 0) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/Contribution/NormativeProbabilityTypeTest.cs (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -0,0 +1,54 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System.Collections.Generic; +using Core.Common.TestUtil; +using NUnit.Framework; +using Riskeer.Common.Data.Contribution; + +namespace Riskeer.Common.Data.Test.Contribution +{ + [TestFixture] + public class NormativeProbabilityTypeTest : EnumWithResourcesDisplayNameTestFixture + { + protected override IDictionary ExpectedDisplayNameForEnumValues => + new Dictionary + { + { + NormativeProbabilityType.MaximumAllowableFloodingProbability, "Omgevingswaarde" + }, + { + NormativeProbabilityType.SignalFloodingProbability, "Signaleringsparameter" + } + }; + + protected override IDictionary ExpectedValueForEnumValues => + new Dictionary + { + { + NormativeProbabilityType.MaximumAllowableFloodingProbability, 1 + }, + { + NormativeProbabilityType.SignalFloodingProbability, 2 + } + }; + } +} \ No newline at end of file Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/GrassCoverErosionOutwardsWaveConditionsCalculationHelper.cs =================================================================== diff -u -r07256b6a9cc4abaff600e7c9a266cef54295b3c3 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/GrassCoverErosionOutwardsWaveConditionsCalculationHelper.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationHelper.cs) (revision 07256b6a9cc4abaff600e7c9a266cef54295b3c3) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/GrassCoverErosionOutwardsWaveConditionsCalculationHelper.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationHelper.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -38,19 +38,19 @@ { /// /// Adds a in the - /// based on the and the . + /// based on the and the . /// /// Locations to base the calculation upon. /// The list to update. - /// The to base the calculation on. + /// The to base the calculation on. /// Throw when any /// or is null. - /// Thrown when is an invalid value. - /// Thrown when is a valid value, + /// Thrown when is an invalid value. + /// Thrown when is a valid value, /// but unsupported. public static void AddCalculationsFromLocations(IEnumerable locations, List calculations, - NormType normType) + NormativeProbabilityType normativeProbabilityType) { if (locations == null) { @@ -66,7 +66,7 @@ { calculations.Add(CreateGrassCoverErosionOutwardsWaveConditionsCalculation(hydraulicBoundaryLocation, calculations, - normType)); + normativeProbabilityType)); } } @@ -76,15 +76,15 @@ /// /// The to set. /// The list of calculations to base the calculation name from. - /// The to base the water level type input on. + /// The to base the water level type input on. /// An representing a grass cover erosion outwards calculation. - /// Thrown when is an invalid value. - /// Thrown when is a valid value, + /// Thrown when is an invalid value. + /// Thrown when is a valid value, /// but unsupported. private static ICalculationBase CreateGrassCoverErosionOutwardsWaveConditionsCalculation( HydraulicBoundaryLocation hydraulicBoundaryLocation, IEnumerable calculations, - NormType normType) + NormativeProbabilityType normativeProbabilityType) { string nameBase = hydraulicBoundaryLocation.Name; var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation @@ -95,7 +95,7 @@ HydraulicBoundaryLocation = hydraulicBoundaryLocation } }; - WaveConditionsInputHelper.SetWaterLevelType(calculation.InputParameters, normType); + WaveConditionsInputHelper.SetWaterLevelType(calculation.InputParameters, normativeProbabilityType); return calculation; } } Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -r841fadc937a0f35244810144a2ea82b9ccd5da80 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 841fadc937a0f35244810144a2ea82b9ccd5da80) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -599,12 +599,12 @@ private static void GenerateGrassCoverErosionOutwardsWaveConditionsCalculations(IEnumerable hydraulicBoundaryLocations, List calculationCollection, - NormType normType) + NormativeProbabilityType normativeProbabilityType) { GrassCoverErosionOutwardsWaveConditionsCalculationHelper.AddCalculationsFromLocations( hydraulicBoundaryLocations, calculationCollection, - normType); + normativeProbabilityType); } private static void AddWaveConditionsCalculation(GrassCoverErosionOutwardsCalculationGroupContext nodeData) Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsWaveConditionsCalculationHelperTest.cs =================================================================== diff -u -r6044ea132c4c7e98cb6e08bad7e939a9fa460459 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsWaveConditionsCalculationHelperTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationHelperTest.cs) (revision 6044ea132c4c7e98cb6e08bad7e939a9fa460459) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsWaveConditionsCalculationHelperTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationHelperTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -43,7 +43,7 @@ var calculations = new List(); // Call - void Call() => GrassCoverErosionOutwardsWaveConditionsCalculationHelper.AddCalculationsFromLocations(null, calculations, random.NextEnumValue()); + void Call() => GrassCoverErosionOutwardsWaveConditionsCalculationHelper.AddCalculationsFromLocations(null, calculations, random.NextEnumValue()); // Assert string paramName = Assert.Throws(Call).ParamName; @@ -58,7 +58,7 @@ IEnumerable locations = Enumerable.Empty(); // Call - void Call() => GrassCoverErosionOutwardsWaveConditionsCalculationHelper.AddCalculationsFromLocations(locations, null, random.NextEnumValue()); + void Call() => GrassCoverErosionOutwardsWaveConditionsCalculationHelper.AddCalculationsFromLocations(locations, null, random.NextEnumValue()); // Assert string paramName = Assert.Throws(Call).ParamName; @@ -74,17 +74,17 @@ var calculationBases = new List(); // Call - GrassCoverErosionOutwardsWaveConditionsCalculationHelper.AddCalculationsFromLocations(locations, calculationBases, random.NextEnumValue()); + GrassCoverErosionOutwardsWaveConditionsCalculationHelper.AddCalculationsFromLocations(locations, calculationBases, random.NextEnumValue()); // Assert CollectionAssert.IsEmpty(calculationBases); } [Test] - [TestCase(NormType.MaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability)] - [TestCase(NormType.SignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability)] + [TestCase(NormativeProbabilityType.MaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability)] + [TestCase(NormativeProbabilityType.SignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability)] public void AddCalculationsFromLocations_MultipleLocationsEmptyCalculationBase_ReturnsUniquelyNamedCalculationsWithCorrectInputSet( - NormType normType, + NormativeProbabilityType normativeProbabilityType, WaveConditionsInputWaterLevelType expectedWaveConditionsInputWaterLevelType) { // Setup @@ -97,7 +97,7 @@ var calculationBases = new List(); // Call - GrassCoverErosionOutwardsWaveConditionsCalculationHelper.AddCalculationsFromLocations(locations, calculationBases, normType); + GrassCoverErosionOutwardsWaveConditionsCalculationHelper.AddCalculationsFromLocations(locations, calculationBases, normativeProbabilityType); // Assert Assert.AreEqual(2, calculationBases.Count); @@ -115,10 +115,10 @@ } [Test] - [TestCase(NormType.MaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability)] - [TestCase(NormType.SignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability)] + [TestCase(NormativeProbabilityType.MaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability)] + [TestCase(NormativeProbabilityType.SignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability)] public void AddCalculationsFromLocations_MultipleLocationsAndDuplicateNameInCalculationBase_ReturnsUniquelyNamedCalculationsWithCorrectInputSet( - NormType normType, + NormativeProbabilityType normativeProbabilityType, WaveConditionsInputWaterLevelType expectedWaveConditionsInputWaterLevelType) { // Setup @@ -137,7 +137,7 @@ }; // Call - GrassCoverErosionOutwardsWaveConditionsCalculationHelper.AddCalculationsFromLocations(locations, calculationBases, normType); + GrassCoverErosionOutwardsWaveConditionsCalculationHelper.AddCalculationsFromLocations(locations, calculationBases, normativeProbabilityType); // Assert Assert.AreEqual(3, calculationBases.Count); Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rbe73db4b4573dd45d63d960bd5826b3ac33fbdf3 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision be73db4b4573dd45d63d960bd5826b3ac33fbdf3) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -1451,10 +1451,10 @@ } [Test] - [TestCase(NormType.SignalFloodingProbability)] - [TestCase(NormType.MaximumAllowableFloodingProbability)] + [TestCase(NormativeProbabilityType.SignalFloodingProbability)] + [TestCase(NormativeProbabilityType.MaximumAllowableFloodingProbability)] public void ContextMenuStrip_ClickOnAddCalculationItem_AddCalculationToCalculationGroupAndNotifyObservers( - NormType normType) + NormativeProbabilityType normativeProbabilityType) { // Setup var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -1464,7 +1464,7 @@ { FailureMechanismContribution = { - NormativeNorm = normType + NormativeNorm = normativeProbabilityType } }; var nodeData = new GrassCoverErosionOutwardsCalculationGroupContext(group, @@ -1504,7 +1504,7 @@ Assert.IsNotNull(newCalculationItem); Assert.AreEqual("Nieuwe berekening (1)", newlyAddedItem.Name, "An item with the same name default name already exists, therefore '(1)' needs to be appended."); - Assert.AreEqual(GetWaterLevelTypeFromNormType(normType), newCalculationItem.InputParameters.WaterLevelType); + Assert.AreEqual(GetWaterLevelTypeFromNormType(normativeProbabilityType), newCalculationItem.InputParameters.WaterLevelType); } } } @@ -1746,7 +1746,7 @@ { // Given var random = new Random(21); - var normType = random.NextEnumValue(); + var normType = random.NextEnumValue(); using (var treeViewControl = new TreeViewControl()) { @@ -1942,13 +1942,13 @@ }; } - private static WaveConditionsInputWaterLevelType GetWaterLevelTypeFromNormType(NormType normType) + private static WaveConditionsInputWaterLevelType GetWaterLevelTypeFromNormType(NormativeProbabilityType normativeProbabilityType) { - switch (normType) + switch (normativeProbabilityType) { - case NormType.MaximumAllowableFloodingProbability: + case NormativeProbabilityType.MaximumAllowableFloodingProbability: return WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability; - case NormType.SignalFloodingProbability: + case NormativeProbabilityType.SignalFloodingProbability: return WaveConditionsInputWaterLevelType.SignalFloodingProbability; default: throw new NotSupportedException(); Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Dialogs/ReferenceLineMetaSelectionDialog.cs =================================================================== diff -u -r78022747a007922974c3729d464fa4a5184b77f9 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Dialogs/ReferenceLineMetaSelectionDialog.cs (.../ReferenceLineMetaSelectionDialog.cs) (revision 78022747a007922974c3729d464fa4a5184b77f9) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Dialogs/ReferenceLineMetaSelectionDialog.cs (.../ReferenceLineMetaSelectionDialog.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -75,9 +75,9 @@ public double SelectedSignalFloodingProbability { get; private set; } /// - /// Gets the norm type from the selected in the dialog. + /// Gets the normative probability type from the selected in the dialog. /// - public NormType SelectedNormativeNorm { get; private set; } + public NormativeProbabilityType SelectedNormativeProbabilityType { get; private set; } protected override Button GetCancelButton() { @@ -107,16 +107,16 @@ { SelectedReferenceLineMeta = referenceLineMetaSelectionRow.ReferenceLineMeta; - SelectedNormativeNorm = SignalFloodingProbabilityRadioButton.Checked - ? NormType.SignalFloodingProbability - : NormType.MaximumAllowableFloodingProbability; + SelectedNormativeProbabilityType = SignalFloodingProbabilityRadioButton.Checked + ? NormativeProbabilityType.SignalFloodingProbability + : NormativeProbabilityType.MaximumAllowableFloodingProbability; double lowerLimitNormValue = GetNormValue(referenceLineMetaSelectionRow.MaximumAllowableFloodingProbabilityReturnPeriod); SelectedMaximumAllowableFloodingProbability = lowerLimitNormValue; SelectedSignalFloodingProbability = referenceLineMetaSelectionRow.SignalFloodingProbabilityReturnPeriod.HasValue - ? GetNormValue(referenceLineMetaSelectionRow.SignalFloodingProbabilityReturnPeriod.Value) - : lowerLimitNormValue; + ? GetNormValue(referenceLineMetaSelectionRow.SignalFloodingProbabilityReturnPeriod.Value) + : lowerLimitNormValue; } } Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/NormProperties.cs =================================================================== diff -u -rcf5f823ea7dde6c1cb19c480b0eab12bb72b1058 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/NormProperties.cs (.../NormProperties.cs) (revision cf5f823ea7dde6c1cb19c480b0eab12bb72b1058) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/NormProperties.cs (.../NormProperties.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -72,7 +72,7 @@ get => data.LowerLimitNorm; set { - ChangeNorm(() => data.LowerLimitNorm = value, NormType.MaximumAllowableFloodingProbability); + ChangeNorm(() => data.LowerLimitNorm = value, NormativeProbabilityType.MaximumAllowableFloodingProbability); } } @@ -86,7 +86,7 @@ get => data.SignalingNorm; set { - ChangeNorm(() => data.SignalingNorm = value, NormType.SignalFloodingProbability); + ChangeNorm(() => data.SignalingNorm = value, NormativeProbabilityType.SignalFloodingProbability); } } @@ -95,7 +95,7 @@ [ResourcesDisplayName(typeof(Resources), nameof(Resources.NormativeNorm_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.NormativeNorm_Description))] [TypeConverter(typeof(EnumTypeConverter))] - public NormType NormativeNorm + public NormativeProbabilityType NormativeNorm { get => data.NormativeNorm; set @@ -104,9 +104,9 @@ } } - private void ChangeNorm(Action action, NormType normType) + private void ChangeNorm(Action action, NormativeProbabilityType normativeProbabilityType) { - if (data.NormativeNorm == normType) + if (data.NormativeNorm == normativeProbabilityType) { normChangeHandler.ChangeNormativeNorm(action); } Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/AssessmentSectionFromFileHandler.cs =================================================================== diff -u -re4172c393bd01def36f1b150150495c164d9947b -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/AssessmentSectionFromFileHandler.cs (.../AssessmentSectionFromFileHandler.cs) (revision e4172c393bd01def36f1b150150495c164d9947b) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/AssessmentSectionFromFileHandler.cs (.../AssessmentSectionFromFileHandler.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -123,7 +123,7 @@ : TryCreateAssessmentSection(selectedItem, dialog.SelectedMaximumAllowableFloodingProbability, dialog.SelectedSignalFloodingProbability, - dialog.SelectedNormativeNorm); + dialog.SelectedNormativeProbabilityType); } } @@ -207,7 +207,7 @@ /// The selected . /// The lower limit norm of the assessment section. /// The signaling norm of the assessment section. - /// The norm type of the assessment section. + /// The normative probability type of the assessment section. /// The newly created . /// Thrown when: /// @@ -219,7 +219,7 @@ private AssessmentSection CreateAssessmentSection(ReferenceLineMeta selectedItem, double lowerLimitNorm, double signalingNorm, - NormType normativeNorm) + NormativeProbabilityType normativeProbabilityType) { AssessmentSection assessmentSection; AssessmentSectionSettings settingOfSelectedAssessmentSection = settings.FirstOrDefault(s => s.AssessmentSectionId == selectedItem.AssessmentSectionId); @@ -251,7 +251,7 @@ assessmentSection.ReferenceLine.SetGeometry(selectedItem.ReferenceLine.Points); } - assessmentSection.FailureMechanismContribution.NormativeNorm = normativeNorm; + assessmentSection.FailureMechanismContribution.NormativeNorm = normativeProbabilityType; return assessmentSection; } @@ -262,7 +262,7 @@ /// The selected . /// The lower limit norm of the assessment section. /// The signaling norm of the assessment section. - /// The norm type of the assessment section. + /// The normative probability type of the assessment section. /// The created . /// Thrown when: /// @@ -274,14 +274,14 @@ private AssessmentSection TryCreateAssessmentSection(ReferenceLineMeta selectedItem, double lowerLimitNorm, double signalingNorm, - NormType normativeNorm) + NormativeProbabilityType normativeProbabilityType) { try { return CreateAssessmentSection(selectedItem, lowerLimitNorm, signalingNorm, - normativeNorm); + normativeProbabilityType); } catch (ArgumentOutOfRangeException exception) { Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs =================================================================== diff -u -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs (.../FailureMechanismContributionNormChangeHandler.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs (.../FailureMechanismContributionNormChangeHandler.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -145,14 +145,14 @@ return affectedObjects; } - private IEnumerable ClearNormDependingHydraulicBoundaryLocationCalculationOutput(bool normativeNorm) + private IEnumerable ClearNormDependingHydraulicBoundaryLocationCalculationOutput(bool normativeProbability) { - NormType normToClearFor = GetNormToClearFor(normativeNorm, assessmentSection.FailureMechanismContribution.NormativeNorm); - IEnumerable calculationsToClear = GetHydraulicBoundaryLocationCalculationsToClear(normToClearFor); + NormativeProbabilityType normativeProbabilityToClearFor = GetNormativeProbabilityToClearFor(normativeProbability, assessmentSection.FailureMechanismContribution.NormativeNorm); + IEnumerable calculationsToClear = GetHydraulicBoundaryLocationCalculationsToClear(normativeProbabilityToClearFor); var affectedObjects = new List(); affectedObjects.AddRange(RiskeerCommonDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationOutput(calculationsToClear)); - affectedObjects.AddRange(RiskeerDataSynchronizationService.ClearAllWaveConditionsCalculationOutput(assessmentSection, normToClearFor)); + affectedObjects.AddRange(RiskeerDataSynchronizationService.ClearAllWaveConditionsCalculationOutput(assessmentSection, normativeProbabilityToClearFor)); if (affectedObjects.Any()) { @@ -162,21 +162,21 @@ return affectedObjects; } - private static NormType GetNormToClearFor(bool normativeNorm, NormType normativeNormType) + private static NormativeProbabilityType GetNormativeProbabilityToClearFor(bool normativeProbability, NormativeProbabilityType normativeProbabilityType) { - if (normativeNorm) + if (normativeProbability) { - return normativeNormType; + return normativeProbabilityType; } - return normativeNormType == NormType.MaximumAllowableFloodingProbability - ? NormType.SignalFloodingProbability - : NormType.MaximumAllowableFloodingProbability; + return normativeProbabilityType == NormativeProbabilityType.MaximumAllowableFloodingProbability + ? NormativeProbabilityType.SignalFloodingProbability + : NormativeProbabilityType.MaximumAllowableFloodingProbability; } - private IEnumerable GetHydraulicBoundaryLocationCalculationsToClear(NormType normToClearFor) + private IEnumerable GetHydraulicBoundaryLocationCalculationsToClear(NormativeProbabilityType normativeProbabilityToClearFor) { - return normToClearFor == NormType.MaximumAllowableFloodingProbability + return normativeProbabilityToClearFor == NormativeProbabilityType.MaximumAllowableFloodingProbability ? assessmentSection.WaterLevelCalculationsForLowerLimitNorm : assessmentSection.WaterLevelCalculationsForSignalingNorm; } Index: Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs =================================================================== diff -u -r0c9054a7f1dfd78f554eacd9a356d59c3878079c -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs (.../RiskeerDataSynchronizationService.cs) (revision 0c9054a7f1dfd78f554eacd9a356d59c3878079c) +++ Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs (.../RiskeerDataSynchronizationService.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -252,27 +252,27 @@ } /// - /// Clears the wave conditions calculation output that corresponds with the + /// Clears the wave conditions calculation output that corresponds with the /// in the . /// /// The which contains the calculations. - /// The to clear for. + /// The to clear for. /// All objects affected by the operation. /// Thrown when is null. - /// Thrown when is invalid. - /// Thrown when is not supported. - public static IEnumerable ClearAllWaveConditionsCalculationOutput(IAssessmentSection assessmentSection, NormType normType) + /// Thrown when is invalid. + /// Thrown when is not supported. + public static IEnumerable ClearAllWaveConditionsCalculationOutput(IAssessmentSection assessmentSection, NormativeProbabilityType normativeProbabilityType) { if (assessmentSection == null) { throw new ArgumentNullException(nameof(assessmentSection)); } - if (!Enum.IsDefined(typeof(NormType), normType)) + if (!Enum.IsDefined(typeof(NormativeProbabilityType), normativeProbabilityType)) { - throw new InvalidEnumArgumentException(nameof(normType), - (int) normType, - typeof(NormType)); + throw new InvalidEnumArgumentException(nameof(normativeProbabilityType), + (int) normativeProbabilityType, + typeof(NormativeProbabilityType)); } var changedObservables = new List(); @@ -283,15 +283,15 @@ { case GrassCoverErosionOutwardsFailureMechanism grassCoverErosionOutwardsFailureMechanism: changedObservables.AddRange(WaveConditionsDataSynchronizationService.ClearAllWaveConditionsCalculationOutput(grassCoverErosionOutwardsFailureMechanism, normType)); + GrassCoverErosionOutwardsWaveConditionsCalculation>(grassCoverErosionOutwardsFailureMechanism, normativeProbabilityType)); break; case StabilityStoneCoverFailureMechanism stabilityStoneCoverFailureMechanism: changedObservables.AddRange(WaveConditionsDataSynchronizationService.ClearAllWaveConditionsCalculationOutput(stabilityStoneCoverFailureMechanism, normType)); + StabilityStoneCoverWaveConditionsCalculation>(stabilityStoneCoverFailureMechanism, normativeProbabilityType)); break; case WaveImpactAsphaltCoverFailureMechanism waveImpactAsphaltCoverFailureMechanism: changedObservables.AddRange(WaveConditionsDataSynchronizationService.ClearAllWaveConditionsCalculationOutput(waveImpactAsphaltCoverFailureMechanism, normType)); + WaveImpactAsphaltCoverWaveConditionsCalculation>(waveImpactAsphaltCoverFailureMechanism, normativeProbabilityType)); break; } } Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/NormPropertiesTest.cs =================================================================== diff -u -rcf5f823ea7dde6c1cb19c480b0eab12bb72b1058 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/NormPropertiesTest.cs (.../NormPropertiesTest.cs) (revision cf5f823ea7dde6c1cb19c480b0eab12bb72b1058) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/NormPropertiesTest.cs (.../NormPropertiesTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -190,7 +190,7 @@ { // Given FailureMechanismContribution failureMechanismContribution = FailureMechanismContributionTestFactory.CreateFailureMechanismContribution(); - failureMechanismContribution.NormativeNorm = NormType.SignalFloodingProbability; + failureMechanismContribution.NormativeNorm = NormativeProbabilityType.SignalFloodingProbability; var mocks = new MockRepository(); var failureMechanismContributionNormChangeHandler = mocks.StrictMock(); @@ -220,7 +220,7 @@ { // Given FailureMechanismContribution failureMechanismContribution = FailureMechanismContributionTestFactory.CreateFailureMechanismContribution(); - failureMechanismContribution.NormativeNorm = NormType.SignalFloodingProbability; + failureMechanismContribution.NormativeNorm = NormativeProbabilityType.SignalFloodingProbability; var mocks = new MockRepository(); var failureMechanismContributionNormChangeHandler = mocks.StrictMock(); @@ -293,7 +293,7 @@ var properties = new NormProperties(failureMechanismContribution, failureMechanismContributionNormChangeHandler); - const NormType newValue = NormType.SignalFloodingProbability; + const NormativeProbabilityType newValue = NormativeProbabilityType.SignalFloodingProbability; // Call properties.NormativeNorm = newValue; Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/AssessmentSectionFromFileHandlerTest.cs =================================================================== diff -u -re4172c393bd01def36f1b150150495c164d9947b -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/AssessmentSectionFromFileHandlerTest.cs (.../AssessmentSectionFromFileHandlerTest.cs) (revision e4172c393bd01def36f1b150150495c164d9947b) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/AssessmentSectionFromFileHandlerTest.cs (.../AssessmentSectionFromFileHandlerTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -375,7 +375,7 @@ Name = "Traject 1-2", FailureMechanismContribution = { - NormativeNorm = useSignalingValue ? NormType.SignalFloodingProbability : NormType.MaximumAllowableFloodingProbability + NormativeNorm = useSignalingValue ? NormativeProbabilityType.SignalFloodingProbability : NormativeProbabilityType.MaximumAllowableFloodingProbability } }; assessmentSection.GrassCoverErosionInwards.GeneralInput.N = (RoundedDouble) 2.0; @@ -400,7 +400,7 @@ Name = "Traject 2-1", FailureMechanismContribution = { - NormativeNorm = NormType.SignalFloodingProbability + NormativeNorm = NormativeProbabilityType.SignalFloodingProbability }, GrassCoverErosionInwards = { @@ -444,7 +444,7 @@ Name = "Traject 3-3", FailureMechanismContribution = { - NormativeNorm = NormType.SignalFloodingProbability + NormativeNorm = NormativeProbabilityType.SignalFloodingProbability } }; assessmentSection.ReferenceLine.SetGeometry(new[] Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs =================================================================== diff -u -r503ad868943eed11fb553c6fdab2f4cfc4c87ab4 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs (.../FailureMechanismContributionNormChangeHandlerTest.cs) (revision 503ad868943eed11fb553c6fdab2f4cfc4c87ab4) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs (.../FailureMechanismContributionNormChangeHandlerTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -276,7 +276,7 @@ [Test] [TestCaseSource(nameof(GetChangeNormativeNormCases))] public void GivenCalculationsWithOutput_WhenChangingNormativeNorm_ThenAllDependingOutputClearedAndActionPerformedAndAllAffectedObjectsNotified( - NormType normType, Func> getLocationCalculationsFunc, + NormativeProbabilityType normativeProbabilityType, Func> getLocationCalculationsFunc, WaveConditionsInputWaterLevelType waterLevelType) { // Given @@ -287,7 +287,7 @@ }; AssessmentSection assessmentSection = TestDataGenerator.GetAssessmentSectionWithAllCalculationConfigurations(); - assessmentSection.FailureMechanismContribution.NormativeNorm = normType; + assessmentSection.FailureMechanismContribution.NormativeNorm = normativeProbabilityType; IEnumerable expectedLocationCalculationsToClear = getLocationCalculationsFunc(assessmentSection); @@ -357,7 +357,7 @@ [Test] [TestCaseSource(nameof(GetChangeNormativeNormCases))] public void GivenCalculationsWithoutOutput_WhenChangingNormativeNorm_ThenActionPerformedAndContributionNotified( - NormType normType, Func> getLocationCalculationsFunc, + NormativeProbabilityType normativeProbabilityType, Func> getLocationCalculationsFunc, WaveConditionsInputWaterLevelType waterLevelType) { // Given @@ -368,7 +368,7 @@ }; AssessmentSection assessmentSection = TestDataGenerator.GetAssessmentSectionWithAllCalculationConfigurations(); - assessmentSection.FailureMechanismContribution.NormativeNorm = normType; + assessmentSection.FailureMechanismContribution.NormativeNorm = normativeProbabilityType; IEnumerable calculationsBelongingToNorm = getLocationCalculationsFunc(assessmentSection); @@ -476,7 +476,7 @@ [Test] [TestCaseSource(nameof(GetChangeNormCases))] public void GivenCalculationsWithOutput_WhenChangingNorm_ThenAllDependingOutputClearedAndActionPerformedAndAllAffectedObjectsNotified( - NormType normType, Func> getCalculationsFunc, + NormativeProbabilityType normativeProbabilityType, Func> getCalculationsFunc, WaveConditionsInputWaterLevelType waterLevelType) { // Given @@ -487,7 +487,7 @@ }; AssessmentSection assessmentSection = TestDataGenerator.GetAssessmentSectionWithAllCalculationConfigurations(); - assessmentSection.FailureMechanismContribution.NormativeNorm = normType; + assessmentSection.FailureMechanismContribution.NormativeNorm = normativeProbabilityType; IEnumerable expectedCalculationsToClear = getCalculationsFunc(assessmentSection); @@ -545,7 +545,7 @@ [Test] [TestCaseSource(nameof(GetChangeNormCases))] public void GivenCalculationsWithoutOutput_WhenChangingNorm_ThenActionPerformedAndContributionNotified( - NormType normType, Func> getLocationCalculationsFunc, + NormativeProbabilityType normativeProbabilityType, Func> getLocationCalculationsFunc, WaveConditionsInputWaterLevelType waterLevelType) { // Given @@ -556,7 +556,7 @@ }; AssessmentSection assessmentSection = TestDataGenerator.GetAssessmentSectionWithAllCalculationConfigurations(); - assessmentSection.FailureMechanismContribution.NormativeNorm = normType; + assessmentSection.FailureMechanismContribution.NormativeNorm = normativeProbabilityType; IEnumerable calculationsBelongingToNorm = getLocationCalculationsFunc(assessmentSection); @@ -602,23 +602,23 @@ private static IEnumerable GetChangeNormativeNormCases() { yield return new TestCaseData( - NormType.MaximumAllowableFloodingProbability, new Func>( + NormativeProbabilityType.MaximumAllowableFloodingProbability, new Func>( section => section.WaterLevelCalculationsForLowerLimitNorm), WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability); yield return new TestCaseData( - NormType.SignalFloodingProbability, new Func>( + NormativeProbabilityType.SignalFloodingProbability, new Func>( section => section.WaterLevelCalculationsForSignalingNorm), WaveConditionsInputWaterLevelType.SignalFloodingProbability); } private static IEnumerable GetChangeNormCases() { yield return new TestCaseData( - NormType.MaximumAllowableFloodingProbability, new Func>( + NormativeProbabilityType.MaximumAllowableFloodingProbability, new Func>( section => section.WaterLevelCalculationsForSignalingNorm), WaveConditionsInputWaterLevelType.SignalFloodingProbability); yield return new TestCaseData( - NormType.SignalFloodingProbability, new Func>( + NormativeProbabilityType.SignalFloodingProbability, new Func>( section => section.WaterLevelCalculationsForLowerLimitNorm), WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability); } Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/Comparers/AssessmentSectionMergeComparerTest.cs =================================================================== diff -u -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/Comparers/AssessmentSectionMergeComparerTest.cs (.../AssessmentSectionMergeComparerTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/Comparers/AssessmentSectionMergeComparerTest.cs (.../AssessmentSectionMergeComparerTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -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.MaximumAllowableFloodingProbability - ? NormType.SignalFloodingProbability - : NormType.MaximumAllowableFloodingProbability, + yield return new ChangePropertyData(sec => sec.FailureMechanismContribution.NormativeNorm = sec.FailureMechanismContribution.NormativeNorm == NormativeProbabilityType.MaximumAllowableFloodingProbability + ? NormativeProbabilityType.SignalFloodingProbability + : NormativeProbabilityType.MaximumAllowableFloodingProbability, "NormType"); yield return new ChangePropertyData(sec => sec.ChangeComposition(AssessmentSectionComposition.DikeAndDune), "Composition"); Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs =================================================================== diff -u -r19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision 19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -526,36 +526,36 @@ } [Test] - public void ClearAllWaveConditionsCalculationOutputWithNormType_AssessmentSectionNull_ThrowsArgumentNullException() + public void ClearAllWaveConditionsCalculationOutputWithNormativeProbabilityType_AssessmentSectionNull_ThrowsArgumentNullException() { // Call - void Call() => RiskeerDataSynchronizationService.ClearAllWaveConditionsCalculationOutput(null, NormType.MaximumAllowableFloodingProbability); + void Call() => RiskeerDataSynchronizationService.ClearAllWaveConditionsCalculationOutput(null, NormativeProbabilityType.MaximumAllowableFloodingProbability); // Assert var exception = Assert.Throws(Call); Assert.AreEqual("assessmentSection", exception.ParamName); } [Test] - public void ClearAllWaveConditionsCalculationOutputWithNormType_InvalidNormType_ThrowsInvalidEnumArgumentException() + public void ClearAllWaveConditionsCalculationOutputWithNormativeProbabilityType_InvalidNormativeProbabilityType_ThrowsInvalidEnumArgumentException() { // Setup - const NormType normType = (NormType) 99; + const NormativeProbabilityType normativeProbabilityType = (NormativeProbabilityType) 99; // Call - void Call() => RiskeerDataSynchronizationService.ClearAllWaveConditionsCalculationOutput(new AssessmentSectionStub(), normType); + void Call() => RiskeerDataSynchronizationService.ClearAllWaveConditionsCalculationOutput(new AssessmentSectionStub(), normativeProbabilityType); // Assert - var expectedMessage = $"The value of argument 'normType' ({normType}) is invalid for Enum type '{nameof(NormType)}'."; + var expectedMessage = $"The value of argument 'normativeProbabilityType' ({normativeProbabilityType}) is invalid for Enum type '{nameof(NormativeProbabilityType)}'."; var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage); - Assert.AreEqual("normType", exception.ParamName); + Assert.AreEqual("normativeProbabilityType", exception.ParamName); } [Test] - public void ClearAllWaveConditionsCalculationOutputWithNormType_WithData_ClearsOutputAndReturnsAffectedObjects() + public void ClearAllWaveConditionsCalculationOutputWithNormativeProbabilityType_WithData_ClearsOutputAndReturnsAffectedObjects() { // Setup - const NormType normType = NormType.MaximumAllowableFloodingProbability; + const NormativeProbabilityType normativeProbabilityType = NormativeProbabilityType.MaximumAllowableFloodingProbability; AssessmentSection assessmentSection = TestDataGenerator.GetAssessmentSectionWithAllCalculationConfigurations(); var waveConditionsCalculations = new List>(); @@ -572,7 +572,7 @@ .ToArray(); // Call - IEnumerable affectedItems = RiskeerDataSynchronizationService.ClearAllWaveConditionsCalculationOutput(assessmentSection, normType); + IEnumerable affectedItems = RiskeerDataSynchronizationService.ClearAllWaveConditionsCalculationOutput(assessmentSection, normativeProbabilityType); // Assert // Note: To make sure the clear is performed regardless of what is done with Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsInputContextPropertyInfoTest.cs =================================================================== diff -u -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsInputContextPropertyInfoTest.cs (.../MacroStabilityInwardsInputContextPropertyInfoTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsInputContextPropertyInfoTest.cs (.../MacroStabilityInwardsInputContextPropertyInfoTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -60,7 +60,7 @@ { FailureMechanismContribution = { - NormativeNorm = NormType.SignalFloodingProbability + NormativeNorm = NormativeProbabilityType.SignalFloodingProbability } }; @@ -106,7 +106,7 @@ { FailureMechanismContribution = { - NormativeNorm = NormType.MaximumAllowableFloodingProbability + NormativeNorm = NormativeProbabilityType.MaximumAllowableFloodingProbability } }; Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityFactoryTest.cs =================================================================== diff -u -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityFactoryTest.cs (.../MacroStabilityInwardsCalculationActivityFactoryTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityFactoryTest.cs (.../MacroStabilityInwardsCalculationActivityFactoryTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -102,7 +102,7 @@ { FailureMechanismContribution = { - NormativeNorm = NormType.MaximumAllowableFloodingProbability + NormativeNorm = NormativeProbabilityType.MaximumAllowableFloodingProbability } }; assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] @@ -181,7 +181,7 @@ { FailureMechanismContribution = { - NormativeNorm = NormType.MaximumAllowableFloodingProbability + NormativeNorm = NormativeProbabilityType.MaximumAllowableFloodingProbability } }; assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] @@ -261,7 +261,7 @@ { FailureMechanismContribution = { - NormativeNorm = NormType.MaximumAllowableFloodingProbability + NormativeNorm = NormativeProbabilityType.MaximumAllowableFloodingProbability } }; assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] Index: Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo172IntegrationTest.cs =================================================================== diff -u -rcd783e78b3ed2c9e2c07de2fc87a09ef3510f075 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo172IntegrationTest.cs (.../MigrationTo172IntegrationTest.cs) (revision cd783e78b3ed2c9e2c07de2fc87a09ef3510f075) +++ Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo172IntegrationTest.cs (.../MigrationTo172IntegrationTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -107,7 +107,7 @@ [Test] [SetCulture("en-US")] [TestCaseSource(nameof(GetTrajectCombinations))] - public void Given171ProjectOfTrajectWithNorm_WhenMigrated_ThenDatabaseUpdatedAndExpectedLogDatabase(NormType setNormType, + public void Given171ProjectOfTrajectWithNorm_WhenMigrated_ThenDatabaseUpdatedAndExpectedLogDatabase(NormativeProbabilityType setNormType, string trajectId, int signalingReturnPeriod, int lowerLimitReturnPeriod) @@ -138,7 +138,7 @@ { databaseFile.OpenDatabaseConnection(); - double originalNorm = 1.0 / (setNormType == NormType.SignalFloodingProbability + double originalNorm = 1.0 / (setNormType == NormativeProbabilityType.SignalFloodingProbability ? signalingReturnPeriod : lowerLimitReturnPeriod); databaseFile.ExecuteQuery("INSERT INTO ProjectEntity ([ProjectEntityId]) VALUES (1);"); @@ -150,9 +150,9 @@ migrator.Migrate(fromVersionedFile, newVersion, targetFilePath); // Then - NormType expectedNormType = lowerLimitReturnPeriod == signalingReturnPeriod - ? NormType.SignalFloodingProbability - : setNormType; + NormativeProbabilityType expectedNormType = lowerLimitReturnPeriod == signalingReturnPeriod + ? NormativeProbabilityType.SignalFloodingProbability + : setNormType; string expectedAssessmentSectionQuery = GetExpectedAssessmentSectionQuery(trajectId, lowerLimitReturnPeriod, @@ -189,10 +189,10 @@ [Test] [SetCulture("en-US")] - [TestCase(2, NormType.MaximumAllowableFloodingProbability, TestName = "Given171ProjectWithNormLargerThenLowerLimit_WhenMigrated_ThenLowerLimitNormSetToNormAndExpectedLogDatabase")] - [TestCase(600, NormType.SignalFloodingProbability, TestName = "Given171ProjectWithNormLessThenLowerLimit_WhenMigrated_ThenSignalingNormSetToNormAndExpectedLogDatabase")] + [TestCase(2, NormativeProbabilityType.MaximumAllowableFloodingProbability, TestName = "Given171ProjectWithNormLargerThenLowerLimit_WhenMigrated_ThenLowerLimitNormSetToNormAndExpectedLogDatabase")] + [TestCase(600, NormativeProbabilityType.SignalFloodingProbability, TestName = "Given171ProjectWithNormLessThenLowerLimit_WhenMigrated_ThenSignalingNormSetToNormAndExpectedLogDatabase")] public void Given171ProjectWithNormNotInList_WhenMigrated_ThenDatabaseUpdatedAndExpectedLogDatabase(int originalReturnPeriod, - NormType expectedNormType) + NormativeProbabilityType expectedNormType) { // Given const string trajectId = "2-1"; @@ -233,11 +233,11 @@ migrator.Migrate(fromVersionedFile, newVersion, targetFilePath); // Then - int expectedLowerLimitReturnPeriod = expectedNormType == NormType.MaximumAllowableFloodingProbability + int expectedLowerLimitReturnPeriod = expectedNormType == NormativeProbabilityType.MaximumAllowableFloodingProbability ? originalReturnPeriod : lowerLimitReturnPeriod; - int expectedSignalingReturnPeriod = expectedNormType == NormType.SignalFloodingProbability + int expectedSignalingReturnPeriod = expectedNormType == NormativeProbabilityType.SignalFloodingProbability ? originalReturnPeriod : signalingReturnPeriod; @@ -277,7 +277,7 @@ private static string GetExpectedAssessmentSectionQuery(string trajectId, int lowerLimitReturnPeriod, int signalingReturnPeriod, - NormType normType) + NormativeProbabilityType normType) { return "SELECT COUNT() = 1 " + "FROM AssessmentSectionEntity " + @@ -287,23 +287,23 @@ $"AND [NormativeNormType] = {Convert.ToByte(normType)}"; } - private static string GetNormTypeString(NormType normType) + private static string GetNormTypeString(NormativeProbabilityType normType) { - return normType == NormType.MaximumAllowableFloodingProbability + return normType == NormativeProbabilityType.MaximumAllowableFloodingProbability ? "omgevingswaarde" : "signaleringsparameter"; } private static IEnumerable GetTrajectCombinations() { - Array normTypes = Enum.GetValues(typeof(NormType)); + Array normTypes = Enum.GetValues(typeof(NormativeProbabilityType)); IEnumerable uniqueTrajectPeriods = GetAllTrajectTestCaseData() .GroupBy(t => Tuple.Create(t.SignalingReturnPeriod, t.LowerLimitPeriod)) .Select(t => t.First()); foreach (AssessmentSectionReturnPeriod data in uniqueTrajectPeriods) { - foreach (NormType normType in normTypes) + foreach (NormativeProbabilityType normType in normTypes) { yield return new TestCaseData(normType, data.Id, @@ -313,7 +313,7 @@ } } - yield return new TestCaseData(NormType.SignalFloodingProbability, + yield return new TestCaseData(NormativeProbabilityType.SignalFloodingProbability, "NoValidTrajectId", 30000, 30000) @@ -1023,17 +1023,17 @@ private static void AssertAssessmentSectionNormMigrationMessage(MigrationLogMessage[] messages, int lowerLimitReturnPeriod, int signalingReturnPeriod, - NormType normType) + NormativeProbabilityType normType) { Assert.AreEqual(3, messages.Length); - string lowerLimitLogSuffix = normType == NormType.MaximumAllowableFloodingProbability + string lowerLimitLogSuffix = normType == NormativeProbabilityType.MaximumAllowableFloodingProbability ? " (voorheen de waarde van de norm)" : ""; MigrationLogTestHelper.AssertMigrationLogMessageEqual( new MigrationLogMessage("17.1", newVersion, $" + De omgevingswaarde is gelijk gesteld aan 1/{lowerLimitReturnPeriod}{lowerLimitLogSuffix}."), messages[0]); - string signalingLogSuffix = normType == NormType.SignalFloodingProbability + string signalingLogSuffix = normType == NormativeProbabilityType.SignalFloodingProbability ? " (voorheen de waarde van de norm)" : ""; MigrationLogTestHelper.AssertMigrationLogMessageEqual( @@ -1089,7 +1089,7 @@ messages[i++], messages[i++], messages[i++] - }, 30000, 30000, NormType.SignalFloodingProbability); + }, 30000, 30000, NormativeProbabilityType.SignalFloodingProbability); MigrationLogTestHelper.AssertMigrationLogMessageEqual( new MigrationLogMessage("17.1", newVersion, " + Faalmechanisme: 'Hoogte kunstwerk'"), messages[i++]); @@ -1129,7 +1129,7 @@ messages[i++], messages[i++], messages[i++] - }, 1000, 30000, NormType.SignalFloodingProbability); + }, 1000, 30000, NormativeProbabilityType.SignalFloodingProbability); MigrationLogTestHelper.AssertMigrationLogMessageEqual( new MigrationLogMessage("17.1", newVersion, " + Faalmechanisme: 'Betrouwbaarheid sluiting kunstwerk'"), messages[i++]); @@ -1151,7 +1151,7 @@ messages[i++], messages[i++], messages[i++] - }, 1000, 1000, NormType.SignalFloodingProbability); + }, 1000, 1000, NormativeProbabilityType.SignalFloodingProbability); MigrationLogTestHelper.AssertMigrationLogMessageEqual( new MigrationLogMessage("17.1", newVersion, "* Traject: 'assessmentSectionResults'"), @@ -1161,7 +1161,7 @@ messages[i++], messages[i++], messages[i++] - }, 1000, 3000, NormType.SignalFloodingProbability); + }, 1000, 3000, NormativeProbabilityType.SignalFloodingProbability); MigrationLogTestHelper.AssertMigrationLogMessageEqual( new MigrationLogMessage("17.1", newVersion, " + Faalmechanisme: 'Piping'"), messages[i++]); Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/SemiProbabilistic/SemiProbabilisticPipingInputContextPropertyInfoTest.cs =================================================================== diff -u -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/SemiProbabilistic/SemiProbabilisticPipingInputContextPropertyInfoTest.cs (.../SemiProbabilisticPipingInputContextPropertyInfoTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/SemiProbabilistic/SemiProbabilisticPipingInputContextPropertyInfoTest.cs (.../SemiProbabilisticPipingInputContextPropertyInfoTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -69,7 +69,7 @@ { FailureMechanismContribution = { - NormativeNorm = NormType.SignalFloodingProbability + NormativeNorm = NormativeProbabilityType.SignalFloodingProbability } }; @@ -115,7 +115,7 @@ { FailureMechanismContribution = { - NormativeNorm = NormType.MaximumAllowableFloodingProbability + NormativeNorm = NormativeProbabilityType.MaximumAllowableFloodingProbability } }; Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs =================================================================== diff -u -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs (.../PipingCalculationActivityFactoryTest.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) +++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs (.../PipingCalculationActivityFactoryTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -93,7 +93,7 @@ { FailureMechanismContribution = { - NormativeNorm = NormType.MaximumAllowableFloodingProbability + NormativeNorm = NormativeProbabilityType.MaximumAllowableFloodingProbability } }; @@ -246,7 +246,7 @@ { FailureMechanismContribution = { - NormativeNorm = NormType.MaximumAllowableFloodingProbability + NormativeNorm = NormativeProbabilityType.MaximumAllowableFloodingProbability } }; @@ -408,7 +408,7 @@ { FailureMechanismContribution = { - NormativeNorm = NormType.MaximumAllowableFloodingProbability + NormativeNorm = NormativeProbabilityType.MaximumAllowableFloodingProbability } }; Index: Riskeer/Revetment/src/Riskeer.Revetment.Data/WaveConditionsInputHelper.cs =================================================================== diff -u -r6044ea132c4c7e98cb6e08bad7e939a9fa460459 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Revetment/src/Riskeer.Revetment.Data/WaveConditionsInputHelper.cs (.../WaveConditionsInputHelper.cs) (revision 6044ea132c4c7e98cb6e08bad7e939a9fa460459) +++ Riskeer/Revetment/src/Riskeer.Revetment.Data/WaveConditionsInputHelper.cs (.../WaveConditionsInputHelper.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -50,35 +50,35 @@ /// /// Sets the of the - /// based on the . + /// based on the . /// /// The to set the water level type for. - /// The to set the for. + /// The to set the for. /// Thrown when is null. - /// Thrown when is an invalid value. - /// Thrown when is a valid value, + /// Thrown when is an invalid value. + /// Thrown when is a valid value, /// but unsupported. public static void SetWaterLevelType(WaveConditionsInput waveConditionsInput, - NormType normType) + NormativeProbabilityType normativeProbabilityType) { if (waveConditionsInput == null) { throw new ArgumentNullException(nameof(waveConditionsInput)); } - if (!Enum.IsDefined(typeof(NormType), normType)) + if (!Enum.IsDefined(typeof(NormativeProbabilityType), normativeProbabilityType)) { - throw new InvalidEnumArgumentException(nameof(normType), - (int) normType, - typeof(NormType)); + throw new InvalidEnumArgumentException(nameof(normativeProbabilityType), + (int) normativeProbabilityType, + typeof(NormativeProbabilityType)); } - switch (normType) + switch (normativeProbabilityType) { - case NormType.MaximumAllowableFloodingProbability: + case NormativeProbabilityType.MaximumAllowableFloodingProbability: waveConditionsInput.WaterLevelType = WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability; break; - case NormType.SignalFloodingProbability: + case NormativeProbabilityType.SignalFloodingProbability: waveConditionsInput.WaterLevelType = WaveConditionsInputWaterLevelType.SignalFloodingProbability; break; default: Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationImporter.cs =================================================================== diff -u -r6044ea132c4c7e98cb6e08bad7e939a9fa460459 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationImporter.cs (.../WaveConditionsCalculationConfigurationImporter.cs) (revision 6044ea132c4c7e98cb6e08bad7e939a9fa460459) +++ Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationImporter.cs (.../WaveConditionsCalculationConfigurationImporter.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -231,9 +231,9 @@ { switch (failureMechanismContribution.NormativeNorm) { - case NormType.MaximumAllowableFloodingProbability: + case NormativeProbabilityType.MaximumAllowableFloodingProbability: return WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability; - case NormType.SignalFloodingProbability: + case NormativeProbabilityType.SignalFloodingProbability: return WaveConditionsInputWaterLevelType.SignalFloodingProbability; default: throw new NotSupportedException(); Index: Riskeer/Revetment/src/Riskeer.Revetment.Service/WaveConditionsDataSynchronizationService.cs =================================================================== diff -u -r21ded87c36d9ef4309ae4b85dc60b67358b1e1c2 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Revetment/src/Riskeer.Revetment.Service/WaveConditionsDataSynchronizationService.cs (.../WaveConditionsDataSynchronizationService.cs) (revision 21ded87c36d9ef4309ae4b85dc60b67358b1e1c2) +++ Riskeer/Revetment/src/Riskeer.Revetment.Service/WaveConditionsDataSynchronizationService.cs (.../WaveConditionsDataSynchronizationService.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -39,19 +39,19 @@ public static class WaveConditionsDataSynchronizationService { /// - /// Clears the output for all calculations that corresponds with the + /// Clears the output for all calculations that corresponds with the /// in the given . /// /// The failure mechanism which contains the calculations. - /// The to clear for. + /// The to clear for. /// The type of the calculatable failure mechanism. /// The type of the calculation. /// An of calculations which are affected by clearing the output. /// Thrown when is null. - /// Thrown when is invalid. - /// Thrown when is not supported. + /// Thrown when is invalid. + /// Thrown when is not supported. public static IEnumerable ClearAllWaveConditionsCalculationOutput( - TFailureMechanism failureMechanism, NormType normType) + TFailureMechanism failureMechanism, NormativeProbabilityType normativeProbabilityType) where TFailureMechanism : ICalculatableFailureMechanism where TCalculation : ICalculation { @@ -60,7 +60,7 @@ throw new ArgumentNullException(nameof(failureMechanism)); } - WaveConditionsInputWaterLevelType waterLevelType = GetWaterLevelTypeFromNormType(normType); + WaveConditionsInputWaterLevelType waterLevelType = GetWaterLevelTypeFromNormType(normativeProbabilityType); var affectedItems = new List(); foreach (TCalculation calculation in failureMechanism.Calculations @@ -153,26 +153,26 @@ } /// - /// Gets the based on the given . + /// Gets the based on the given . /// - /// The to get the from. + /// The to get the from. /// A . - /// Thrown when is invalid. - /// Thrown when is not supported. - private static WaveConditionsInputWaterLevelType GetWaterLevelTypeFromNormType(NormType normType) + /// Thrown when is invalid. + /// Thrown when is not supported. + private static WaveConditionsInputWaterLevelType GetWaterLevelTypeFromNormType(NormativeProbabilityType normativeProbabilityType) { - if (!Enum.IsDefined(typeof(NormType), normType)) + if (!Enum.IsDefined(typeof(NormativeProbabilityType), normativeProbabilityType)) { - throw new InvalidEnumArgumentException(nameof(normType), - (int) normType, - typeof(NormType)); + throw new InvalidEnumArgumentException(nameof(normativeProbabilityType), + (int) normativeProbabilityType, + typeof(NormativeProbabilityType)); } - switch (normType) + switch (normativeProbabilityType) { - case NormType.MaximumAllowableFloodingProbability: + case NormativeProbabilityType.MaximumAllowableFloodingProbability: return WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability; - case NormType.SignalFloodingProbability: + case NormativeProbabilityType.SignalFloodingProbability: return WaveConditionsInputWaterLevelType.SignalFloodingProbability; default: throw new NotSupportedException(); Index: Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/WaveConditionsInputHelperTest.cs =================================================================== diff -u -r6044ea132c4c7e98cb6e08bad7e939a9fa460459 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/WaveConditionsInputHelperTest.cs (.../WaveConditionsInputHelperTest.cs) (revision 6044ea132c4c7e98cb6e08bad7e939a9fa460459) +++ Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/WaveConditionsInputHelperTest.cs (.../WaveConditionsInputHelperTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -59,40 +59,40 @@ var random = new Random(21); // Call - void Call() => WaveConditionsInputHelper.SetWaterLevelType(null, random.NextEnumValue()); + void Call() => WaveConditionsInputHelper.SetWaterLevelType(null, random.NextEnumValue()); // Assert var exception = Assert.Throws(Call); Assert.AreEqual("waveConditionsInput", exception.ParamName); } [Test] - public void SetWaterLevelType_InvalidNormType_ThrowsInvalidEnumArgumentException() + public void SetWaterLevelType_InvalidNormativeProbabilityType_ThrowsInvalidEnumArgumentException() { // Setup - const NormType normType = (NormType) 99; + const NormativeProbabilityType normativeProbabilityType = (NormativeProbabilityType) 99; // Call - void Call() => WaveConditionsInputHelper.SetWaterLevelType(new WaveConditionsInput(), normType); + void Call() => WaveConditionsInputHelper.SetWaterLevelType(new WaveConditionsInput(), normativeProbabilityType); // Assert - var expectedMessage = $"The value of argument 'normType' ({normType}) is invalid for Enum type '{nameof(NormType)}'."; + var expectedMessage = $"The value of argument 'normativeProbabilityType' ({normativeProbabilityType}) is invalid for Enum type '{nameof(NormativeProbabilityType)}'."; var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage); - Assert.AreEqual("normType", exception.ParamName); + Assert.AreEqual("normativeProbabilityType", exception.ParamName); } [Test] - [TestCase(NormType.MaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability)] - [TestCase(NormType.SignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability)] + [TestCase(NormativeProbabilityType.MaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability)] + [TestCase(NormativeProbabilityType.SignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability)] public void SetWaterLevelType_WithWaveConditionsInputAndVariousNormTypes_SetsWaterLevelType( - NormType normType, + NormativeProbabilityType normativeProbabilityType, WaveConditionsInputWaterLevelType expectedWaveConditionsInputWaterLevelType) { // Setup var waveConditionsInput = new WaveConditionsInput(); // Call - WaveConditionsInputHelper.SetWaterLevelType(waveConditionsInput, normType); + WaveConditionsInputHelper.SetWaterLevelType(waveConditionsInput, normativeProbabilityType); // Assert Assert.AreEqual(expectedWaveConditionsInputWaterLevelType, waveConditionsInput.WaterLevelType); Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationImporterTest.cs =================================================================== diff -u -r6044ea132c4c7e98cb6e08bad7e939a9fa460459 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationImporterTest.cs (.../WaveConditionsCalculationConfigurationImporterTest.cs) (revision 6044ea132c4c7e98cb6e08bad7e939a9fa460459) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationImporterTest.cs (.../WaveConditionsCalculationConfigurationImporterTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -300,9 +300,9 @@ } [Test] - [TestCase(NormType.MaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability)] - [TestCase(NormType.SignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability)] - public void Import_TargetProbabilityNull_DataAddedToModel(NormType normType, WaveConditionsInputWaterLevelType expectedWaterLevelType) + [TestCase(NormativeProbabilityType.MaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability)] + [TestCase(NormativeProbabilityType.SignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability)] + public void Import_TargetProbabilityNull_DataAddedToModel(NormativeProbabilityType normativeProbabilityType, WaveConditionsInputWaterLevelType expectedWaterLevelType) { // Setup string filePath = Path.Combine(path, "validConfigurationWithoutTargetProbability.xml"); @@ -321,7 +321,7 @@ }); var failureMechanismContribution = new FailureMechanismContribution(0.1, 0.1) { - NormativeNorm = normType + NormativeNorm = normativeProbabilityType }; var importer = new TestWaveConditionsCalculationConfigurationImporter( Index: Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsDataSynchronizationServiceTest.cs =================================================================== diff -u -re52a2b934228724b12e794fc38b91c69400bfabc -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsDataSynchronizationServiceTest.cs (.../WaveConditionsDataSynchronizationServiceTest.cs) (revision e52a2b934228724b12e794fc38b91c69400bfabc) +++ Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsDataSynchronizationServiceTest.cs (.../WaveConditionsDataSynchronizationServiceTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -41,37 +41,37 @@ public class WaveConditionsDataSynchronizationServiceTest { [Test] - public void ClearAllWaveConditionsCalculationOutputWithNormType_FailureMechanismNull_ThrowsArgumentNullException() + public void ClearAllWaveConditionsCalculationOutputWithNormativeProbabilityType_FailureMechanismNull_ThrowsArgumentNullException() { // Call void Call() => WaveConditionsDataSynchronizationService.ClearAllWaveConditionsCalculationOutput>( - null, NormType.SignalFloodingProbability); + null, NormativeProbabilityType.SignalFloodingProbability); // Assert var exception = Assert.Throws(Call); Assert.AreEqual("failureMechanism", exception.ParamName); } [Test] - public void ClearAllWaveConditionsCalculationOutputWithNormType_InvalidNormType_ThrowsInvalidEnumArgumentException() + public void ClearAllWaveConditionsCalculationOutputWithNormativeProbabilityType_InvalidNormativeProbabilityType_ThrowsInvalidEnumArgumentException() { // Setup - const NormType normType = (NormType) 99; + const NormativeProbabilityType normativeProbabilityType = (NormativeProbabilityType) 99; // Call void Call() => WaveConditionsDataSynchronizationService.ClearAllWaveConditionsCalculationOutput>( - new TestCalculatableFailureMechanism(), normType); + new TestCalculatableFailureMechanism(), normativeProbabilityType); // Assert - var expectedMessage = $"The value of argument 'normType' ({normType}) is invalid for Enum type '{nameof(NormType)}'."; + var expectedMessage = $"The value of argument 'normativeProbabilityType' ({normativeProbabilityType}) is invalid for Enum type '{nameof(NormativeProbabilityType)}'."; var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage); - Assert.AreEqual("normType", exception.ParamName); + Assert.AreEqual("normativeProbabilityType", exception.ParamName); } [Test] - [TestCase(NormType.MaximumAllowableFloodingProbability)] - [TestCase(NormType.SignalFloodingProbability)] - public void ClearAllWaveConditionsCalculationOutputWithNormType_WithAllData_ClearsOutputAndReturnsAffectedObjects(NormType normType) + [TestCase(NormativeProbabilityType.MaximumAllowableFloodingProbability)] + [TestCase(NormativeProbabilityType.SignalFloodingProbability)] + public void ClearAllWaveConditionsCalculationOutputWithNormativeProbabilityType_WithAllData_ClearsOutputAndReturnsAffectedObjects(NormativeProbabilityType normativeProbabilityType) { // Setup var calculation1 = new TestWaveConditionsCalculation(new WaveConditionsInput @@ -104,14 +104,14 @@ TestWaveConditionsCalculation[] expectedAffectedCalculations = { - normType == NormType.MaximumAllowableFloodingProbability + normativeProbabilityType == NormativeProbabilityType.MaximumAllowableFloodingProbability ? calculation2 : calculation1 }; // Call IEnumerable affectedCalculations = WaveConditionsDataSynchronizationService.ClearAllWaveConditionsCalculationOutput>( - failureMechanism, normType); + failureMechanism, normativeProbabilityType); // Assert CollectionAssert.AreEqual(expectedAffectedCalculations, affectedCalculations); Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/StabilityStoneCoverCalculationConfigurationHelper.cs =================================================================== diff -u -r07256b6a9cc4abaff600e7c9a266cef54295b3c3 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/StabilityStoneCoverCalculationConfigurationHelper.cs (.../StabilityStoneCoverCalculationConfigurationHelper.cs) (revision 07256b6a9cc4abaff600e7c9a266cef54295b3c3) +++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/StabilityStoneCoverCalculationConfigurationHelper.cs (.../StabilityStoneCoverCalculationConfigurationHelper.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -38,19 +38,19 @@ { /// /// Adds in the - /// based on the and the . + /// based on the and the . /// /// Locations to base the calculation upon. /// The list to update. - /// The to set the water level type input for. + /// The to set the water level type input for. /// Throw when any /// or is null. - /// Thrown when is an invalid value. - /// Thrown when is a valid value, + /// Thrown when is an invalid value. + /// Thrown when is a valid value, /// but unsupported. public static void AddCalculationsFromLocations(IEnumerable locations, List calculations, - NormType normType) + NormativeProbabilityType normativeProbabilityType) { if (locations == null) { @@ -66,7 +66,7 @@ { calculations.Add(CreateStabilityStoneCoverWaveConditionsCalculation(hydraulicBoundaryLocation, calculations, - normType)); + normativeProbabilityType)); } } @@ -76,15 +76,15 @@ /// /// The to set. /// The list of calculations to base the calculation name from. - /// The to base the water level type input on. + /// The to base the water level type input on. /// An representing a stability stone cover calculation. - /// Thrown when is an invalid value. - /// Thrown when is a valid value, + /// Thrown when is an invalid value. + /// Thrown when is a valid value, /// but unsupported. private static ICalculationBase CreateStabilityStoneCoverWaveConditionsCalculation( HydraulicBoundaryLocation hydraulicBoundaryLocation, IEnumerable calculations, - NormType normType) + NormativeProbabilityType normativeProbabilityType) { string nameBase = hydraulicBoundaryLocation.Name; var calculation = new StabilityStoneCoverWaveConditionsCalculation @@ -95,7 +95,7 @@ HydraulicBoundaryLocation = hydraulicBoundaryLocation } }; - WaveConditionsInputHelper.SetWaterLevelType(calculation.InputParameters, normType); + WaveConditionsInputHelper.SetWaterLevelType(calculation.InputParameters, normativeProbabilityType); return calculation; } } Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs =================================================================== diff -u -r841fadc937a0f35244810144a2ea82b9ccd5da80 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 841fadc937a0f35244810144a2ea82b9ccd5da80) +++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -591,12 +591,12 @@ private static void GenerateStabilityStoneCoverCalculations(IEnumerable hydraulicBoundaryLocations, List calculationCollection, - NormType normType) + NormativeProbabilityType normativeProbabilityType) { StabilityStoneCoverCalculationConfigurationHelper.AddCalculationsFromLocations( hydraulicBoundaryLocations, calculationCollection, - normType); + normativeProbabilityType); } private static void AddWaveConditionsCalculation(StabilityStoneCoverCalculationGroupContext nodeData) Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Forms.Test/StabilityStoneCoverCalculationConfigurationHelperTest.cs =================================================================== diff -u -r6044ea132c4c7e98cb6e08bad7e939a9fa460459 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Forms.Test/StabilityStoneCoverCalculationConfigurationHelperTest.cs (.../StabilityStoneCoverCalculationConfigurationHelperTest.cs) (revision 6044ea132c4c7e98cb6e08bad7e939a9fa460459) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Forms.Test/StabilityStoneCoverCalculationConfigurationHelperTest.cs (.../StabilityStoneCoverCalculationConfigurationHelperTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -43,7 +43,7 @@ var calculations = new List(); // Call - void Call() => StabilityStoneCoverCalculationConfigurationHelper.AddCalculationsFromLocations(null, calculations, random.NextEnumValue()); + void Call() => StabilityStoneCoverCalculationConfigurationHelper.AddCalculationsFromLocations(null, calculations, random.NextEnumValue()); // Assert string paramName = Assert.Throws(Call).ParamName; @@ -58,7 +58,7 @@ IEnumerable locations = Enumerable.Empty(); // Call - void Call() => StabilityStoneCoverCalculationConfigurationHelper.AddCalculationsFromLocations(locations, null, random.NextEnumValue()); + void Call() => StabilityStoneCoverCalculationConfigurationHelper.AddCalculationsFromLocations(locations, null, random.NextEnumValue()); // Assert string paramName = Assert.Throws(Call).ParamName; @@ -74,17 +74,17 @@ var calculationBases = new List(); // Call - StabilityStoneCoverCalculationConfigurationHelper.AddCalculationsFromLocations(locations, calculationBases, random.NextEnumValue()); + StabilityStoneCoverCalculationConfigurationHelper.AddCalculationsFromLocations(locations, calculationBases, random.NextEnumValue()); // Assert CollectionAssert.IsEmpty(calculationBases); } [Test] - [TestCase(NormType.MaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability)] - [TestCase(NormType.SignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability)] + [TestCase(NormativeProbabilityType.MaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability)] + [TestCase(NormativeProbabilityType.SignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability)] public void AddCalculationsFromLocations_MultipleCalculationsEmptyCalculationBase_ReturnsUniquelyNamedCalculationsWithCorrectInputSet( - NormType normType, + NormativeProbabilityType normativeProbabilityType, WaveConditionsInputWaterLevelType expectedWaveConditionsInputWaterLevelType) { // Setup @@ -97,7 +97,7 @@ var calculationBases = new List(); // Call - StabilityStoneCoverCalculationConfigurationHelper.AddCalculationsFromLocations(locations, calculationBases, normType); + StabilityStoneCoverCalculationConfigurationHelper.AddCalculationsFromLocations(locations, calculationBases, normativeProbabilityType); // Assert Assert.AreEqual(2, calculationBases.Count); @@ -115,10 +115,10 @@ } [Test] - [TestCase(NormType.MaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability)] - [TestCase(NormType.SignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability)] + [TestCase(NormativeProbabilityType.MaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability)] + [TestCase(NormativeProbabilityType.SignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability)] public void AddCalculationsFromLocations_MultipleCalculationsAndDuplicateNameInCalculationBase_ReturnsUniquelyNamedCalculationsWithCorrectInputSet( - NormType normType, + NormativeProbabilityType normativeProbabilityType, WaveConditionsInputWaterLevelType expectedWaveConditionsInputWaterLevelType) { // Setup @@ -137,7 +137,7 @@ }; // Call - StabilityStoneCoverCalculationConfigurationHelper.AddCalculationsFromLocations(locations, calculationBases, normType); + StabilityStoneCoverCalculationConfigurationHelper.AddCalculationsFromLocations(locations, calculationBases, normativeProbabilityType); // Assert Assert.AreEqual(3, calculationBases.Count); Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rbe73db4b4573dd45d63d960bd5826b3ac33fbdf3 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverCalculationGroupContextTreeNodeInfoTest.cs) (revision be73db4b4573dd45d63d960bd5826b3ac33fbdf3) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverCalculationGroupContextTreeNodeInfoTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -1404,10 +1404,10 @@ } [Test] - [TestCase(NormType.SignalFloodingProbability)] - [TestCase(NormType.MaximumAllowableFloodingProbability)] + [TestCase(NormativeProbabilityType.SignalFloodingProbability)] + [TestCase(NormativeProbabilityType.MaximumAllowableFloodingProbability)] public void ContextMenuStrip_ClickOnAddCalculationItem_AddCalculationToCalculationGroupAndNotifyObservers( - NormType normType) + NormativeProbabilityType normativeProbabilityType) { // Setup var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -1417,7 +1417,7 @@ { FailureMechanismContribution = { - NormativeNorm = normType + NormativeNorm = normativeProbabilityType } }; var nodeData = new StabilityStoneCoverCalculationGroupContext(group, @@ -1456,7 +1456,7 @@ Assert.IsNotNull(newCalculationItem); Assert.AreEqual("Nieuwe berekening (1)", newlyAddedItem.Name, "An item with the same name default name already exists, therefore '(1)' needs to be appended."); - Assert.AreEqual(GetWaterLevelTypeFromNormType(normType), newCalculationItem.InputParameters.WaterLevelType); + Assert.AreEqual(GetWaterLevelTypeFromNormType(normativeProbabilityType), newCalculationItem.InputParameters.WaterLevelType); } } } @@ -1466,7 +1466,7 @@ { // Given var random = new Random(21); - var normType = random.NextEnumValue(); + var normType = random.NextEnumValue(); using (var treeViewControl = new TreeViewControl()) { @@ -1908,13 +1908,13 @@ }; } - private static WaveConditionsInputWaterLevelType GetWaterLevelTypeFromNormType(NormType normType) + private static WaveConditionsInputWaterLevelType GetWaterLevelTypeFromNormType(NormativeProbabilityType normativeProbabilityType) { - switch (normType) + switch (normativeProbabilityType) { - case NormType.MaximumAllowableFloodingProbability: + case NormativeProbabilityType.MaximumAllowableFloodingProbability: return WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability; - case NormType.SignalFloodingProbability: + case NormativeProbabilityType.SignalFloodingProbability: return WaveConditionsInputWaterLevelType.SignalFloodingProbability; default: throw new NotSupportedException(); Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs =================================================================== diff -u -re63d76cffd22655ce3e821d57f05e66464eec2cb -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision e63d76cffd22655ce3e821d57f05e66464eec2cb) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -64,7 +64,7 @@ }, FailureMechanismContribution = { - NormativeNorm = (NormType) entity.NormativeNormType + NormativeNorm = (NormativeProbabilityType) entity.NormativeNormType } }; Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs =================================================================== diff -u -r1da7c54acabe2073a9ab5611828527b91b5f0df7 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision 1da7c54acabe2073a9ab5611828527b91b5f0df7) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -75,7 +75,7 @@ const double transparency = 0.3; const bool isVisible = true; const BackgroundDataType backgroundType = BackgroundDataType.Wmts; - var normativeNorm = random.NextEnumValue(); + var normativeNorm = random.NextEnumValue(); IEnumerable specificFailureMechanisms = Enumerable.Repeat(new SpecificFailureMechanism(), random.Next(1, 10)) .ToArray(); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs =================================================================== diff -u -r1da7c54acabe2073a9ab5611828527b91b5f0df7 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 1da7c54acabe2073a9ab5611828527b91b5f0df7) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -69,7 +69,7 @@ const string comments = "Some text"; const double lowerLimitNorm = 0.05; const double signalingNorm = 0.02; - var normativeNorm = new Random(9).NextEnumValue(); + var normativeNorm = new Random(9).NextEnumValue(); var entity = new AssessmentSectionEntity { Id = testId, @@ -1169,7 +1169,7 @@ { LowerLimitNorm = 1.0 / 30000, SignalingNorm = 1.0 / 300000, - NormativeNormType = Convert.ToByte(NormType.SignalFloodingProbability), + NormativeNormType = Convert.ToByte(NormativeProbabilityType.SignalFloodingProbability), Composition = Convert.ToByte(AssessmentSectionComposition.Dike) }; } Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ProjectEntityReadExtensionsTest.cs =================================================================== diff -u -r438f3851b82093b28981a99b8ba5b970756fcddc -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ProjectEntityReadExtensionsTest.cs (.../ProjectEntityReadExtensionsTest.cs) (revision 438f3851b82093b28981a99b8ba5b970756fcddc) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/ProjectEntityReadExtensionsTest.cs (.../ProjectEntityReadExtensionsTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -118,7 +118,7 @@ { SignalingNorm = 0.00001, LowerLimitNorm = 0.0001, - NormativeNormType = Convert.ToByte(random.NextEnumValue()), + NormativeNormType = Convert.ToByte(random.NextEnumValue()), Name = "Just a name", Composition = Convert.ToByte(random.NextEnumValue()), BackgroundDataEntities = new[] Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs =================================================================== diff -u -r19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d) +++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -93,7 +93,7 @@ { LowerLimitNorm = 1.0 / 10, SignalingNorm = 1.0 / 1000000, - NormativeNorm = NormType.SignalFloodingProbability + NormativeNorm = NormativeProbabilityType.SignalFloodingProbability } }; SetHydraulicBoundaryLocationConfigurationSettings(assessmentSection.HydraulicBoundaryDatabase); Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.cs =================================================================== diff -u -r07256b6a9cc4abaff600e7c9a266cef54295b3c3 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.cs) (revision 07256b6a9cc4abaff600e7c9a266cef54295b3c3) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -38,18 +38,18 @@ { /// /// Adds in the - /// based on the and the . + /// based on the and the . /// /// Locations to base the calculation upon. /// The list to update. - /// The to set the water level type input for. + /// The to set the water level type input for. /// Throw when any input parameter is null. - /// Thrown when is an invalid value. - /// Thrown when is a valid value, + /// Thrown when is an invalid value. + /// Thrown when is a valid value, /// but unsupported. public static void AddCalculationsFromLocations(IEnumerable locations, List calculations, - NormType normType) + NormativeProbabilityType normativeProbabilityType) { if (locations == null) { @@ -65,7 +65,7 @@ { calculations.Add(CreateWaveImpactAsphaltCoverWaveConditionsCalculation(hydraulicBoundaryLocation, calculations, - normType)); + normativeProbabilityType)); } } @@ -75,15 +75,15 @@ /// /// The to set. /// The list of calculations to base the calculation name from. - /// The to base the water level type input on. + /// The to base the water level type input on. /// An representing a wave impact asphalt cover calculation. - /// Thrown when is an invalid value. - /// Thrown when is a valid value, + /// Thrown when is an invalid value. + /// Thrown when is a valid value, /// but unsupported. private static ICalculationBase CreateWaveImpactAsphaltCoverWaveConditionsCalculation( HydraulicBoundaryLocation hydraulicBoundaryLocation, IEnumerable calculations, - NormType normType) + NormativeProbabilityType normativeProbabilityType) { string nameBase = hydraulicBoundaryLocation.Name; var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation @@ -94,7 +94,7 @@ HydraulicBoundaryLocation = hydraulicBoundaryLocation } }; - WaveConditionsInputHelper.SetWaterLevelType(calculation.InputParameters, normType); + WaveConditionsInputHelper.SetWaterLevelType(calculation.InputParameters, normativeProbabilityType); return calculation; } } Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -r841fadc937a0f35244810144a2ea82b9ccd5da80 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 841fadc937a0f35244810144a2ea82b9ccd5da80) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -593,12 +593,12 @@ private static void GenerateWaveImpactAsphaltCoverWaveConditionsCalculations(IEnumerable hydraulicBoundaryLocations, List calculationCollection, - NormType normType) + NormativeProbabilityType normativeProbabilityType) { WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.AddCalculationsFromLocations( hydraulicBoundaryLocations, calculationCollection, - normType); + normativeProbabilityType); } private static void AddWaveConditionsCalculation(WaveImpactAsphaltCoverCalculationGroupContext nodeData) Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelperTest.cs =================================================================== diff -u -r6044ea132c4c7e98cb6e08bad7e939a9fa460459 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelperTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelperTest.cs) (revision 6044ea132c4c7e98cb6e08bad7e939a9fa460459) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelperTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelperTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -43,7 +43,7 @@ var calculations = new List(); // Call - void Call() => WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.AddCalculationsFromLocations(null, calculations, random.NextEnumValue()); + void Call() => WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.AddCalculationsFromLocations(null, calculations, random.NextEnumValue()); // Assert string paramName = Assert.Throws(Call).ParamName; @@ -58,7 +58,7 @@ IEnumerable locations = Enumerable.Empty(); // Call - void Call() => WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.AddCalculationsFromLocations(locations, null, random.NextEnumValue()); + void Call() => WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.AddCalculationsFromLocations(locations, null, random.NextEnumValue()); // Assert string paramName = Assert.Throws(Call).ParamName; @@ -76,17 +76,17 @@ // Call WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.AddCalculationsFromLocations(locations, calculationBases, - random.NextEnumValue()); + random.NextEnumValue()); // Assert CollectionAssert.IsEmpty(calculationBases); } [Test] - [TestCase(NormType.MaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability)] - [TestCase(NormType.SignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability)] + [TestCase(NormativeProbabilityType.MaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability)] + [TestCase(NormativeProbabilityType.SignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability)] public void AddCalculationsFromLocations_MultipleCalculationsEmptyCalculationBase_ReturnsUniquelyNamedCalculationsWithCorrectInputSet( - NormType normType, + NormativeProbabilityType normativeProbabilityType, WaveConditionsInputWaterLevelType expectedWaveConditionsInputWaterLevelType) { // Setup @@ -101,7 +101,7 @@ // Call WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.AddCalculationsFromLocations(locations, calculationBases, - normType); + normativeProbabilityType); // Assert Assert.AreEqual(2, calculationBases.Count); @@ -119,10 +119,10 @@ } [Test] - [TestCase(NormType.MaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability)] - [TestCase(NormType.SignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability)] + [TestCase(NormativeProbabilityType.MaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability)] + [TestCase(NormativeProbabilityType.SignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability)] public void AddCalculationsFromLocations_MultipleCalculationsAndDuplicateNameInCalculationBase_ReturnsUniquelyNamedCalculationsWithCorrectInputSet( - NormType normType, + NormativeProbabilityType normativeProbabilityType, WaveConditionsInputWaterLevelType expectedWaveConditionsInputWaterLevelType) { // Setup @@ -141,7 +141,7 @@ }; // Call - WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.AddCalculationsFromLocations(locations, calculationBases, normType); + WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.AddCalculationsFromLocations(locations, calculationBases, normativeProbabilityType); // Assert Assert.AreEqual(3, calculationBases.Count); Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r8da89db9c186cedc26c4baa657f2dd8961877ec4 -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverCalculationGroupContextTreeNodeInfoTest.cs) (revision 8da89db9c186cedc26c4baa657f2dd8961877ec4) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverCalculationGroupContextTreeNodeInfoTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) @@ -1429,10 +1429,10 @@ } [Test] - [TestCase(NormType.SignalFloodingProbability)] - [TestCase(NormType.MaximumAllowableFloodingProbability)] + [TestCase(NormativeProbabilityType.SignalFloodingProbability)] + [TestCase(NormativeProbabilityType.MaximumAllowableFloodingProbability)] public void ContextMenuStrip_ClickOnAddCalculationItem_AddCalculationToCalculationGroupAndNotifyObservers( - NormType normType) + NormativeProbabilityType normativeProbabilityType) { // Setup var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -1442,7 +1442,7 @@ { FailureMechanismContribution = { - NormativeNorm = normType + NormativeNorm = normativeProbabilityType } }; var nodeData = new WaveImpactAsphaltCoverCalculationGroupContext(group, @@ -1482,7 +1482,7 @@ Assert.IsNotNull(newCalculationItem); Assert.AreEqual("Nieuwe berekening (1)", newlyAddedItem.Name, "An item with the same name default name already exists, therefore '(1)' needs to be appended."); - Assert.AreEqual(GetWaterLevelTypeFromNormType(normType), newCalculationItem.InputParameters.WaterLevelType); + Assert.AreEqual(GetWaterLevelTypeFromNormType(normativeProbabilityType), newCalculationItem.InputParameters.WaterLevelType); } } } @@ -1492,7 +1492,7 @@ { // Given var random = new Random(21); - var normType = random.NextEnumValue(); + var normType = random.NextEnumValue(); using (var treeViewControl = new TreeViewControl()) { @@ -1931,13 +1931,13 @@ }; } - private static WaveConditionsInputWaterLevelType GetWaterLevelTypeFromNormType(NormType normType) + private static WaveConditionsInputWaterLevelType GetWaterLevelTypeFromNormType(NormativeProbabilityType normativeProbabilityType) { - switch (normType) + switch (normativeProbabilityType) { - case NormType.MaximumAllowableFloodingProbability: + case NormativeProbabilityType.MaximumAllowableFloodingProbability: return WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability; - case NormType.SignalFloodingProbability: + case NormativeProbabilityType.SignalFloodingProbability: return WaveConditionsInputWaterLevelType.SignalFloodingProbability; default: throw new NotSupportedException();