Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResult.cs
===================================================================
diff -u -rbfd84af2152b697561a499f15caa6d1f9f5fd4ed -r4fd3626f7269dc868877b00a69f3a65f1d27e33a
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResult.cs (.../ClosingStructuresFailureMechanismSectionResult.cs) (revision bfd84af2152b697561a499f15caa6d1f9f5fd4ed)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResult.cs (.../ClosingStructuresFailureMechanismSectionResult.cs) (revision 4fd3626f7269dc868877b00a69f3a65f1d27e33a)
@@ -97,7 +97,7 @@
public bool UseManualAssemblyProbability { get; set; }
///
- /// Gets or sets the manually selected assembly category group.
+ /// Gets or sets the manually entered assembly probability.
///
/// Thrown when is not in range [0,1].
public double ManualAssemblyProbability
Fisheye: Tag 4fd3626f7269dc868877b00a69f3a65f1d27e33a refers to a dead (removed) revision in file `Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs.orig'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs
===================================================================
diff -u -redf17facd465b0770db4e13b7e2e6bfcb46d9418 -r4fd3626f7269dc868877b00a69f3a65f1d27e33a
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs (.../FailureMechanismSectionResultRowHelper.cs) (revision edf17facd465b0770db4e13b7e2e6bfcb46d9418)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs (.../FailureMechanismSectionResultRowHelper.cs) (revision 4fd3626f7269dc868877b00a69f3a65f1d27e33a)
@@ -22,7 +22,6 @@
using System;
using System.ComponentModel;
using System.Drawing;
-using System.Windows.Forms;
using Core.Common.Controls.DataGrid;
using Core.Common.Util;
using Ringtoets.AssemblyTool.Data;
@@ -41,63 +40,6 @@
public static class FailureMechanismSectionResultRowHelper
{
///
- /// Sets the when the detailed assessment fails.
- ///
- /// The current data grid view cell.
- /// The value representing the simple assessment result type.
- /// The value representing the probability 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,
- ICalculation normativeCalculation)
- {
- if (dataGridViewCell == null)
- {
- throw new ArgumentNullException(nameof(dataGridViewCell));
- }
-
- if (simpleAssessmentResult == SimpleAssessmentResultType.NotApplicable
- || simpleAssessmentResult == SimpleAssessmentResultType.ProbabilityNegligible)
- {
- dataGridViewCell.ErrorText = string.Empty;
- return;
- }
-
- dataGridViewCell.ErrorText = GetDetailedAssessmentError(detailedAssessmentProbability, 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 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,
- ICalculation normativeCalculation)
- {
- if (dataGridViewCell == null)
- {
- throw new ArgumentNullException(nameof(dataGridViewCell));
- }
-
- if (simpleAssessmentResult == SimpleAssessmentResultValidityOnlyType.NotApplicable)
- {
- dataGridViewCell.ErrorText = string.Empty;
- return;
- }
-
- dataGridViewCell.ErrorText = GetDetailedAssessmentError(detailedAssessmentProbability, normativeCalculation);
- }
-
- ///
/// Gets the error text to display when the detailed assessment fails.
///
/// The value representing the probability of the detailed assessment.
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperTest.cs
===================================================================
diff -u -ra48ca9b4c36f30de172ae7763a6ba832cbcad9c5 -r4fd3626f7269dc868877b00a69f3a65f1d27e33a
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperTest.cs (.../FailureMechanismSectionResultRowHelperTest.cs) (revision a48ca9b4c36f30de172ae7763a6ba832cbcad9c5)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperTest.cs (.../FailureMechanismSectionResultRowHelperTest.cs) (revision 4fd3626f7269dc868877b00a69f3a65f1d27e33a)
@@ -20,15 +20,12 @@
// All rights reserved.
using System;
-using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
-using System.Windows.Forms;
using Core.Common.Controls.DataGrid;
using Core.Common.TestUtil;
using NUnit.Framework;
-using Rhino.Mocks;
using Ringtoets.AssemblyTool.Data;
using Ringtoets.Common.Data.Calculation;
using Ringtoets.Common.Data.TestUtil;
@@ -42,93 +39,6 @@
public class FailureMechanismSectionResultRowHelperTest
{
[Test]
- public void SetDetailedAssessmentErrorSimpleAssessmentResultType_DataGridViewCellNull_ThrowsArgumentNullException()
- {
- // Setup
- var mockRepository = new MockRepository();
- var calculation = mockRepository.Stub();
- mockRepository.ReplayAll();
-
- var simpleAssessmentResult = new Random(21).NextEnumValue();
-
- // Call
- TestDelegate call = () => FailureMechanismSectionResultRowHelper.SetDetailedAssessmentError(null,
- simpleAssessmentResult,
- 0.0,
- calculation);
-
- // Assert
- string paramName = Assert.Throws(call).ParamName;
- Assert.AreEqual("dataGridViewCell", paramName);
- mockRepository.VerifyAll();
- }
-
- [Test]
- [TestCaseSource(nameof(GetSimpleAssessmentResultNotApplicableConfigurations))]
- [TestCaseSource(nameof(GetSimpleAssessmentResultProbabilityNegligibleConfigurations))]
- [TestCaseSource(nameof(GetSimpleAssessmentResultAssessFurtherOrNoneAndCalculationNullConfigurations))]
- [TestCaseSource(nameof(GetSimpleAssessmentResultAssessFurtherOrNoneAndCalculationWithoutOutputConfigurations))]
- [TestCaseSource(nameof(GetSimpleAssessmentResultAssessFurtherOrNoneAndCalculationWithOutputConfigurations))]
- public void SetDetailedAssessmentError_WithSimpleAssessmentResultConfigurations_SetsErrorText(DataGridViewCell dataGridViewCell,
- SimpleAssessmentResultType simpleAssessmentResult,
- double detailedAssessmentResult,
- ICalculation normativeCalculation,
- string expectedErrorText)
- {
- // Call
- FailureMechanismSectionResultRowHelper.SetDetailedAssessmentError(dataGridViewCell,
- simpleAssessmentResult,
- detailedAssessmentResult,
- normativeCalculation);
-
- // Assert
- Assert.AreEqual(expectedErrorText, dataGridViewCell.ErrorText);
- }
-
- [Test]
- public void SetDetailedAssessmentErrorSimpleAssessmentValidityOnlyType_DataGridViewCellNull_ThrowsArgumentNullException()
- {
- // Setup
- var mockRepository = new MockRepository();
- var calculation = mockRepository.Stub();
- mockRepository.ReplayAll();
-
- var simpleAssessmentResult = new Random(21).NextEnumValue();
-
- // Call
- TestDelegate call = () => FailureMechanismSectionResultRowHelper.SetDetailedAssessmentError(null,
- simpleAssessmentResult,
- 0.0,
- calculation);
-
- // Assert
- string paramName = Assert.Throws(call).ParamName;
- Assert.AreEqual("dataGridViewCell", paramName);
- mockRepository.VerifyAll();
- }
-
- [Test]
- [TestCaseSource(nameof(GetSimpleAssessmentResultValidityOnlyIsNotApplicableConfigurations))]
- [TestCaseSource(nameof(GetSimpleAssessmentResultValidityOnlyIsNotApplicableAndCalculationNullConfigurations))]
- [TestCaseSource(nameof(GetSimpleAssessmentResultValidityOnlyIsNotApplicableAndCalculationWithoutOutputConfigurations))]
- [TestCaseSource(nameof(SimpleAssessmentResultValidityOnlyIsNotApplicableAndCalculationWithOutput))]
- public void SetAssessmentDetailedAssessmentError_WithSimpleAssessmentValidityOnlyConfigurations_SetsErrorText(DataGridViewCell dataGridViewCell,
- SimpleAssessmentResultValidityOnlyType simpleAssessmentResult,
- double detailedAssessmentResult,
- ICalculation normativeCalculation,
- string expectedErrorText)
- {
- // Call
- FailureMechanismSectionResultRowHelper.SetDetailedAssessmentError(dataGridViewCell,
- simpleAssessmentResult,
- detailedAssessmentResult,
- normativeCalculation);
-
- // Assert
- Assert.AreEqual(expectedErrorText, dataGridViewCell.ErrorText);
- }
-
- [Test]
[TestCaseSource(nameof(GetCalculationNullConfigurations))]
[TestCaseSource(nameof(GetCalculationWithoutOutputConfigurations))]
[TestCaseSource(nameof(GetCalculationWithOutputConfigurations))]
@@ -396,8 +306,6 @@
Assert.AreEqual(expectedDisplayName, displayName);
}
- private class TestDataGridViewCell : DataGridViewCell {}
-
#region Test cases
private static IEnumerable GetCalculationNullConfigurations()
@@ -443,287 +351,5 @@
}
#endregion
-
- #region Test cases simple assessment (result)
-
- private static IEnumerable GetSimpleAssessmentResultNotApplicableConfigurations()
- {
- var dataGridViewCell = new TestDataGridViewCell
- {
- ErrorText = "Default text"
- };
-
- string expectedErrorMessage = string.Empty;
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.NotApplicable, double.NaN, null, string.Empty)
- .SetName("SufficientWithInvalidDetailedAssessmentAndNoCalculation");
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.NotApplicable, 0.0, null, string.Empty)
- .SetName("SufficientWithValidDetailedAssessmentAndNoCalculation");
-
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.NotApplicable, double.NaN, null, expectedErrorMessage)
- .SetName("NotApplicableWithInvalidDetailedAssessmentAndNoCalculation");
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.NotApplicable, 0.0, null, expectedErrorMessage)
- .SetName("NotApplicableWithValidDetailedAssessmentAndNoCalculation");
-
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.NotApplicable, double.NaN,
- CalculationTestDataFactory.CreateCalculationWithOutput(),
- expectedErrorMessage)
- .SetName("SufficientWithInvalidDetailedAssessmentAndCalculationWithOutput");
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.NotApplicable, 0.0,
- CalculationTestDataFactory.CreateCalculationWithOutput(),
- expectedErrorMessage)
- .SetName("SufficientWithValidDetailedAssessmentAndCalculationWithOutput");
-
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.NotApplicable, double.NaN,
- CalculationTestDataFactory.CreateCalculationWithoutOutput(),
- expectedErrorMessage)
- .SetName("SufficientWithInvalidDetailedAssessmentAndCalculationWithoutOutput");
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.NotApplicable, 0.0,
- CalculationTestDataFactory.CreateCalculationWithoutOutput(),
- expectedErrorMessage)
- .SetName("SufficientWithValidDetailedAssessmentAndCalculationWithoutOutput");
- }
-
- private static IEnumerable GetSimpleAssessmentResultProbabilityNegligibleConfigurations()
- {
- var dataGridViewCell = new TestDataGridViewCell
- {
- ErrorText = "Default text"
- };
-
- string expectedErrorMessage = string.Empty;
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.ProbabilityNegligible, double.NaN, null,
- expectedErrorMessage)
- .SetName("ProbabilityNegligibleWithWithInvalidDetailedAssessmentAndNoCalculation");
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.ProbabilityNegligible, 0.0, null,
- expectedErrorMessage)
- .SetName("ProbabilityNegligibleWithWithValidDetailedAssessmentAndNoCalculation");
-
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.ProbabilityNegligible, double.NaN, null,
- expectedErrorMessage)
- .SetName("ProbabilityNegligibleWithInvalidDetailedAssessmentAndNoCalculation");
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.ProbabilityNegligible, 0.0, null, expectedErrorMessage)
- .SetName("ProbabilityNegligibleWithValidDetailedAssessmentAndNoCalculation");
-
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.ProbabilityNegligible, double.NaN,
- CalculationTestDataFactory.CreateCalculationWithOutput(),
- expectedErrorMessage)
- .SetName("ProbabilityNegligibleWithInvalidDetailedAssessmentAndCalculationWithOutput");
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.ProbabilityNegligible, 0.0,
- CalculationTestDataFactory.CreateCalculationWithOutput(),
- expectedErrorMessage)
- .SetName("ProbabilityNegligibleWithValidDetailedAssessmentAndCalculationWithOutput");
-
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.ProbabilityNegligible, double.NaN,
- CalculationTestDataFactory.CreateCalculationWithoutOutput(),
- expectedErrorMessage)
- .SetName("ProbabilityNegligibleWithInvalidDetailedAssessmentAndCalculationWithoutOutput");
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.ProbabilityNegligible, 0.0,
- CalculationTestDataFactory.CreateCalculationWithoutOutput(),
- expectedErrorMessage)
- .SetName("ProbabilityNegligibleWithValidDetailedAssessmentAndCalculationWithoutOutput");
- }
-
- private static IEnumerable GetSimpleAssessmentResultAssessFurtherOrNoneAndCalculationNullConfigurations()
- {
- var dataGridViewCell = new TestDataGridViewCell
- {
- ErrorText = "Default text"
- };
-
- const string expectedErrorMessage = "Er moet een maatgevende berekening voor dit vak worden geselecteerd.";
-
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.AssessFurther, double.NaN, null,
- expectedErrorMessage)
- .SetName("AssessFurtherWithInvalidDetailedAssessmentAndNoCalculation");
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.AssessFurther, 0.0, null,
- expectedErrorMessage)
- .SetName("AssessFurtherWithValidDetailedAssessmentAndNoCalculation");
-
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.None, double.NaN, null,
- expectedErrorMessage)
- .SetName("NoneWithInvalidDetailedAssessmentAndNoCalculation");
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.None, 0.0, null,
- expectedErrorMessage)
- .SetName("NoneWithValidDetailedAssessmentAndNoCalculation");
- }
-
- private static IEnumerable GetSimpleAssessmentResultAssessFurtherOrNoneAndCalculationWithoutOutputConfigurations()
- {
- var dataGridViewCell = new TestDataGridViewCell
- {
- ErrorText = "Default text"
- };
-
- const string expectedErrorMessage = "De maatgevende berekening voor dit vak moet nog worden uitgevoerd.";
-
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.AssessFurther, double.NaN,
- CalculationTestDataFactory.CreateCalculationWithoutOutput(),
- expectedErrorMessage)
- .SetName("AssessFurtherWithInvalidDetailedAssessmentAndCalculationWithoutOutput");
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.AssessFurther, 0.0,
- CalculationTestDataFactory.CreateCalculationWithoutOutput(),
- expectedErrorMessage)
- .SetName("AssessFurtherWithValidDetailedAssessmentAndCalculationWithoutOutput");
-
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.None, double.NaN,
- CalculationTestDataFactory.CreateCalculationWithoutOutput(),
- expectedErrorMessage)
- .SetName("NoneWithInvalidDetailedAssessmentAndCalculationWithoutOutput");
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.None, 0.0,
- CalculationTestDataFactory.CreateCalculationWithoutOutput(),
- expectedErrorMessage)
- .SetName("NoneWithValidDetailedAssessmentAndCalculationWithoutOutput");
- }
-
- private static IEnumerable GetSimpleAssessmentResultAssessFurtherOrNoneAndCalculationWithOutputConfigurations()
- {
- var dataGridViewCell = new TestDataGridViewCell
- {
- ErrorText = "Default text"
- };
-
- const string expectedErrorMessageOutputInvalid = "De maatgevende berekening voor dit vak moet een geldige uitkomst hebben.";
- string expectedEmptyErrorMessage = string.Empty;
-
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.AssessFurther, double.NaN,
- CalculationTestDataFactory.CreateCalculationWithOutput(),
- expectedErrorMessageOutputInvalid)
- .SetName("AssessFurtherWithInvalidDetailedAssessmentAndCalculationWithOutput");
-
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.AssessFurther, 0.0,
- CalculationTestDataFactory.CreateCalculationWithOutput(),
- expectedEmptyErrorMessage)
- .SetName("AssessFurtherWithValidDetailedAssessmentAndCalculationWithOutput");
-
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.None, double.NaN,
- CalculationTestDataFactory.CreateCalculationWithOutput(),
- expectedErrorMessageOutputInvalid)
- .SetName("NoneWithInvalidDetailedAssessmentAndCalculationWithOutput");
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultType.None, 0.0,
- CalculationTestDataFactory.CreateCalculationWithOutput(),
- expectedEmptyErrorMessage)
- .SetName("NoneWithValidDetailedAssessmentAndCalculationWithOutput");
- }
-
- #endregion
-
- #region Test cases simple assessment (validity only)
-
- private static IEnumerable GetSimpleAssessmentResultValidityOnlyIsNotApplicableConfigurations()
- {
- var dataGridViewCell = new TestDataGridViewCell
- {
- ErrorText = "Default text"
- };
-
- string expectedErrorMessage = string.Empty;
-
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultValidityOnlyType.NotApplicable, double.NaN, null, expectedErrorMessage)
- .SetName("NotApplicableWithInvalidDetailedAssessmentAndNoCalculation");
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultValidityOnlyType.NotApplicable, 0.0, null, expectedErrorMessage)
- .SetName("NotApplicableWithValidDetailedAssessmentAndNoCalculation");
-
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultValidityOnlyType.NotApplicable, double.NaN,
- CalculationTestDataFactory.CreateCalculationWithOutput(),
- expectedErrorMessage)
- .SetName("NotApplicableWithInvalidDetailedAssessmentAndCalculationWithOutput");
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultValidityOnlyType.NotApplicable, 0.0,
- CalculationTestDataFactory.CreateCalculationWithOutput(),
- expectedErrorMessage)
- .SetName("NotApplicableWithValidDetailedAssessmentAndCalculationWithOutput");
-
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultValidityOnlyType.NotApplicable, double.NaN,
- CalculationTestDataFactory.CreateCalculationWithoutOutput(),
- expectedErrorMessage)
- .SetName("NotApplicableWithInvalidDetailedAssessmentAndCalculationWithoutOutput");
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultValidityOnlyType.NotApplicable, 0.0,
- CalculationTestDataFactory.CreateCalculationWithoutOutput(),
- expectedErrorMessage)
- .SetName("NotApplicableWithValidDetailedAssessmentAndCalculationWithoutOutput");
- }
-
- private static IEnumerable GetSimpleAssessmentResultValidityOnlyIsNotApplicableAndCalculationNullConfigurations()
- {
- var dataGridViewCell = new TestDataGridViewCell
- {
- ErrorText = "Default text"
- };
-
- const string expectedErrorMessage = "Er moet een maatgevende berekening voor dit vak worden geselecteerd.";
-
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultValidityOnlyType.None, double.NaN, null,
- expectedErrorMessage)
- .SetName("NoneWithInvalidDetailedAssessmentAndNoCalculation");
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultValidityOnlyType.None, 0.0, null,
- expectedErrorMessage)
- .SetName("NoneWithValidDetailedAssessmentAndNoCalculation");
-
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultValidityOnlyType.Applicable, double.NaN, null,
- expectedErrorMessage)
- .SetName("ApplicableWithInvalidDetailedAssessmentAndNoCalculation");
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultValidityOnlyType.Applicable, 0.0, null,
- expectedErrorMessage)
- .SetName("ApplicableWithValidDetailedAssessmentAndNoCalculation");
- }
-
- private static IEnumerable GetSimpleAssessmentResultValidityOnlyIsNotApplicableAndCalculationWithoutOutputConfigurations()
- {
- var dataGridViewCell = new TestDataGridViewCell
- {
- ErrorText = "Default text"
- };
-
- const string expectedErrorMessage = "De maatgevende berekening voor dit vak moet nog worden uitgevoerd.";
-
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultValidityOnlyType.None, double.NaN,
- CalculationTestDataFactory.CreateCalculationWithoutOutput(),
- expectedErrorMessage)
- .SetName("NoneWithInvalidDetailedAssessmentAndCalculationWithoutOutput");
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultValidityOnlyType.None, 0.0,
- CalculationTestDataFactory.CreateCalculationWithoutOutput(),
- expectedErrorMessage)
- .SetName("NoneWithValidDetailedAssessmentAndCalculationWithoutOutput");
-
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultValidityOnlyType.Applicable, double.NaN,
- CalculationTestDataFactory.CreateCalculationWithoutOutput(),
- expectedErrorMessage)
- .SetName("ApplicableWithInvalidDetailedAssessmentAndCalculationWithoutOutput");
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultValidityOnlyType.Applicable, 0.0,
- CalculationTestDataFactory.CreateCalculationWithoutOutput(),
- expectedErrorMessage)
- .SetName("ApplicableWithValidDetailedAssessmentAndCalculationWithoutOutput");
- }
-
- private static IEnumerable SimpleAssessmentResultValidityOnlyIsNotApplicableAndCalculationWithOutput()
- {
- var dataGridViewCell = new TestDataGridViewCell
- {
- ErrorText = "Default text"
- };
-
- const string expectedErrorMessageOutputInvalid = "De maatgevende berekening voor dit vak moet een geldige uitkomst hebben.";
- string expectedEmptyErrorMessage = string.Empty;
-
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultValidityOnlyType.None, double.NaN,
- CalculationTestDataFactory.CreateCalculationWithOutput(),
- expectedErrorMessageOutputInvalid)
- .SetName("NoneWithInvalidDetailedAssessmentAndCalculationWithOutput");
-
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultValidityOnlyType.None, 0.0,
- CalculationTestDataFactory.CreateCalculationWithOutput(),
- expectedEmptyErrorMessage)
- .SetName("NoneWithValidDetailedAssessmentAndCalculationWithOutput");
-
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultValidityOnlyType.Applicable, double.NaN,
- CalculationTestDataFactory.CreateCalculationWithOutput(),
- expectedErrorMessageOutputInvalid)
- .SetName("ApplicableWithInvalidDetailedAssessmentAndCalculationWithOutput");
- yield return new TestCaseData(dataGridViewCell, SimpleAssessmentResultValidityOnlyType.Applicable, 0.0,
- CalculationTestDataFactory.CreateCalculationWithOutput(),
- expectedEmptyErrorMessage)
- .SetName("ApplicableWithValidDetailedAssessmentAndCalculationWithOutput");
- }
-
- #endregion
}
}
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResult.cs
===================================================================
diff -u -r8d37f4040238a84405d8f08363ec706232a35326 -r4fd3626f7269dc868877b00a69f3a65f1d27e33a
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResult.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResult.cs) (revision 8d37f4040238a84405d8f08363ec706232a35326)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResult.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResult.cs) (revision 4fd3626f7269dc868877b00a69f3a65f1d27e33a)
@@ -96,7 +96,7 @@
public bool UseManualAssemblyProbability { get; set; }
///
- /// Gets or sets the manually selected assembly category group.
+ /// Gets or sets the manually entered assembly probability.
///
/// Thrown when is not in range [0,1].
public double ManualAssemblyProbability
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResult.cs
===================================================================
diff -u -rbe5396964501c20d142d21dcf39a2a859bbcb472 -r4fd3626f7269dc868877b00a69f3a65f1d27e33a
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResult.cs (.../HeightStructuresFailureMechanismSectionResult.cs) (revision be5396964501c20d142d21dcf39a2a859bbcb472)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResult.cs (.../HeightStructuresFailureMechanismSectionResult.cs) (revision 4fd3626f7269dc868877b00a69f3a65f1d27e33a)
@@ -97,7 +97,7 @@
public bool UseManualAssemblyProbability { get; set; }
///
- /// Gets or sets the manually selected assembly category group.
+ /// Gets or sets the manually entered assembly probability.
///
/// Thrown when is not in range [0,1].
public double ManualAssemblyProbability
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResult.cs
===================================================================
diff -u -r861b8bfa0a1cdce016f3feb13e762a43e4315080 -r4fd3626f7269dc868877b00a69f3a65f1d27e33a
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResult.cs (.../PipingFailureMechanismSectionResult.cs) (revision 861b8bfa0a1cdce016f3feb13e762a43e4315080)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResult.cs (.../PipingFailureMechanismSectionResult.cs) (revision 4fd3626f7269dc868877b00a69f3a65f1d27e33a)
@@ -90,7 +90,7 @@
public bool UseManualAssemblyProbability { get; set; }
///
- /// Gets or sets the manually selected assembly category group.
+ /// Gets or sets the manually entered assembly probability.
///
/// Thrown when is not in range [0,1].
public double ManualAssemblyProbability
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSectionResult.cs
===================================================================
diff -u -re5e23e07a418655a45382dd5cc01d537fc17dfa4 -r4fd3626f7269dc868877b00a69f3a65f1d27e33a
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSectionResult.cs (.../StabilityPointStructuresFailureMechanismSectionResult.cs) (revision e5e23e07a418655a45382dd5cc01d537fc17dfa4)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSectionResult.cs (.../StabilityPointStructuresFailureMechanismSectionResult.cs) (revision 4fd3626f7269dc868877b00a69f3a65f1d27e33a)
@@ -100,7 +100,7 @@
public bool UseManualAssemblyProbability { get; set; }
///
- /// Gets or sets the manually selected assembly category group.
+ /// Gets or sets the manually set assembly probability.
///
/// Thrown when
/// is not in range [0,1].