Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r40aef93935efc6585533d5885a20a6f3524e9875 -r9fbd4c61f928385185c69004737130639e66b464
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 40aef93935efc6585533d5885a20a6f3524e9875)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 9fbd4c61f928385185c69004737130639e66b464)
@@ -1223,9 +1223,7 @@
private static void ValidateProbabilistic(ProbabilisticPipingCalculationScenarioContext context)
{
- ProbabilisticPipingCalculationService.Validate(context.WrappedData,
- context.FailureMechanism.GeneralInput,
- context.AssessmentSection, context.FailureMechanism);
+ ProbabilisticPipingCalculationService.Validate(context.WrappedData, context.FailureMechanism, context.AssessmentSection);
}
private void CalculateProbabilistic(ProbabilisticPipingCalculationScenarioContext context)
@@ -1332,9 +1330,7 @@
break;
case ProbabilisticPipingCalculationScenario probabilisticPipingCalculationScenario:
ProbabilisticPipingCalculationService.Validate(probabilisticPipingCalculationScenario,
- generalPipingInput,
- assessmentSection,
- failureMechanism);
+ failureMechanism, assessmentSection);
break;
default:
throw new NotSupportedException();
Index: Riskeer/Piping/src/Riskeer.Piping.Service/Probabilistic/ProbabilisticPipingCalculationActivity.cs
===================================================================
diff -u -r359440bec0cb49054b8fe9b20b7e61c69f32f3b9 -r9fbd4c61f928385185c69004737130639e66b464
--- Riskeer/Piping/src/Riskeer.Piping.Service/Probabilistic/ProbabilisticPipingCalculationActivity.cs (.../ProbabilisticPipingCalculationActivity.cs) (revision 359440bec0cb49054b8fe9b20b7e61c69f32f3b9)
+++ Riskeer/Piping/src/Riskeer.Piping.Service/Probabilistic/ProbabilisticPipingCalculationActivity.cs (.../ProbabilisticPipingCalculationActivity.cs) (revision 9fbd4c61f928385185c69004737130639e66b464)
@@ -99,7 +99,7 @@
protected override bool Validate()
{
- return ProbabilisticPipingCalculationService.Validate(calculation, failureMechanism.GeneralInput, assessmentSection, failureMechanism);
+ return ProbabilisticPipingCalculationService.Validate(calculation, failureMechanism, assessmentSection);
}
}
}
\ No newline at end of file
Index: Riskeer/Piping/src/Riskeer.Piping.Service/Probabilistic/ProbabilisticPipingCalculationService.cs
===================================================================
diff -u -r536a0319f5fae89ab806c0ebd1ad03eb9c0238e8 -r9fbd4c61f928385185c69004737130639e66b464
--- Riskeer/Piping/src/Riskeer.Piping.Service/Probabilistic/ProbabilisticPipingCalculationService.cs (.../ProbabilisticPipingCalculationService.cs) (revision 536a0319f5fae89ab806c0ebd1ad03eb9c0238e8)
+++ Riskeer/Piping/src/Riskeer.Piping.Service/Probabilistic/ProbabilisticPipingCalculationService.cs (.../ProbabilisticPipingCalculationService.cs) (revision 9fbd4c61f928385185c69004737130639e66b464)
@@ -69,23 +69,17 @@
/// the execution of the operation.
///
/// The for which to validate the values.
- /// The to derive values from during the validation.
- /// The for which to validate the values.
/// The for which to validate the values.
+ /// The for which to validate the values.
/// true if has no validation errors; false otherwise.
/// Thrown when any parameter is null.
- public static bool Validate(ProbabilisticPipingCalculation calculation, GeneralPipingInput generalInput, IAssessmentSection assessmentSection, PipingFailureMechanism failureMechanism)
+ public static bool Validate(ProbabilisticPipingCalculation calculation, PipingFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
{
if (calculation == null)
{
throw new ArgumentNullException(nameof(calculation));
}
- if (generalInput == null)
- {
- throw new ArgumentNullException(nameof(generalInput));
- }
-
if (assessmentSection == null)
{
throw new ArgumentNullException(nameof(assessmentSection));
@@ -100,7 +94,7 @@
LogAnyWarnings(calculation);
- bool hasErrors = LogAnyErrors(calculation, generalInput, assessmentSection, failureMechanism);
+ bool hasErrors = LogAnyErrors(calculation, failureMechanism.GeneralInput, assessmentSection, failureMechanism);
CalculationServiceHelper.LogValidationEnd();
Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/Probabilistic/ProbabilisticPipingCalculationServiceTest.cs
===================================================================
diff -u -r40aef93935efc6585533d5885a20a6f3524e9875 -r9fbd4c61f928385185c69004737130639e66b464
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/Probabilistic/ProbabilisticPipingCalculationServiceTest.cs (.../ProbabilisticPipingCalculationServiceTest.cs) (revision 40aef93935efc6585533d5885a20a6f3524e9875)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/Probabilistic/ProbabilisticPipingCalculationServiceTest.cs (.../ProbabilisticPipingCalculationServiceTest.cs) (revision 9fbd4c61f928385185c69004737130639e66b464)
@@ -85,9 +85,8 @@
// Call
void Call() => ProbabilisticPipingCalculationService.Validate(null,
- new GeneralPipingInput(),
- assessmentSection,
- new PipingFailureMechanism());
+ new PipingFailureMechanism(),
+ assessmentSection);
// Assert
var exception = Assert.Throws(Call);
@@ -96,7 +95,7 @@
}
[Test]
- public void Validate_GeneralInputNull_ThrowsArgumentNullException()
+ public void Validate_FailureMechanismNull_ThrowsArgumentNullException()
{
// Setup
var mocks = new MockRepository();
@@ -106,31 +105,10 @@
// Call
void Call() => ProbabilisticPipingCalculationService.Validate(new TestProbabilisticPipingCalculation(),
null,
- assessmentSection,
- new PipingFailureMechanism());
+ assessmentSection);
// Assert
var exception = Assert.Throws(Call);
- Assert.AreEqual("generalInput", exception.ParamName);
- mocks.VerifyAll();
- }
-
- [Test]
- public void Validate_FailureMechanismNull_ThrowsArgumentNullException()
- {
- // Setup
- var mocks = new MockRepository();
- var assessmentSection = mocks.Stub();
- mocks.ReplayAll();
-
- // Call
- void Call() => ProbabilisticPipingCalculationService.Validate(new TestProbabilisticPipingCalculation(),
- new GeneralPipingInput(),
- assessmentSection,
- null);
-
- // Assert
- var exception = Assert.Throws(Call);
Assert.AreEqual("failureMechanism", exception.ParamName);
mocks.VerifyAll();
}
@@ -140,9 +118,8 @@
{
// Call
void Call() => ProbabilisticPipingCalculationService.Validate(new TestProbabilisticPipingCalculation(),
- new GeneralPipingInput(),
- null,
- new PipingFailureMechanism());
+ new PipingFailureMechanism(),
+ null);
// Assert
var exception = Assert.Throws(Call);
@@ -162,9 +139,8 @@
// Call
void Call() => ProbabilisticPipingCalculationService.Validate(calculation,
- new GeneralPipingInput(),
- assessmentSection,
- failureMechanism);
+ failureMechanism,
+ assessmentSection);
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -193,9 +169,8 @@
var isValid = false;
void Call() => isValid = ProbabilisticPipingCalculationService.Validate(calculation,
- new GeneralPipingInput(),
- assessmentSection,
- failureMechanism);
+ failureMechanism,
+ assessmentSection);
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -229,9 +204,8 @@
var isValid = true;
void Call() => isValid = ProbabilisticPipingCalculationService.Validate(calculation,
- new GeneralPipingInput(),
- assessmentSection,
- failureMechanism);
+ failureMechanism,
+ assessmentSection);
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -266,9 +240,8 @@
var isValid = true;
void Call() => isValid = ProbabilisticPipingCalculationService.Validate(calculation,
- new GeneralPipingInput(),
- assessmentSection,
- failureMechanism);
+ failureMechanism,
+ assessmentSection);
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -302,9 +275,8 @@
var isValid = false;
void Call() => isValid = ProbabilisticPipingCalculationService.Validate(calculation,
- new GeneralPipingInput(),
- assessmentSection,
- failureMechanism);
+ failureMechanism,
+ assessmentSection);
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -336,9 +308,8 @@
var isValid = false;
void Call() => isValid = ProbabilisticPipingCalculationService.Validate(calculation,
- new GeneralPipingInput(),
- assessmentSection,
- failureMechanism);
+ failureMechanism,
+ assessmentSection);
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -368,9 +339,8 @@
var isValid = false;
void Call() => isValid = ProbabilisticPipingCalculationService.Validate(new TestProbabilisticPipingCalculation(),
- new GeneralPipingInput(),
- assessmentSection,
- failureMechanism);
+ failureMechanism,
+ assessmentSection);
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -417,9 +387,8 @@
// Call
void Call() => isValid = ProbabilisticPipingCalculationService.Validate(calculation,
- new GeneralPipingInput(),
- assessmentSection,
- failureMechanism);
+ failureMechanism,
+ assessmentSection);
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -474,9 +443,8 @@
// Call
void Call() => isValid = ProbabilisticPipingCalculationService.Validate(calculation,
- new GeneralPipingInput(),
- assessmentSection,
- failureMechanism);
+ failureMechanism,
+ assessmentSection);
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -534,9 +502,8 @@
// Call
void Call() => isValid = ProbabilisticPipingCalculationService.Validate(calculation,
- new GeneralPipingInput(),
- assessmentSection,
- failureMechanism);
+ failureMechanism,
+ assessmentSection);
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -617,9 +584,8 @@
// Call
void Call() => isValid = ProbabilisticPipingCalculationService.Validate(calculation,
- new GeneralPipingInput(),
- assessmentSection,
- failureMechanism);
+ failureMechanism,
+ assessmentSection);
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -693,9 +659,8 @@
// Call
void Call() => isValid = ProbabilisticPipingCalculationService.Validate(calculation,
- new GeneralPipingInput(),
- assessmentSection,
- failureMechanism);
+ failureMechanism,
+ assessmentSection);
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -769,9 +734,8 @@
// Call
void Call() => isValid = ProbabilisticPipingCalculationService.Validate(calculation,
- new GeneralPipingInput(),
- assessmentSection,
- failureMechanism);
+ failureMechanism,
+ assessmentSection);
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -848,9 +812,8 @@
// Call
void Call() => isValid = ProbabilisticPipingCalculationService.Validate(calculation,
- new GeneralPipingInput(),
- assessmentSection,
- failureMechanism);
+ failureMechanism,
+ assessmentSection);
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -923,9 +886,8 @@
// Call
void Call() => ProbabilisticPipingCalculationService.Validate(calculation,
- new GeneralPipingInput(),
- assessmentSection,
- failureMechanism);
+ failureMechanism,
+ assessmentSection);
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -991,9 +953,8 @@
// Call
void Call() => isValid = ProbabilisticPipingCalculationService.Validate(calculation,
- new GeneralPipingInput(),
- assessmentSection,
- failureMechanism);
+ failureMechanism,
+ assessmentSection);
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -1026,9 +987,8 @@
var isValid = false;
void Call() => isValid = ProbabilisticPipingCalculationService.Validate(calculation,
- new GeneralPipingInput(),
- assessmentSection,
- failureMechanism);
+ failureMechanism,
+ assessmentSection);
// Assert
TestHelper.AssertLogMessages(Call, messages =>
@@ -1073,9 +1033,8 @@
var isValid = false;
void Call() => isValid = ProbabilisticPipingCalculationService.Validate(calculation,
- new GeneralPipingInput(),
- assessmentSection,
- failureMechanism);
+ failureMechanism,
+ assessmentSection);
// Assert
TestHelper.AssertLogMessages(Call, messages =>