Index: Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/DerivedSemiProbabilisticPipingOutputFactory.cs
===================================================================
diff -u -ra043233edc226e2d853e9b828d60fc035f54cf4e -r37c3f433c92d5782b848e27ba238749cce997dfc
--- Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/DerivedSemiProbabilisticPipingOutputFactory.cs (.../DerivedSemiProbabilisticPipingOutputFactory.cs) (revision a043233edc226e2d853e9b828d60fc035f54cf4e)
+++ Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/DerivedSemiProbabilisticPipingOutputFactory.cs (.../DerivedSemiProbabilisticPipingOutputFactory.cs) (revision 37c3f433c92d5782b848e27ba238749cce997dfc)
@@ -36,8 +36,7 @@
/// The norm to assess for.
/// The created .
/// Thrown when is null.
- public static DerivedSemiProbabilisticPipingOutput Create(SemiProbabilisticPipingOutput output,
- double norm)
+ public static DerivedSemiProbabilisticPipingOutput Create(SemiProbabilisticPipingOutput output, double norm)
{
if (output == null)
{
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingOutputProperties.cs
===================================================================
diff -u -rb465cf2923c9d93a06ddf73d81ad7a71ad41cd9b -r37c3f433c92d5782b848e27ba238749cce997dfc
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingOutputProperties.cs (.../SemiProbabilisticPipingOutputProperties.cs) (revision b465cf2923c9d93a06ddf73d81ad7a71ad41cd9b)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingOutputProperties.cs (.../SemiProbabilisticPipingOutputProperties.cs) (revision 37c3f433c92d5782b848e27ba238749cce997dfc)
@@ -24,9 +24,7 @@
using Core.Common.Util.Attributes;
using Core.Gui.Attributes;
using Core.Gui.PropertyBag;
-using Riskeer.Common.Data.AssessmentSection;
using Riskeer.Common.Forms.Helpers;
-using Riskeer.Piping.Data;
using Riskeer.Piping.Data.SemiProbabilistic;
using Riskeer.Piping.Forms.Properties;
@@ -37,36 +35,24 @@
///
public class SemiProbabilisticPipingOutputProperties : ObjectProperties
{
- private DerivedSemiProbabilisticPipingOutput derivedOutput;
+ private readonly DerivedSemiProbabilisticPipingOutput derivedOutput;
///
/// Creates a new instance of .
///
/// The output to show the properties for.
- /// The failure mechanism the output belongs to.
- /// The assessment section the output belongs to.
- /// Thrown when any parameter
- /// is null.
- public SemiProbabilisticPipingOutputProperties(SemiProbabilisticPipingOutput output, PipingFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
+ /// The norm to assess for.
+ /// Thrown when is null.
+ public SemiProbabilisticPipingOutputProperties(SemiProbabilisticPipingOutput output, double norm)
{
if (output == null)
{
throw new ArgumentNullException(nameof(output));
}
- if (failureMechanism == null)
- {
- throw new ArgumentNullException(nameof(failureMechanism));
- }
-
- if (assessmentSection == null)
- {
- throw new ArgumentNullException(nameof(assessmentSection));
- }
-
Data = output;
- CreateDerivedOutput(output, assessmentSection);
+ derivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(output, norm);
}
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Uplift), 1, 4)]
@@ -260,10 +246,5 @@
return derivedOutput.PipingReliability;
}
}
-
- private void CreateDerivedOutput(SemiProbabilisticPipingOutput output, IAssessmentSection assessmentSection)
- {
- derivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(output, assessmentSection.FailureMechanismContribution.Norm);
- }
}
}
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingOutputPropertiesTest.cs
===================================================================
diff -u -rb465cf2923c9d93a06ddf73d81ad7a71ad41cd9b -r37c3f433c92d5782b848e27ba238749cce997dfc
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingOutputPropertiesTest.cs (.../SemiProbabilisticPipingOutputPropertiesTest.cs) (revision b465cf2923c9d93a06ddf73d81ad7a71ad41cd9b)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingOutputPropertiesTest.cs (.../SemiProbabilisticPipingOutputPropertiesTest.cs) (revision 37c3f433c92d5782b848e27ba238749cce997dfc)
@@ -24,11 +24,8 @@
using Core.Gui.PropertyBag;
using Core.Gui.TestUtil;
using NUnit.Framework;
-using Rhino.Mocks;
-using Riskeer.Common.Data.AssessmentSection;
using Riskeer.Common.Data.TestUtil;
using Riskeer.Common.Forms.Helpers;
-using Riskeer.Piping.Data;
using Riskeer.Piping.Data.SemiProbabilistic;
using Riskeer.Piping.Data.TestUtil;
using Riskeer.Piping.Forms.PropertyClasses.SemiProbabilistic;
@@ -41,79 +38,34 @@
[Test]
public void Constructor_OutputNull_ThrowsArgumentNullException()
{
- // Setup
- var mocks = new MockRepository();
- var assessmentSection = mocks.Stub();
- mocks.ReplayAll();
-
// Call
- void Call() => new SemiProbabilisticPipingOutputProperties(null, new PipingFailureMechanism(), assessmentSection);
+ void Call() => new SemiProbabilisticPipingOutputProperties(null, 0.1);
// Assert
var exception = Assert.Throws(Call);
Assert.AreEqual("output", exception.ParamName);
- mocks.VerifyAll();
}
[Test]
- public void Constructor_FailureMechanismNull_ThrowsArgumentNullException()
- {
- // Setup
- var mocks = new MockRepository();
- var assessmentSection = mocks.Stub();
- mocks.ReplayAll();
-
- // Call
- void Call() => new SemiProbabilisticPipingOutputProperties(PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput(), null, assessmentSection);
-
- // Assert
- var exception = Assert.Throws(Call);
- Assert.AreEqual("failureMechanism", exception.ParamName);
- mocks.VerifyAll();
- }
-
- [Test]
- public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
- {
- // Call
- void Call() => new SemiProbabilisticPipingOutputProperties(PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput(), new PipingFailureMechanism(), null);
-
- // Assert
- var exception = Assert.Throws(Call);
- Assert.AreEqual("assessmentSection", exception.ParamName);
- }
-
- [Test]
public void Constructor_ExpectedValues()
{
// Setup
- var failureMechanism = new PipingFailureMechanism();
-
- var mocks = new MockRepository();
- IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
- mocks.ReplayAll();
-
SemiProbabilisticPipingOutput output = PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput();
// Call
- var properties = new SemiProbabilisticPipingOutputProperties(output, failureMechanism, assessmentSection);
+ var properties = new SemiProbabilisticPipingOutputProperties(output, 0.1);
// Assert
Assert.IsInstanceOf>(properties);
Assert.AreSame(output, properties.Data);
- mocks.VerifyAll();
}
[Test]
public void GetProperties_WithData_ReturnExpectedValues()
{
// Setup
- var failureMechanism = new PipingFailureMechanism();
+ const double norm = 0.1;
- var mocks = new MockRepository();
- IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
- mocks.ReplayAll();
-
var random = new Random(22);
double upliftEffectiveStress = random.NextDouble();
double heaveGradient = random.NextDouble();
@@ -137,10 +89,10 @@
});
// Call
- var properties = new SemiProbabilisticPipingOutputProperties(output, failureMechanism, assessmentSection);
+ var properties = new SemiProbabilisticPipingOutputProperties(output, norm);
// Assert
- DerivedSemiProbabilisticPipingOutput expectedDerivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(output, assessmentSection.FailureMechanismContribution.Norm);
+ DerivedSemiProbabilisticPipingOutput expectedDerivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(output, norm);
Assert.AreEqual(upliftFactorOfSafety, properties.UpliftFactorOfSafety, properties.UpliftFactorOfSafety.GetAccuracy());
Assert.AreEqual(expectedDerivedOutput.UpliftReliability, properties.UpliftReliability, properties.UpliftReliability.GetAccuracy());
Assert.AreEqual(ProbabilityFormattingHelper.Format(expectedDerivedOutput.UpliftProbability), properties.UpliftProbability);
@@ -158,21 +110,13 @@
Assert.AreEqual(sellmeijerCreepCoefficient, properties.SellmeijerCreepCoefficient, properties.SellmeijerCreepCoefficient.GetAccuracy());
Assert.AreEqual(sellmeijerCriticalFall, properties.SellmeijerCriticalFall, properties.SellmeijerCriticalFall.GetAccuracy());
Assert.AreEqual(sellmeijerReducedFall, properties.SellmeijerReducedFall, properties.SellmeijerReducedFall.GetAccuracy());
- mocks.VerifyAll();
}
[Test]
public void Constructor_Always_PropertiesHaveExpectedAttributesValues()
{
- // Setup
- var failureMechanism = new PipingFailureMechanism();
-
- var mocks = new MockRepository();
- IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
- mocks.ReplayAll();
-
// Call
- var properties = new SemiProbabilisticPipingOutputProperties(PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput(), failureMechanism, assessmentSection);
+ var properties = new SemiProbabilisticPipingOutputProperties(PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput(), 0.1);
// Assert
PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
@@ -294,8 +238,6 @@
"Betrouwbaarheidsindex faalkans [-]",
"De betrouwbaarheidsindex van de faalkans voor deze berekening.",
true);
-
- mocks.VerifyAll();
}
}
}
\ No newline at end of file