Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs
===================================================================
diff -u -rcb4699ab3f0ba6a23e21650ec8cec52d82d0777b -rd8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs (.../AssemblyCategoryCreator.cs) (revision cb4699ab3f0ba6a23e21650ec8cec52d82d0777b)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs (.../AssemblyCategoryCreator.cs) (revision d8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e)
@@ -42,7 +42,6 @@
/// An
/// with information taken from the .
/// Thrown when is null.
- /// Thrown when contains null items.
/// Thrown when
/// is an invalid value.
/// Thrown when
@@ -55,11 +54,6 @@
throw new ArgumentNullException(nameof(output));
}
- if (output.Result.Contains(null))
- {
- throw new ArgumentException(@"Output result cannot contain null items", nameof(output));
- }
-
return output.Result.Select(
categoriesOutput => new AssessmentSectionAssemblyCategory(categoriesOutput.LowerBoundary,
categoriesOutput.UpperBoundary,
@@ -74,7 +68,6 @@
/// An
/// with information taken from the .
/// Thrown when is null.
- /// Thrown when contains null items.
/// Thrown when
/// is an invalid value.
/// Thrown when
@@ -87,11 +80,6 @@
throw new ArgumentNullException(nameof(output));
}
- if (output.Result.Contains(null))
- {
- throw new ArgumentException(@"Output result cannot contain null items", nameof(output));
- }
-
return output.Result.Select(
categoriesOutput => new FailureMechanismSectionAssemblyCategory(categoriesOutput.LowerBoundary,
categoriesOutput.UpperBoundary,
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs
===================================================================
diff -u -rcb4699ab3f0ba6a23e21650ec8cec52d82d0777b -rd8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreator.cs) (revision cb4699ab3f0ba6a23e21650ec8cec52d82d0777b)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreator.cs) (revision d8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e)
@@ -112,8 +112,6 @@
/// The created .
/// Thrown when
/// is null.
- /// Thrown when
- /// contains items that are null.
/// Thrown when contains
/// an invalid .
/// Thrown when contains
@@ -129,11 +127,6 @@
throw new ArgumentNullException(nameof(categories));
}
- if (categories.Contains(null))
- {
- throw new ArgumentException(@"Categories cannot contain null items.", nameof(categories));
- }
-
return new DetailedCalculationInputFromProbability(new Probability(probability),
categories.Select(category => new FailureMechanismSectionCategory(
ConvertFailureMechanismSectionAssemblyCategoryGroup(category.Group),
@@ -150,8 +143,6 @@
/// The 'N' parameter used to factor in the 'length effect'.
/// The created .\Thrown when
/// is null.
- /// Thrown when
- /// contains items that are null.
/// Thrown when contains
/// an invalid .
/// Thrown when contains
@@ -168,11 +159,6 @@
throw new ArgumentNullException(nameof(categories));
}
- if (categories.Contains(null))
- {
- throw new ArgumentException(@"Categories cannot contain null items.", nameof(categories));
- }
-
return new DetailedCalculationInputFromProbabilityWithLengthEffect(
new Probability(probability),
categories.Select(category => new FailureMechanismSectionCategory(
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs
===================================================================
diff -u -rad607a97ef8cdcdfe5909e73f590008a5b1b904b -rd8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs (.../AssemblyCategoryCreatorTest.cs) (revision ad607a97ef8cdcdfe5909e73f590008a5b1b904b)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs (.../AssemblyCategoryCreatorTest.cs) (revision d8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e)
@@ -49,27 +49,6 @@
}
[Test]
- public void CreateAssessmentSectionAssemblyCategories_OutputContainsNull_ThrowsArgumentException()
- {
- // Setup
- var random = new Random(11);
- var output = new CalculationOutput(new[]
- {
- new AssessmentSectionCategory(random.NextEnumValue(), new Probability(random.GetFromRange(0, 0.5)), new Probability(random.GetFromRange(0.5, 1))),
- null,
- new AssessmentSectionCategory(random.NextEnumValue(), new Probability(random.GetFromRange(0, 0.5)), new Probability(random.GetFromRange(0.5, 1)))
- });
-
- // Call
- TestDelegate call = () => AssemblyCategoryCreator.CreateAssessmentSectionAssemblyCategories(output);
-
- // Assert
- const string expectedMessage = "Output result cannot contain null items";
- var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage);
- Assert.AreEqual("output", exception.ParamName);
- }
-
- [Test]
public void CreateAssessmentSectionAssemblyCategories_WithOutput_ReturnAssessmentSectionAssemblyCategoryResult()
{
// Setup
@@ -145,28 +124,6 @@
}
[Test]
- public void CreateFailureMechanismSectionAssemblyCategories_OutputContainsNull_ThrowsArgumentException()
- {
- // Setup
- var random = new Random(11);
- var output = new CalculationOutput(new[]
- {
- new FailureMechanismSectionCategory(random.NextEnumValue(),
- new Probability(random.GetFromRange(0, 0.5)),
- new Probability(random.GetFromRange(0.5, 1))),
- null
- });
-
- // Call
- TestDelegate call = () => AssemblyCategoryCreator.CreateFailureMechanismSectionAssemblyCategories(output);
-
- // Assert
- const string expectedMessage = "Output result cannot contain null items";
- var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage);
- Assert.AreEqual("output", exception.ParamName);
- }
-
- [Test]
public void CreateFailureMechanismSectionAssemblyCategories_WithOutput_ReturnFailureMechanismSectionAssemblyCategoryResult()
{
// Setup
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs
===================================================================
diff -u -rad607a97ef8cdcdfe5909e73f590008a5b1b904b -rd8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs) (revision ad607a97ef8cdcdfe5909e73f590008a5b1b904b)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs) (revision d8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e)
@@ -110,23 +110,6 @@
}
[Test]
- public void CreateDetailedCalculationInputFromProbability_CategoriesContainsNull_ThrowArgumentNullException()
- {
- // Call
- TestDelegate test = () => FailureMechanismSectionAssemblyCalculatorInputCreator.CreateDetailedCalculationInputFromProbability(
- new Random(39).NextDouble(),
- new FailureMechanismSectionAssemblyCategory[]
- {
- null
- });
-
- // Assert
- const string expectedMessage = "Categories cannot contain null items.";
- var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage);
- Assert.AreEqual("categories", exception.ParamName);
- }
-
- [Test]
public void CreateDetailedCalculationInputFromProbability_CategoriesNull_ThrowArgumentNullException()
{
// Call
@@ -202,27 +185,6 @@
}
[Test]
- public void CreateDetailedCalculationInputFromProbabilityWithLengthEffect_CategoriesContainsNull_ThrowArgumentNullException()
- {
- // Setup
- var random = new Random(39);
-
- // Call
- TestDelegate test = () => FailureMechanismSectionAssemblyCalculatorInputCreator.CreateDetailedCalculationInputFromProbabilityWithLengthEffect(
- random.NextDouble(),
- new FailureMechanismSectionAssemblyCategory[]
- {
- null
- },
- random.NextDouble());
-
- // Assert
- const string expectedMessage = "Categories cannot contain null items.";
- var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage);
- Assert.AreEqual("categories", exception.ParamName);
- }
-
- [Test]
public void CreateDetailedCalculationInputFromProbabilityWithLengthEffect_CategoriesNull_ThrowArgumentNullException()
{
// Setup
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -rad607a97ef8cdcdfe5909e73f590008a5b1b904b -rd8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs (.../ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs) (revision ad607a97ef8cdcdfe5909e73f590008a5b1b904b)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs (.../ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs) (revision d8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e)
@@ -73,8 +73,8 @@
///
/// The failure mechanism section result to
/// assemble the detailed assembly for.
- /// The failure mechanism belonging to this calculation.
- /// The belonging to this calculation.
+ /// The failure mechanism belonging to this section.
+ /// The belonging to this section.
/// A .
/// Thrown when any parameter is null.
/// Thrown when the
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs
===================================================================
diff -u -r9ecab680237a9e35a1c87fc4bf43cc8ee5070784 -rd8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs (.../FailureMechanismSectionResultRowHelper.cs) (revision 9ecab680237a9e35a1c87fc4bf43cc8ee5070784)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs (.../FailureMechanismSectionResultRowHelper.cs) (revision d8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e)
@@ -38,13 +38,13 @@
///
/// The current data grid view cell.
/// The value representing the simple assessment result type.
- /// The value representing the result of the detailed assessment.
+ /// The value representing the result of the detailed assessment.
/// The set for the
/// section result. May be null if the section result does not have a calculation set.
/// Thrown when is null.
public static void SetDetailedAssessmentError(DataGridViewCell dataGridViewCell,
SimpleAssessmentResultType simpleAssessmentResult,
- double detailedAssessmentProbability,
+ double detailedAssessmentResult,
ICalculation normativeCalculation)
{
if (dataGridViewCell == null)
@@ -59,21 +59,21 @@
return;
}
- SetDetailedAssessmentError(dataGridViewCell, detailedAssessmentProbability, normativeCalculation);
+ SetDetailedAssessmentError(dataGridViewCell, detailedAssessmentResult, normativeCalculation);
}
///
/// Sets the when the detailed assessment fails.
///
/// The current data grid view cell.
/// The value representing the simple assessment result.
- /// The value representing the probability of the detailed assessment.
+ /// The value representing the result of the detailed assessment.
/// The set for the
/// section result. May be null if the section result does not have a calculation set.
/// Thrown when is null.
public static void SetDetailedAssessmentError(DataGridViewCell dataGridViewCell,
SimpleAssessmentResultValidityOnlyType simpleAssessmentResult,
- double detailedAssessmentProbability,
+ double detailedAssessmentResult,
ICalculation normativeCalculation)
{
if (dataGridViewCell == null)
@@ -87,11 +87,11 @@
return;
}
- SetDetailedAssessmentError(dataGridViewCell, detailedAssessmentProbability, normativeCalculation);
+ SetDetailedAssessmentError(dataGridViewCell, detailedAssessmentResult, normativeCalculation);
}
private static void SetDetailedAssessmentError(DataGridViewCell dataGridViewCell,
- double detailedAssessmentProbability,
+ double detailedAssessmentResult,
ICalculation normativeCalculation)
{
if (normativeCalculation == null)
@@ -101,7 +101,7 @@
}
CalculationScenarioStatus calculationScenarioStatus = GetCalculationStatus(normativeCalculation,
- detailedAssessmentProbability);
+ detailedAssessmentResult);
if (calculationScenarioStatus == CalculationScenarioStatus.NotCalculated)
{
dataGridViewCell.ErrorText = Resources.FailureMechanismResultView_DataGridViewCellFormatting_Calculation_not_calculated;
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperTest.cs
===================================================================
diff -u -r0db96e46f04618fc4535b6992b084652663545fd -rd8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperTest.cs (.../FailureMechanismSectionResultRowHelperTest.cs) (revision 0db96e46f04618fc4535b6992b084652663545fd)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperTest.cs (.../FailureMechanismSectionResultRowHelperTest.cs) (revision d8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e)
@@ -66,14 +66,14 @@
[TestCaseSource(nameof(GetSimpleAssessmentResultAssessFurtherOrNoneAndCalculationWithOutputConfigurations))]
public void SetDetailedAssessmentError_WithSimpleAssessmentResultConfigurations_SetsErrorText(DataGridViewCell dataGridViewCell,
SimpleAssessmentResultType simpleAssessmentResult,
- double detailedAssessmentProbability,
+ double detailedAssessmentResult,
ICalculation normativeCalculation,
string expectedErrorText)
{
// Call
FailureMechanismSectionResultRowHelper.SetDetailedAssessmentError(dataGridViewCell,
simpleAssessmentResult,
- detailedAssessmentProbability,
+ detailedAssessmentResult,
normativeCalculation);
// Assert
@@ -109,14 +109,14 @@
[TestCaseSource(nameof(SimpleAssessmentResultValidityOnlyIsNotApplicableAndCalculationWithOutput))]
public void SetAssessmentDetailedAssessmentError_WithSimpleAssessmentValidityOnlyConfigurations_SetsErrorText(DataGridViewCell dataGridViewCell,
SimpleAssessmentResultValidityOnlyType simpleAssessmentResult,
- double detailedAssessmentProbability,
+ double detailedAssessmentResult,
ICalculation normativeCalculation,
string expectedErrorText)
{
// Call
FailureMechanismSectionResultRowHelper.SetDetailedAssessmentError(dataGridViewCell,
simpleAssessmentResult,
- detailedAssessmentProbability,
+ detailedAssessmentResult,
normativeCalculation);
// Assert
@@ -372,7 +372,7 @@
yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultValidityOnlyType.Applicable, 0.0,
CalculationTestDataFactory.CreateCalculationWithoutOutput(),
expectedErrorMessage)
- .SetName("ApplicableValidDetailedAssessmentAndCalculationWithoutOutput");
+ .SetName("ApplicableWithValidDetailedAssessmentAndCalculationWithoutOutput");
}
private static IEnumerable SimpleAssessmentResultValidityOnlyIsNotApplicableAndCalculationWithOutput()
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -rcb4699ab3f0ba6a23e21650ec8cec52d82d0777b -rd8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs) (revision cb4699ab3f0ba6a23e21650ec8cec52d82d0777b)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs) (revision d8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e)
@@ -73,8 +73,8 @@
///
/// The failure mechanism section result to
/// assemble the detailed assembly for.
- /// The failure mechanism belonging to this calculation.
- /// The belonging to this calculation.
+ /// The failure mechanism belonging to this section.
+ /// The belonging to this section.
/// A .
/// Thrown when any parameter is null.
/// Thrown when the
@@ -100,7 +100,7 @@
}
IAssemblyToolCalculatorFactory calculatorFactory = AssemblyToolCalculatorFactory.Instance;
- IFailureMechanismSectionAssemblyCalculator calculator =
+ IFailureMechanismSectionAssemblyCalculator calculator =
calculatorFactory.CreateFailureMechanismSectionAssemblyCalculator(AssemblyToolKernelFactory.Instance);
try
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs
===================================================================
diff -u -r739752c5cc7ed800dacf74e12221c227183ddc6f -rd8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs) (revision 739752c5cc7ed800dacf74e12221c227183ddc6f)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs) (revision d8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e)
@@ -42,8 +42,8 @@
// Call
TestDelegate call = () => GrassCoverErosionInwardsFailureMechanismSectionResultDetailedAssessmentExtensions.GetDetailedAssessmentProbability(null,
- new GrassCoverErosionInwardsFailureMechanism(),
- assessmentSection);
+ new GrassCoverErosionInwardsFailureMechanism(),
+ assessmentSection);
// Assert
var exception = Assert.Throws(call);
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -rcb4699ab3f0ba6a23e21650ec8cec52d82d0777b -rd8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs (.../HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs) (revision cb4699ab3f0ba6a23e21650ec8cec52d82d0777b)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs (.../HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs) (revision d8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e)
@@ -73,8 +73,8 @@
///
/// The failure mechanism section result to
/// assemble the detailed assembly for.
- /// The failure mechanism belonging to this calculation.
- /// The belonging to this calculation.
+ /// The failure mechanism belonging to this section.
+ /// The belonging to this section.
/// A .
/// Thrown when any parameter is null.
/// Thrown when the
@@ -100,7 +100,7 @@
}
IAssemblyToolCalculatorFactory calculatorFactory = AssemblyToolCalculatorFactory.Instance;
- IFailureMechanismSectionAssemblyCalculator calculator =
+ IFailureMechanismSectionAssemblyCalculator calculator =
calculatorFactory.CreateFailureMechanismSectionAssemblyCalculator(AssemblyToolKernelFactory.Instance);
try
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -rcb4699ab3f0ba6a23e21650ec8cec52d82d0777b -rd8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs (.../MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs) (revision cb4699ab3f0ba6a23e21650ec8cec52d82d0777b)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs (.../MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs) (revision d8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e)
@@ -74,9 +74,9 @@
///
/// The failure mechanism section result to
/// assemble the detailed assembly for.
- /// The calculations belonging to this section.
- /// The failure mechanism belonging to this calculation.
- /// The belonging to this calculation.
+ /// The calculation scenarios belonging to this section.
+ /// The failure mechanism belonging to this section.
+ /// The belonging to this section.
/// A .
/// Thrown when any parameter is null.
/// Thrown when the
@@ -108,7 +108,7 @@
}
IAssemblyToolCalculatorFactory calculatorFactory = AssemblyToolCalculatorFactory.Instance;
- IFailureMechanismSectionAssemblyCalculator calculator =
+ IFailureMechanismSectionAssemblyCalculator calculator =
calculatorFactory.CreateFailureMechanismSectionAssemblyCalculator(AssemblyToolKernelFactory.Instance);
try
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultDetailedAssessmentExtensions.cs
===================================================================
diff -u -r739752c5cc7ed800dacf74e12221c227183ddc6f -rd8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultDetailedAssessmentExtensions.cs (.../MacroStabilityInwardsFailureMechanismSectionResultDetailedAssessmentExtensions.cs) (revision 739752c5cc7ed800dacf74e12221c227183ddc6f)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultDetailedAssessmentExtensions.cs (.../MacroStabilityInwardsFailureMechanismSectionResultDetailedAssessmentExtensions.cs) (revision d8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e)
@@ -98,52 +98,90 @@
}
///
- /// Gets the contribution of all relevant together.
+ /// Gets the total contribution of all relevant calculation scenarios.
///
- /// The result to get the result for.
- /// All calculations in the failure mechanism.
- public static RoundedDouble GetTotalContribution(this MacroStabilityInwardsFailureMechanismSectionResult macroStabilityInwardsFailureMechanismSectionResult,
- IEnumerable calculations)
+ /// The section result to get the total contribution for.
+ /// The calculation scenarios to get the total contribution for.
+ /// The total contribution of all relevant calculation scenarios.
+ /// Thrown when any parameter is null.
+ public static RoundedDouble GetTotalContribution(this MacroStabilityInwardsFailureMechanismSectionResult sectionResult,
+ IEnumerable calculationScenarios)
{
- return (RoundedDouble) macroStabilityInwardsFailureMechanismSectionResult
- .GetCalculationScenarios(calculations)
+ if (sectionResult == null)
+ {
+ throw new ArgumentNullException(nameof(sectionResult));
+ }
+
+ if (calculationScenarios == null)
+ {
+ throw new ArgumentNullException(nameof(calculationScenarios));
+ }
+
+ return (RoundedDouble) sectionResult
+ .GetCalculationScenarios(calculationScenarios)
.Aggregate(0, (current, calculationScenario) => current + calculationScenario.Contribution);
}
///
- /// Gets a list of the relevant .
+ /// Gets a collection of the relevant .
///
- /// The result to get the result for.
- /// All calculations in the failure mechanism.
- public static IEnumerable GetCalculationScenarios(this MacroStabilityInwardsFailureMechanismSectionResult macroStabilityInwardsFailureMechanismSectionResult,
- IEnumerable calculations)
+ /// The section result to get the relevant scenarios for.
+ /// The calculation scenarios to get the relevant scenarios from.
+ /// A collection of relevant calculation scenarios.
+ /// Thrown when any parameter is null.
+ public static IEnumerable GetCalculationScenarios(
+ this MacroStabilityInwardsFailureMechanismSectionResult sectionResult,
+ IEnumerable calculationScenarios)
{
- IEnumerable lineSegments = Math2D.ConvertLinePointsToLineSegments(macroStabilityInwardsFailureMechanismSectionResult.Section.Points);
+ if (sectionResult == null)
+ {
+ throw new ArgumentNullException(nameof(sectionResult));
+ }
- return calculations
+ if (calculationScenarios == null)
+ {
+ throw new ArgumentNullException(nameof(calculationScenarios));
+ }
+
+ IEnumerable lineSegments = Math2D.ConvertLinePointsToLineSegments(sectionResult.Section.Points);
+
+ return calculationScenarios
.Where(pc => pc.IsRelevant && pc.IsSurfaceLineIntersectionWithReferenceLineInSection(lineSegments));
}
///
/// Gets the status of the section result depending on the relevant calculation scenarios.
///
- /// The result to get the result for.
- /// All calculations in the failure mechanism.
+ /// The section result to get the calculation status for.
+ /// The calculation scenarios to get the calculation status for.
+ /// The calculation scenario status for the section result.
+ /// Thrown when any parameter is null.
/// Thrown when any of the relevant calculations
- /// in has an invalid .
- /// Thrown when any of the relevant scenarios has an unsupported value of .
+ /// in has an invalid .
+ /// Thrown when any of the relevant scenarios has an unsupported
+ /// value of .
public static CalculationScenarioStatus GetCalculationScenarioStatus(
- this MacroStabilityInwardsFailureMechanismSectionResult macroStabilityInwardsFailureMechanismSectionResult,
- IEnumerable calculations)
+ this MacroStabilityInwardsFailureMechanismSectionResult sectionResult,
+ IEnumerable calculationScenarios)
{
+ if (sectionResult == null)
+ {
+ throw new ArgumentNullException(nameof(sectionResult));
+ }
+
+ if (calculationScenarios == null)
+ {
+ throw new ArgumentNullException(nameof(calculationScenarios));
+ }
+
var failed = false;
var notCalculated = false;
- foreach (MacroStabilityInwardsCalculationScenario calculationScenario in macroStabilityInwardsFailureMechanismSectionResult.GetCalculationScenarios(calculations).Where(cs => cs.IsRelevant))
+ foreach (MacroStabilityInwardsCalculationScenario calculationScenario in sectionResult.GetCalculationScenarios(calculationScenarios).Where(cs => cs.IsRelevant))
{
CalculationScenarioStatus calculationScenarioStatus = calculationScenario.Status;
if (!Enum.IsDefined(typeof(CalculationScenarioStatus), calculationScenarioStatus))
{
- throw new InvalidEnumArgumentException(nameof(macroStabilityInwardsFailureMechanismSectionResult),
+ throw new InvalidEnumArgumentException(nameof(sectionResult),
(int) calculationScenarioStatus,
typeof(CalculationScenarioStatus));
}
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs
===================================================================
diff -u -r739752c5cc7ed800dacf74e12221c227183ddc6f -rd8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs) (revision 739752c5cc7ed800dacf74e12221c227183ddc6f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs) (revision d8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e)
@@ -20,8 +20,10 @@
// All rights reserved.
using System;
+using System.Collections.Generic;
using System.Linq;
using Core.Common.Base.Data;
+using Core.Common.Base.Geometry;
using NUnit.Framework;
using Rhino.Mocks;
using Ringtoets.Common.Data.AssessmentSection;
@@ -312,10 +314,36 @@
}
[Test]
- public void GetTotalContribution_Always_ReturnsTotalRelevantScenarioContribution()
+ public void GetTotalContribution_SectionResultNull_ThrowsArgumentNullException()
{
+ // Call
+ TestDelegate call = () => ((MacroStabilityInwardsFailureMechanismSectionResult) null).GetTotalContribution(Enumerable.Empty());
+
+ // Assert
+ var exception = Assert.Throws(call);
+ Assert.AreEqual("sectionResult", exception.ParamName);
+ }
+
+ [Test]
+ public void GetTotalContribution_CalculationScenariosNull_ThrowsArgumentNullException()
+ {
// Setup
FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
+ var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section);
+
+ // Call
+ TestDelegate call = () => sectionResult.GetTotalContribution(null);
+
+ // Assert
+ var exception = Assert.Throws(call);
+ Assert.AreEqual("calculationScenarios", exception.ParamName);
+ }
+
+ [Test]
+ public void GetTotalContribution_WithScenarios_ReturnsTotalRelevantScenarioContribution()
+ {
+ // Setup
+ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var failureMechanismSectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section);
MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section);
@@ -341,6 +369,32 @@
}
[Test]
+ public void GetCalculationScenarioStatus_SectionResultNull_ThrowsArgumentNullException()
+ {
+ // Call
+ TestDelegate call = () => ((MacroStabilityInwardsFailureMechanismSectionResult) null).GetCalculationScenarioStatus(Enumerable.Empty());
+
+ // Assert
+ var exception = Assert.Throws(call);
+ Assert.AreEqual("sectionResult", exception.ParamName);
+ }
+
+ [Test]
+ public void GetCalculationScenarioStatus_CalculationScenariosNull_ThrowsArgumentNullException()
+ {
+ // Setup
+ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
+ var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section);
+
+ // Call
+ TestDelegate call = () => sectionResult.GetCalculationScenarioStatus(null);
+
+ // Assert
+ var exception = Assert.Throws(call);
+ Assert.AreEqual("calculationScenarios", exception.ParamName);
+ }
+
+ [Test]
public void GetCalculationScenarioStatus_ScenarioNotCalculated_ReturnsStatusNotCalculated()
{
// Setup
@@ -434,5 +488,78 @@
// Assert
Assert.AreEqual(CalculationScenarioStatus.Done, status);
}
+
+ [Test]
+ public void GetCalculationScenarios_SectionResultNull_ThrowsArgumentNullException()
+ {
+ // Call
+ TestDelegate call = () => ((MacroStabilityInwardsFailureMechanismSectionResult) null).GetCalculationScenarios(
+ Enumerable.Empty());
+
+ // Assert
+ var exception = Assert.Throws(call);
+ Assert.AreEqual("sectionResult", exception.ParamName);
+ }
+
+ [Test]
+ public void GetCalculationScenarios_CalculationScenariosNull_ThrowsArgumentNullException()
+ {
+ // Setup
+ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
+ var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section);
+
+ // Call
+ TestDelegate call = () => sectionResult.GetCalculationScenarios(null);
+
+ // Assert
+ var exception = Assert.Throws(call);
+ Assert.AreEqual("calculationScenarios", exception.ParamName);
+ }
+
+ [Test]
+ public void GetCalculationScenarios_WithRelevantAndIrrelevantScenarios_ReturnsRelevantCalculationScenarios()
+ {
+ // Setup
+ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
+ var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section);
+ MacroStabilityInwardsCalculationScenario calculationScenario =
+ MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section);
+ MacroStabilityInwardsCalculationScenario calculationScenario2 =
+ MacroStabilityInwardsCalculationScenarioTestFactory.CreateIrrelevantMacroStabilityInwardsCalculationScenario(section);
+
+ // Call
+ IEnumerable relevantScenarios = sectionResult.GetCalculationScenarios(new[]
+ {
+ calculationScenario,
+ calculationScenario2
+ });
+
+ // Assert
+ Assert.AreEqual(calculationScenario, relevantScenarios.Single());
+ }
+
+ [Test]
+ public void GetCalculationScenarios_WithNotIntersectingScenario_ReturnsNoCalculationScenarios()
+ {
+ // Setup
+ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[]
+ {
+ new Point2D(999, 999),
+ new Point2D(998, 998)
+ });
+ var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section);
+ MacroStabilityInwardsCalculationScenario calculationScenario =
+ MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(
+ FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
+
+ // Call
+ IEnumerable relevantScenarios = sectionResult.GetCalculationScenarios(new[]
+ {
+ calculationScenario
+ });
+
+ // Assert
+ CollectionAssert.IsEmpty(relevantScenarios);
+ }
}
}
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -rcb4699ab3f0ba6a23e21650ec8cec52d82d0777b -rd8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResultAssemblyFactory.cs (.../PipingFailureMechanismSectionResultAssemblyFactory.cs) (revision cb4699ab3f0ba6a23e21650ec8cec52d82d0777b)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResultAssemblyFactory.cs (.../PipingFailureMechanismSectionResultAssemblyFactory.cs) (revision d8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e)
@@ -74,9 +74,9 @@
///
/// The failure mechanism section result to
/// assemble the detailed assembly for.
- /// The calculations belonging to this section.
- /// The failure mechanism belonging to this calculation.
- /// The belonging to this calculation.
+ /// The calculation scenarios belonging to this section.
+ /// The failure mechanism belonging to this section.
+ /// The belonging to this section.
/// A .
/// Thrown when any parameter is null.
/// Thrown when the
@@ -108,7 +108,7 @@
}
IAssemblyToolCalculatorFactory calculatorFactory = AssemblyToolCalculatorFactory.Instance;
- IFailureMechanismSectionAssemblyCalculator calculator =
+ IFailureMechanismSectionAssemblyCalculator calculator =
calculatorFactory.CreateFailureMechanismSectionAssemblyCalculator(AssemblyToolKernelFactory.Instance);
try
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResultDetailedAssessmentExtensions.cs
===================================================================
diff -u -r739752c5cc7ed800dacf74e12221c227183ddc6f -rd8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResultDetailedAssessmentExtensions.cs (.../PipingFailureMechanismSectionResultDetailedAssessmentExtensions.cs) (revision 739752c5cc7ed800dacf74e12221c227183ddc6f)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResultDetailedAssessmentExtensions.cs (.../PipingFailureMechanismSectionResultDetailedAssessmentExtensions.cs) (revision d8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e)
@@ -95,56 +95,95 @@
}
///
- /// Gets the contribution of all relevant together.
+ /// Gets the total contribution of all relevant calculation scenarios.
///
- /// The result to get the result for.
- /// All calculations in the failure mechanism.
- public static RoundedDouble GetTotalContribution(this PipingFailureMechanismSectionResult pipingFailureMechanismSectionResult,
- IEnumerable calculations)
+ /// The section result to get the total contribution for.
+ /// The calculation scenarios to get the total contribution for.
+ /// The total contribution of all relevant calculation scenarios.
+ /// Thrown when any parameter is null.
+ public static RoundedDouble GetTotalContribution(this PipingFailureMechanismSectionResult sectionResult,
+ IEnumerable calculationScenarios)
{
- return (RoundedDouble) pipingFailureMechanismSectionResult
- .GetCalculationScenarios(calculations)
+ if (sectionResult == null)
+ {
+ throw new ArgumentNullException(nameof(sectionResult));
+ }
+
+ if (calculationScenarios == null)
+ {
+ throw new ArgumentNullException(nameof(calculationScenarios));
+ }
+
+ return (RoundedDouble) sectionResult
+ .GetCalculationScenarios(calculationScenarios)
.Aggregate(0, (current, calculationScenario) => current + calculationScenario.Contribution);
}
///
- /// Gets a list of the relevant .
+ /// Gets a collection of the relevant .
///
- /// The result to get the result for.
- /// All calculations in the failure mechanism.
- public static IEnumerable GetCalculationScenarios(this PipingFailureMechanismSectionResult pipingFailureMechanismSectionResult,
- IEnumerable calculations)
+ /// The section result to get the relevant scenarios for.
+ /// The calculation scenarios to get the relevant scenarios from.
+ /// A collection of relevant calculation scenarios.
+ /// Thrown when any parameter is null.
+ public static IEnumerable GetCalculationScenarios(
+ this PipingFailureMechanismSectionResult sectionResult,
+ IEnumerable calculationScenarios)
{
- IEnumerable lineSegments = Math2D.ConvertLinePointsToLineSegments(pipingFailureMechanismSectionResult.Section.Points);
+ if (sectionResult == null)
+ {
+ throw new ArgumentNullException(nameof(sectionResult));
+ }
- return calculations
+ if (calculationScenarios == null)
+ {
+ throw new ArgumentNullException(nameof(calculationScenarios));
+ }
+
+ IEnumerable lineSegments = Math2D.ConvertLinePointsToLineSegments(sectionResult.Section.Points);
+
+ return calculationScenarios
.Where(pc => pc.IsRelevant && pc.IsSurfaceLineIntersectionWithReferenceLineInSection(lineSegments));
}
///
/// Gets the status of the section result depending on the relevant calculation scenarios.
///
- /// The result to get the result for.
- /// All calculations in the failure mechanism.
+ /// The section result to get the calculation status for.
+ /// The calculation scenarios to get the calculation status for.
+ /// The calculation scenario status for the section result.
+ /// Thrown when any parameter is null.
/// Thrown when any of the relevant calculations
- /// in has an invalid .
- /// Thrown when any of the relevant scenarios has an unsupported value of .
- public static CalculationScenarioStatus GetCalculationScenarioStatus(this PipingFailureMechanismSectionResult pipingFailureMechanismSectionResult,
- IEnumerable calculations)
+ /// in has an invalid .
+ /// Thrown when any of the relevant scenarios has an unsupported
+ /// value of .
+ public static CalculationScenarioStatus GetCalculationScenarioStatus(
+ this PipingFailureMechanismSectionResult sectionResult,
+ IEnumerable calculationScenarios)
{
+ if (sectionResult == null)
+ {
+ throw new ArgumentNullException(nameof(sectionResult));
+ }
+
+ if (calculationScenarios == null)
+ {
+ throw new ArgumentNullException(nameof(calculationScenarios));
+ }
+
var failed = false;
var notCalculated = false;
- foreach (PipingCalculationScenario calculationScenario in pipingFailureMechanismSectionResult.GetCalculationScenarios(calculations).Where(cs => cs.IsRelevant))
+ foreach (PipingCalculationScenario calculationScenario in sectionResult.GetCalculationScenarios(calculationScenarios).Where(cs => cs.IsRelevant))
{
CalculationScenarioStatus calculationScenarioStatus = calculationScenario.Status;
if (!Enum.IsDefined(typeof(CalculationScenarioStatus), calculationScenarioStatus))
{
- throw new InvalidEnumArgumentException(nameof(pipingFailureMechanismSectionResult),
+ throw new InvalidEnumArgumentException(nameof(sectionResult),
(int) calculationScenarioStatus,
typeof(CalculationScenarioStatus));
}
- switch (calculationScenarioStatus)
+ switch (calculationScenario.Status)
{
case CalculationScenarioStatus.Failed:
failed = true;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs
===================================================================
diff -u -r739752c5cc7ed800dacf74e12221c227183ddc6f -rd8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs (.../PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs) (revision 739752c5cc7ed800dacf74e12221c227183ddc6f)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs (.../PipingFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs) (revision d8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e)
@@ -20,8 +20,10 @@
// All rights reserved.
using System;
+using System.Collections.Generic;
using System.Linq;
using Core.Common.Base.Data;
+using Core.Common.Base.Geometry;
using NUnit.Framework;
using Rhino.Mocks;
using Ringtoets.Common.Data.AssessmentSection;
@@ -309,10 +311,36 @@
}
[Test]
- public void GetTotalContribution_Always_ReturnsTotalRelevantScenarioContribution()
+ public void GetTotalContribution_SectionResultNull_ThrowsArgumentNullException()
{
+ // Call
+ TestDelegate call = () => ((PipingFailureMechanismSectionResult) null).GetTotalContribution(Enumerable.Empty());
+
+ // Assert
+ var exception = Assert.Throws(call);
+ Assert.AreEqual("sectionResult", exception.ParamName);
+ }
+
+ [Test]
+ public void GetTotalContribution_CalculationScenariosNull_ThrowsArgumentNullException()
+ {
// Setup
FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
+ var sectionResult = new PipingFailureMechanismSectionResult(section);
+
+ // Call
+ TestDelegate call = () => sectionResult.GetTotalContribution(null);
+
+ // Assert
+ var exception = Assert.Throws(call);
+ Assert.AreEqual("calculationScenarios", exception.ParamName);
+ }
+
+ [Test]
+ public void GetTotalContribution_WithScenarios_ReturnsTotalRelevantScenarioContribution()
+ {
+ // Setup
+ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section);
PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section);
@@ -338,6 +366,32 @@
}
[Test]
+ public void GetCalculationScenarioStatus_SectionResultNull_ThrowsArgumentNullException()
+ {
+ // Call
+ TestDelegate call = () => ((PipingFailureMechanismSectionResult) null).GetCalculationScenarioStatus(Enumerable.Empty());
+
+ // Assert
+ var exception = Assert.Throws(call);
+ Assert.AreEqual("sectionResult", exception.ParamName);
+ }
+
+ [Test]
+ public void GetCalculationScenarioStatus_CalculationScenariosNull_ThrowsArgumentNullException()
+ {
+ // Setup
+ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
+ var sectionResult = new PipingFailureMechanismSectionResult(section);
+
+ // Call
+ TestDelegate call = () => sectionResult.GetCalculationScenarioStatus(null);
+
+ // Assert
+ var exception = Assert.Throws(call);
+ Assert.AreEqual("calculationScenarios", exception.ParamName);
+ }
+
+ [Test]
public void GetCalculationScenarioStatus_ScenarioNotCalculated_ReturnsStatusNotCalculated()
{
// Setup
@@ -409,5 +463,74 @@
// Assert
Assert.AreEqual(CalculationScenarioStatus.NotCalculated, status);
}
+
+ [Test]
+ public void GetCalculationScenarios_SectionResultNull_ThrowsArgumentNullException()
+ {
+ // Call
+ TestDelegate call = () => ((PipingFailureMechanismSectionResult) null).GetCalculationScenarios(Enumerable.Empty());
+
+ // Assert
+ var exception = Assert.Throws(call);
+ Assert.AreEqual("sectionResult", exception.ParamName);
+ }
+
+ [Test]
+ public void GetCalculationScenarios_CalculationScenariosNull_ThrowsArgumentNullException()
+ {
+ // Setup
+ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
+ var sectionResult = new PipingFailureMechanismSectionResult(section);
+
+ // Call
+ TestDelegate call = () => sectionResult.GetCalculationScenarios(null);
+
+ // Assert
+ var exception = Assert.Throws(call);
+ Assert.AreEqual("calculationScenarios", exception.ParamName);
+ }
+
+ [Test]
+ public void GetCalculationScenarios_WithRelevantAndIrrelevantScenarios_ReturnsRelevantCalculationScenarios()
+ {
+ // Setup
+ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
+ var sectionResult = new PipingFailureMechanismSectionResult(section);
+ PipingCalculationScenario calculationScenario = PipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section);
+ PipingCalculationScenario calculationScenario2 = PipingCalculationScenarioTestFactory.CreateIrrelevantPipingCalculationScenario(section);
+
+ // Call
+ IEnumerable relevantScenarios = sectionResult.GetCalculationScenarios(new[]
+ {
+ calculationScenario,
+ calculationScenario2
+ });
+
+ // Assert
+ Assert.AreEqual(calculationScenario, relevantScenarios.Single());
+ }
+
+ [Test]
+ public void GetCalculationScenarios_WithNotIntersectingScenario_ReturnsNoCalculationScenarios()
+ {
+ // Setup
+ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(new[]
+ {
+ new Point2D(999, 999),
+ new Point2D(998, 998)
+ });
+ var sectionResult = new PipingFailureMechanismSectionResult(section);
+ PipingCalculationScenario calculationScenario = PipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(
+ FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
+
+ // Call
+ IEnumerable relevantScenarios = sectionResult.GetCalculationScenarios(new[]
+ {
+ calculationScenario
+ });
+
+ // Assert
+ CollectionAssert.IsEmpty(relevantScenarios);
+ }
}
}
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -rcb4699ab3f0ba6a23e21650ec8cec52d82d0777b -rd8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.cs (.../StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.cs) (revision cb4699ab3f0ba6a23e21650ec8cec52d82d0777b)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.cs (.../StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.cs) (revision d8d1d5d4a3eabd84c2d6e07eedb75fa200c2d54e)
@@ -73,8 +73,8 @@
///
/// The failure mechanism section result to
/// assemble the detailed assembly for.
- /// The failure mechanism belonging to this calculation.
- /// The belonging to this calculation.
+ /// The failure mechanism belonging to this section.
+ /// The belonging to this section.
/// A .
/// Thrown when any parameter is null.
/// Thrown when the
@@ -100,7 +100,7 @@
}
IAssemblyToolCalculatorFactory calculatorFactory = AssemblyToolCalculatorFactory.Instance;
- IFailureMechanismSectionAssemblyCalculator calculator =
+ IFailureMechanismSectionAssemblyCalculator calculator =
calculatorFactory.CreateFailureMechanismSectionAssemblyCalculator(AssemblyToolKernelFactory.Instance);
try