Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/MacroStabilityOutwardsFailureMechanismSectionResult.cs =================================================================== diff -u -r59512bde82de1297788119a8cacd067789389d41 -r264bb2a86306cb8dd1562164451d501321747709 --- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/MacroStabilityOutwardsFailureMechanismSectionResult.cs (.../MacroStabilityOutwardsFailureMechanismSectionResult.cs) (revision 59512bde82de1297788119a8cacd067789389d41) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/MacroStabilityOutwardsFailureMechanismSectionResult.cs (.../MacroStabilityOutwardsFailureMechanismSectionResult.cs) (revision 264bb2a86306cb8dd1562164451d501321747709) @@ -24,6 +24,7 @@ using Core.Common.Base; using Core.Common.Base.Data; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.Probability; using Ringtoets.Common.Primitives; using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; @@ -71,7 +72,7 @@ /// /// Gets or sets the value for the detailed assessment of safety per failure mechanism section as a probability. /// - /// Thrown when is not in range [0,1]. + /// Thrown when is not in range [0,1]. public double DetailedAssessmentProbability { get @@ -80,13 +81,9 @@ } set { - if (!double.IsNaN(value) && !validityRangeAssessmentProbability.InRange(value)) - { - string message = string.Format(RingtoetsCommonDataResources.ArbitraryProbabilityFailureMechanismSectionResult_AssessmentProbability_Value_needs_to_be_in_Range_0_, - validityRangeAssessmentProbability.ToString(FormattableConstants.ShowAtLeastOneDecimal, CultureInfo.CurrentCulture)); - throw new ArgumentException(message); - } - + ProbabilityHelper.ValidateProbability(value, null, + RingtoetsCommonDataResources.ArbitraryProbabilityFailureMechanismSectionResult_AssessmentProbability_Value_needs_to_be_in_Range_0_, + true); detailedAssessmentProbability = value; } } Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRow.cs =================================================================== diff -u -r59512bde82de1297788119a8cacd067789389d41 -r264bb2a86306cb8dd1562164451d501321747709 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRow.cs (.../MacroStabilityOutwardsSectionResultRow.cs) (revision 59512bde82de1297788119a8cacd067789389d41) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRow.cs (.../MacroStabilityOutwardsSectionResultRow.cs) (revision 264bb2a86306cb8dd1562164451d501321747709) @@ -61,7 +61,7 @@ /// /// Gets or sets the detailed assessment probability of the . /// - /// Thrown when is + /// Thrown when is /// not in the range [0,1]. [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] public double DetailedAssessmentProbability Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/MacroStabilityOutwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -r59512bde82de1297788119a8cacd067789389d41 -r264bb2a86306cb8dd1562164451d501321747709 --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/MacroStabilityOutwardsFailureMechanismSectionResultTest.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultTest.cs) (revision 59512bde82de1297788119a8cacd067789389d41) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/MacroStabilityOutwardsFailureMechanismSectionResultTest.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultTest.cs) (revision 264bb2a86306cb8dd1562164451d501321747709) @@ -57,7 +57,7 @@ [TestCase(-1e-6)] [TestCase(1 + 1e-6)] [TestCase(12)] - public void DetailedAssessmentProbability_InvalidValue_ThrowsArgumentException(double newValue) + public void DetailedAssessmentProbability_InvalidValue_ThrowsArgumentOutOfRangeException(double newValue) { // Setup FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); @@ -67,7 +67,7 @@ TestDelegate test = () => result.DetailedAssessmentProbability = newValue; // Assert - string message = Assert.Throws(test).Message; + string message = Assert.Throws(test).Message; const string expectedMessage = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."; Assert.AreEqual(expectedMessage, message); }