Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismExtensions.cs
===================================================================
diff -u -r4b889a77a0b2a44d9eadc54540334140415177c8 -r28157cd5fb96e18d3ac06795679aa8930627b470
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensions.cs) (revision 4b889a77a0b2a44d9eadc54540334140415177c8)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensions.cs) (revision 28157cd5fb96e18d3ac06795679aa8930627b470)
@@ -27,7 +27,6 @@
using Riskeer.Common.Data.AssessmentSection;
using Riskeer.Common.Data.FailureMechanism;
using Riskeer.Common.Data.Hydraulics;
-using Riskeer.Common.Util;
namespace Riskeer.GrassCoverErosionOutwards.Data
{
@@ -122,34 +121,6 @@
}
///
- /// Gets the norm based on .
- ///
- /// The failure mechanism to get the norm from.
- /// The assessment section to get the norm from.
- /// The category type to use while obtaining the norm.
- /// The norm corresponding to the provided category type.
- /// Thrown when
- /// or is null.
- /// Thrown when
- /// is an invalid .
- /// Thrown when
- /// is a valid but unsupported .
- public static double GetNorm(this GrassCoverErosionOutwardsFailureMechanism failureMechanism,
- IAssessmentSection assessmentSection,
- FailureMechanismCategoryType categoryType)
- {
- if (failureMechanism == null)
- {
- throw new ArgumentNullException(nameof(failureMechanism));
- }
-
- return FailureMechanismNormHelper.GetNorm(assessmentSection,
- categoryType,
- failureMechanism.Contribution,
- failureMechanism.GeneralInput.N);
- }
-
- ///
/// Gets the collection of that belongs to
/// the given .
///
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs
===================================================================
diff -u -r50c0ea8f3d86d51e09d277f0aac3d77c8c9ea98c -r28157cd5fb96e18d3ac06795679aa8930627b470
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs) (revision 50c0ea8f3d86d51e09d277f0aac3d77c8c9ea98c)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs) (revision 28157cd5fb96e18d3ac06795679aa8930627b470)
@@ -20,7 +20,6 @@
// All rights reserved.
using System;
-using System.Collections.Generic;
using System.ComponentModel;
using Core.Common.Base.Data;
using Core.Common.TestUtil;
@@ -29,7 +28,6 @@
using Riskeer.Common.Data.FailureMechanism;
using Riskeer.Common.Data.Hydraulics;
using Riskeer.Common.Data.TestUtil;
-using Riskeer.Common.Service.TestUtil;
using Riskeer.GrassCoverErosionOutwards.Data.TestUtil;
namespace Riskeer.GrassCoverErosionOutwards.Data.Test
@@ -82,7 +80,7 @@
(FailureMechanismCategoryType) invalidValue);
// Assert
- string expectedMessage = $"The value of argument 'categoryType' ({invalidValue}) is invalid for Enum type '{nameof(FailureMechanismCategoryType)}'.";
+ var expectedMessage = $"The value of argument 'categoryType' ({invalidValue}) is invalid for Enum type '{nameof(FailureMechanismCategoryType)}'.";
string parameterName = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage).ParamName;
Assert.AreEqual("categoryType", parameterName);
}
@@ -209,7 +207,7 @@
(FailureMechanismCategoryType) invalidValue);
// Assert
- string expectedMessage = $"The value of argument 'categoryType' ({invalidValue}) is invalid for Enum type '{nameof(FailureMechanismCategoryType)}'.";
+ var expectedMessage = $"The value of argument 'categoryType' ({invalidValue}) is invalid for Enum type '{nameof(FailureMechanismCategoryType)}'.";
string parameterName = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage).ParamName;
Assert.AreEqual("categoryType", parameterName);
}
@@ -268,126 +266,5 @@
// Assert
Assert.AreSame(expectedHydraulicBoundaryLocationCalculation, hydraulicBoundaryLocationCalculation);
}
-
- [Test]
- public void GetNorm_FailureMechanismNull_ThrowsArgumentNullException()
- {
- // Call
- void Call() => GrassCoverErosionOutwardsFailureMechanismExtensions.GetNorm(null,
- new AssessmentSectionStub(),
- FailureMechanismCategoryType.FactorizedLowerLimitNorm);
-
- // Assert
- string paramName = Assert.Throws(Call).ParamName;
- Assert.AreEqual("failureMechanism", paramName);
- }
-
- [Test]
- public void GetNorm_AssessmentSectionNull_ThrowsArgumentNullException()
- {
- // Setup
- var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-
- // Call
- void Call() => failureMechanism.GetNorm(null,
- FailureMechanismCategoryType.FactorizedLowerLimitNorm);
-
- // Assert
- string paramName = Assert.Throws(Call).ParamName;
- Assert.AreEqual("assessmentSection", paramName);
- }
-
- [Test]
- public void GetNorm_InvalidFailureMechanismCategoryType_ThrowsInvalidEnumArgumentException()
- {
- // Setup
- const int invalidValue = 9999;
-
- var assessmentSection = new AssessmentSectionStub();
- var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-
- // Call
- void Call() => failureMechanism.GetNorm(assessmentSection,
- (FailureMechanismCategoryType) invalidValue);
-
- // Assert
- string expectedMessage = $"The value of argument 'categoryType' ({invalidValue}) is invalid for Enum type '{nameof(FailureMechanismCategoryType)}'.";
- string parameterName = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, expectedMessage).ParamName;
- Assert.AreEqual("categoryType", parameterName);
- }
-
- [Test]
- [TestCaseSource(nameof(GetNormConfigurationPerFailureMechanismCategoryType))]
- public void GetNorm_AssessmentSectionWithNormConfiguration_ReturnsCorrespondingNorm(
- GrassCoverErosionOutwardsFailureMechanism failureMechanism,
- IAssessmentSection assessmentSection,
- FailureMechanismCategoryType categoryType,
- double expectedNorm)
- {
- // Call
- double norm = failureMechanism.GetNorm(assessmentSection, categoryType);
-
- // Assert
- Assert.AreEqual(expectedNorm, norm);
- }
-
- private static IEnumerable GetNormConfigurationPerFailureMechanismCategoryType()
- {
- const double signalingNorm = 0.002;
- const double lowerLimitNorm = 0.005;
-
- var assessmentSection = new AssessmentSectionStub
- {
- FailureMechanismContribution =
- {
- LowerLimitNorm = lowerLimitNorm,
- SignalingNorm = signalingNorm
- }
- };
-
- var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
- {
- Contribution = 25
- };
-
- yield return new TestCaseData(
- failureMechanism,
- assessmentSection,
- FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm,
- GetMechanismSpecificNorm(failureMechanism, signalingNorm / 30));
-
- yield return new TestCaseData(
- failureMechanism,
- assessmentSection,
- FailureMechanismCategoryType.MechanismSpecificSignalingNorm,
- GetMechanismSpecificNorm(failureMechanism, signalingNorm));
-
- yield return new TestCaseData(
- failureMechanism,
- assessmentSection,
- FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm,
- GetMechanismSpecificNorm(failureMechanism, lowerLimitNorm));
-
- yield return new TestCaseData(
- failureMechanism,
- assessmentSection,
- FailureMechanismCategoryType.LowerLimitNorm,
- lowerLimitNorm);
-
- yield return new TestCaseData(
- failureMechanism,
- assessmentSection,
- FailureMechanismCategoryType.FactorizedLowerLimitNorm,
- lowerLimitNorm * 30);
- }
-
- private static double GetMechanismSpecificNorm(GrassCoverErosionOutwardsFailureMechanism failureMechanism,
- double norm)
- {
- return CalculationServiceTestHelper.ProfileSpecificRequiredProbability(
- norm,
- failureMechanism.Contribution,
- failureMechanism.GeneralInput.N);
- }
}
}
\ No newline at end of file