Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingOutputContext.cs =================================================================== diff -u -r642a4946d235601302d544697856fed3b5c7a2bd -r0f2cc55f2217e523d55eb173d3769f764ebc28a0 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingOutputContext.cs (.../PipingOutputContext.cs) (revision 642a4946d235601302d544697856fed3b5c7a2bd) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingOutputContext.cs (.../PipingOutputContext.cs) (revision 0f2cc55f2217e523d55eb173d3769f764ebc28a0) @@ -21,35 +21,42 @@ using System; using Core.Common.Controls.PresentationObjects; +using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Piping.Data; namespace Ringtoets.Piping.Forms.PresentationObjects { /// - /// A presentation layer object which wraps a and a . + /// A presentation layer object which wraps a . /// public class PipingOutputContext : WrappedObjectContextBase { /// /// Creates a new instance of . /// /// The object to wrap. - /// The - /// created from . - public PipingOutputContext(PipingOutput pipingOutput, DerivedPipingOutput derivedOutput) + /// The failure mechanism that the output belongs to. + /// The assessment section that the output belongs to. + /// Thrown when any parameter is null. + public PipingOutputContext(PipingOutput pipingOutput, PipingFailureMechanism failureMechanism, IAssessmentSection assessmentSection) : base(pipingOutput) { - if (derivedOutput == null) + if (failureMechanism == null) { - throw new ArgumentNullException(nameof(derivedOutput)); + throw new ArgumentNullException(nameof(failureMechanism)); } - DerivedOutput = derivedOutput; + if (assessmentSection == null) + { + throw new ArgumentNullException(nameof(assessmentSection)); + } + + FailureMechanism = failureMechanism; + AssessmentSection = assessmentSection; } - /// - /// Gets the derived output created from the piping output. - /// - public DerivedPipingOutput DerivedOutput { get; } + public PipingFailureMechanism FailureMechanism { get; } + + public IAssessmentSection AssessmentSection { get; } } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingOutputProperties.cs =================================================================== diff -u -r642a4946d235601302d544697856fed3b5c7a2bd -r0f2cc55f2217e523d55eb173d3769f764ebc28a0 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingOutputProperties.cs (.../PipingOutputProperties.cs) (revision 642a4946d235601302d544697856fed3b5c7a2bd) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingOutputProperties.cs (.../PipingOutputProperties.cs) (revision 0f2cc55f2217e523d55eb173d3769f764ebc28a0) @@ -24,6 +24,7 @@ using Core.Common.Gui.Attributes; using Core.Common.Gui.PropertyBag; using Core.Common.Util.Attributes; +using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Forms.Helpers; using Ringtoets.Piping.Data; using Ringtoets.Piping.Forms.Properties; @@ -35,7 +36,7 @@ /// public class PipingOutputProperties : ObjectProperties { - private readonly DerivedPipingOutput derivedOutput; + private DerivedPipingOutput derivedOutput; /// /// Creates a new instance of . @@ -44,20 +45,16 @@ /// The derived output to show properties for. /// Thrown when any parameter /// is null. - public PipingOutputProperties(PipingOutput output, DerivedPipingOutput derivedOutput) + public PipingOutputProperties(PipingOutput output, PipingFailureMechanism failureMechanism, IAssessmentSection assessmentSection) { - if (derivedOutput == null) + if (output == null) { - throw new ArgumentNullException(nameof(derivedOutput)); + throw new ArgumentNullException(nameof(output)); } - if (derivedOutput == null) - { - throw new ArgumentNullException(nameof(derivedOutput)); - } - Data = output; - this.derivedOutput = derivedOutput; + + CreateDerivedOutput(output, failureMechanism, assessmentSection); } [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Uplift), 1, 4)] @@ -287,5 +284,14 @@ return derivedOutput.PipingFactorOfSafety; } } + + private void CreateDerivedOutput(PipingOutput output, PipingFailureMechanism failureMechanism, + IAssessmentSection assessmentSection) + { + derivedOutput = DerivedPipingOutputFactory.Create(output, + failureMechanism.PipingProbabilityAssessmentInput, + assessmentSection.FailureMechanismContribution.Norm, + failureMechanism.Contribution); + } } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -r642a4946d235601302d544697856fed3b5c7a2bd -r0f2cc55f2217e523d55eb173d3769f764ebc28a0 --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 642a4946d235601302d544697856fed3b5c7a2bd) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 0f2cc55f2217e523d55eb173d3769f764ebc28a0) @@ -78,7 +78,7 @@ }; yield return new PropertyInfo { - CreateInstance = context => new PipingOutputProperties(context.WrappedData, context.DerivedOutput) + CreateInstance = context => new PipingOutputProperties(context.WrappedData, context.FailureMechanism, context.AssessmentSection) }; yield return new PropertyInfo { @@ -752,26 +752,27 @@ .Build(); } - private static object[] PipingCalculationContextChildNodeObjects(PipingCalculationScenarioContext pipingCalculationScenarioContext) + private static object[] PipingCalculationContextChildNodeObjects(PipingCalculationScenarioContext context) { - PipingCalculationScenario pipingCalculationScenario = pipingCalculationScenarioContext.WrappedData; + PipingCalculationScenario pipingCalculationScenario = context.WrappedData; var childNodes = new List { pipingCalculationScenario.Comments, new PipingInputContext(pipingCalculationScenario.InputParameters, pipingCalculationScenario, - pipingCalculationScenarioContext.AvailablePipingSurfaceLines, - pipingCalculationScenarioContext.AvailableStochasticSoilModels, - pipingCalculationScenarioContext.FailureMechanism, - pipingCalculationScenarioContext.AssessmentSection) + context.AvailablePipingSurfaceLines, + context.AvailableStochasticSoilModels, + context.FailureMechanism, + context.AssessmentSection) }; if (pipingCalculationScenario.HasOutput) { childNodes.Add(new PipingOutputContext( pipingCalculationScenario.Output, - pipingCalculationScenario.SemiProbabilisticOutput)); + context.FailureMechanism, + context.AssessmentSection)); } else { Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingOutputContextTest.cs =================================================================== diff -u -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 -r0f2cc55f2217e523d55eb173d3769f764ebc28a0 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingOutputContextTest.cs (.../PipingOutputContextTest.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingOutputContextTest.cs (.../PipingOutputContextTest.cs) (revision 0f2cc55f2217e523d55eb173d3769f764ebc28a0) @@ -22,6 +22,8 @@ using System; using Core.Common.Controls.PresentationObjects; using NUnit.Framework; +using Rhino.Mocks; +using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Piping.Data; using Ringtoets.Piping.Data.TestUtil; using Ringtoets.Piping.Forms.PresentationObjects; @@ -32,41 +34,70 @@ public class PipingOutputContextTest { [Test] - public void Constructor_WithoutOutput_ThrowsArgumentNullException() + public void Constructor_OutputNull_ThrowsArgumentNullException() { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + // Call - TestDelegate test = () => new PipingOutputContext(null, new TestPipingSemiProbabilisticOutput()); + TestDelegate test = () => new PipingOutputContext(null, new PipingFailureMechanism(), assessmentSection); // Assert string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("wrappedData", paramName); + mocks.VerifyAll(); } [Test] - public void Constructor_WithoutSemiProbabilisticOutput_ThrowsArgumentNullException() + public void Constructor_FailureMechanismNull_ThrowsArgumentNullException() { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + // Call - TestDelegate test = () => new PipingOutputContext(new TestPipingOutput(), null); + TestDelegate test = () => new PipingOutputContext(new TestPipingOutput(), null, assessmentSection); // Assert string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("semiProbabilisticOutput", paramName); + Assert.AreEqual("failureMechanism", paramName); + mocks.VerifyAll(); } [Test] - public void Constructor_WithOutputParameters_PropertiesSet() + public void Constructore_AssessmentSectionNull_ThrowsArgumentNullException() { + // Call + TestDelegate call = () => new PipingOutputContext(new TestPipingOutput(), new PipingFailureMechanism(), null); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("assessmentSection", exception.ParamName); + } + + [Test] + public void Constructor_ExpectedValues() + { // Setup - var pipingOutput = new TestPipingOutput(); - var semiProbabilisticOutput = new TestPipingSemiProbabilisticOutput(); + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + var output = new TestPipingOutput(); + var failureMechanism = new PipingFailureMechanism(); + // Call - var context = new PipingOutputContext(pipingOutput, semiProbabilisticOutput); + var context = new PipingOutputContext(output, failureMechanism, assessmentSection); // Assert Assert.IsInstanceOf>(context); - Assert.AreSame(pipingOutput, context.WrappedData); - Assert.AreSame(semiProbabilisticOutput, context.SemiProbabilisticOutput); + Assert.AreSame(output, context.WrappedData); + Assert.AreSame(failureMechanism, context.FailureMechanism); + Assert.AreSame(assessmentSection, context.AssessmentSection); + mocks.VerifyAll(); } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingOutputPropertiesTest.cs =================================================================== diff -u -raf990fe02513d7cd12034e597037025ecf5aa948 -r0f2cc55f2217e523d55eb173d3769f764ebc28a0 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingOutputPropertiesTest.cs (.../PipingOutputPropertiesTest.cs) (revision af990fe02513d7cd12034e597037025ecf5aa948) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingOutputPropertiesTest.cs (.../PipingOutputPropertiesTest.cs) (revision 0f2cc55f2217e523d55eb173d3769f764ebc28a0) @@ -24,6 +24,8 @@ using Core.Common.Gui.PropertyBag; using Core.Common.TestUtil; using NUnit.Framework; +using Rhino.Mocks; +using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Piping.Data; using Ringtoets.Piping.Data.TestUtil; @@ -37,81 +39,82 @@ [Test] public void Constructor_OutputNull_ThrowsArgumentNullException() { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + // Call - TestDelegate call = () => new PipingOutputProperties(null, new TestPipingSemiProbabilisticOutput()); + TestDelegate test = () => new PipingOutputProperties(null, new PipingFailureMechanism(), assessmentSection); // Assert - var exception = Assert.Throws(call); - Assert.AreEqual("output", exception.ParamName); + string paramName = Assert.Throws(test).ParamName; + Assert.AreEqual("wrappedData", paramName); + mocks.VerifyAll(); } [Test] - public void Constructor_SemiProbabilisticOutputNull_ThrowsArgumentNullException() + public void Constructor_FailureMechanismNull_ThrowsArgumentNullException() { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + // Call - TestDelegate call = () => new PipingOutputProperties(new TestPipingOutput(), null); + TestDelegate test = () => new PipingOutputProperties(new TestPipingOutput(), null, assessmentSection); // Assert + string paramName = Assert.Throws(test).ParamName; + Assert.AreEqual("failureMechanism", paramName); + mocks.VerifyAll(); + } + + [Test] + public void Constructore_AssessmentSectionNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => new PipingOutputProperties(new TestPipingOutput(), new PipingFailureMechanism(), null); + + // Assert var exception = Assert.Throws(call); - Assert.AreEqual("semiProbabilisticOutput", exception.ParamName); + Assert.AreEqual("assessmentSection", exception.ParamName); } [Test] public void Constructor_ExpectedValues() { // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + var output = new TestPipingOutput(); // Call - var properties = new PipingOutputProperties(output, new TestPipingSemiProbabilisticOutput()); + var properties = new PipingOutputProperties(output, new PipingFailureMechanism(), assessmentSection); // Assert Assert.IsInstanceOf>(properties); Assert.AreSame(output, properties.Data); + mocks.VerifyAll(); } [Test] public void GetProperties_WithData_ReturnExpectedValues() { // Setup - var random = new Random(22); - double upliftFactorOfSafety = random.NextDouble(); - double upliftReliability = random.NextDouble(); - double upliftProbability = random.NextDouble(); - double heaveFactorOfSafety = random.NextDouble(); - double heaveReliability = random.NextDouble(); - double heaveProbability = random.NextDouble(); - double sellmeijerFactorOfSafety = random.NextDouble(); - double sellmeijerReliability = random.NextDouble(); - double sellmeijerProbability = random.NextDouble(); - double requiredProbability = random.NextDouble(); - double requiredReliability = random.NextDouble(); - double pipingProbability = random.NextDouble(); - double pipingReliability = random.NextDouble(); - double pipingFactorOfSafety = random.NextDouble(); + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + var random = new Random(22); double upliftEffectiveStress = random.NextDouble(); double heaveGradient = random.NextDouble(); double sellmeijerCreepCoefficient = random.NextDouble(); double sellmeijerCriticalFall = random.NextDouble(); double sellmeijerReducedFall = random.NextDouble(); - var semiProbabilisticOutput = new PipingSemiProbabilisticOutput( - upliftFactorOfSafety, - upliftReliability, - upliftProbability, - heaveFactorOfSafety, - heaveReliability, - heaveProbability, - sellmeijerFactorOfSafety, - sellmeijerReliability, - sellmeijerProbability, - requiredProbability, - requiredReliability, - pipingProbability, - pipingReliability, - pipingFactorOfSafety); - var output = new PipingOutput(new PipingOutput.ConstructionProperties { UpliftEffectiveStress = upliftEffectiveStress, @@ -122,119 +125,64 @@ }); // Call - var properties = new PipingOutputProperties(output, semiProbabilisticOutput); + var properties = new PipingOutputProperties(output, new PipingFailureMechanism(), assessmentSection); // Assert const string probabilityFormat = "1/{0:n0}"; - Assert.AreEqual(upliftFactorOfSafety, properties.UpliftFactorOfSafety, properties.UpliftFactorOfSafety.GetAccuracy()); - Assert.AreEqual(upliftReliability, properties.UpliftReliability, properties.UpliftReliability.GetAccuracy()); - Assert.AreEqual(string.Format(probabilityFormat, 1.0 / upliftProbability), properties.UpliftProbability); - Assert.AreEqual(heaveFactorOfSafety, properties.HeaveFactorOfSafety, properties.HeaveFactorOfSafety.GetAccuracy()); - Assert.AreEqual(heaveReliability, properties.HeaveReliability, properties.HeaveReliability.GetAccuracy()); - Assert.AreEqual(string.Format(probabilityFormat, 1.0 / heaveProbability), properties.HeaveProbability); - Assert.AreEqual(sellmeijerFactorOfSafety, properties.SellmeijerFactorOfSafety, properties.SellmeijerFactorOfSafety.GetAccuracy()); - Assert.AreEqual(sellmeijerReliability, properties.SellmeijerReliability, properties.SellmeijerReliability.GetAccuracy()); - Assert.AreEqual(string.Format(probabilityFormat, 1.0 / sellmeijerProbability), properties.SellmeijerProbability); - Assert.AreEqual(string.Format(probabilityFormat, 1.0 / requiredProbability), properties.RequiredProbability); - Assert.AreEqual(requiredReliability, properties.RequiredReliability, properties.RequiredReliability.GetAccuracy()); - Assert.AreEqual(string.Format(probabilityFormat, 1.0 / pipingProbability), properties.PipingProbability); - Assert.AreEqual(pipingReliability, properties.PipingReliability, properties.PipingReliability.GetAccuracy()); - Assert.AreEqual(pipingFactorOfSafety, properties.PipingFactorOfSafety, properties.PipingFactorOfSafety.GetAccuracy()); + Assert.AreEqual(0, properties.UpliftFactorOfSafety, properties.UpliftFactorOfSafety.GetAccuracy()); + Assert.AreEqual(0, properties.UpliftReliability, properties.UpliftReliability.GetAccuracy()); + Assert.AreEqual(string.Format(probabilityFormat, 1.0 / 0), properties.UpliftProbability); + Assert.AreEqual(0, properties.HeaveFactorOfSafety, properties.HeaveFactorOfSafety.GetAccuracy()); + Assert.AreEqual(0, properties.HeaveReliability, properties.HeaveReliability.GetAccuracy()); + Assert.AreEqual(string.Format(probabilityFormat, 1.0 / 0), properties.HeaveProbability); + Assert.AreEqual(0, properties.SellmeijerFactorOfSafety, properties.SellmeijerFactorOfSafety.GetAccuracy()); + Assert.AreEqual(0, properties.SellmeijerReliability, properties.SellmeijerReliability.GetAccuracy()); + Assert.AreEqual(string.Format(probabilityFormat, 1.0 / 0), properties.SellmeijerProbability); + Assert.AreEqual(string.Format(probabilityFormat, 1.0 / 0), properties.RequiredProbability); + Assert.AreEqual(0, properties.RequiredReliability, properties.RequiredReliability.GetAccuracy()); + Assert.AreEqual(string.Format(probabilityFormat, 1.0 / 0), properties.PipingProbability); + Assert.AreEqual(0, properties.PipingReliability, properties.PipingReliability.GetAccuracy()); + Assert.AreEqual(0, properties.PipingFactorOfSafety, properties.PipingFactorOfSafety.GetAccuracy()); Assert.AreEqual(upliftEffectiveStress, properties.UpliftEffectiveStress, properties.UpliftEffectiveStress.GetAccuracy()); Assert.AreEqual(heaveGradient, properties.HeaveGradient, properties.HeaveGradient.GetAccuracy()); 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 GetProperties_WithZeroValues_ReturnTranslatedFormat() { // Setup - var random = new Random(22); - double upliftFactorOfSafety = random.NextDouble(); - double upliftReliability = random.NextDouble(); - double heaveFactorOfSafety = random.NextDouble(); - double heaveReliability = random.NextDouble(); - double sellmeijerFactorOfSafety = random.NextDouble(); - double sellmeijerReliability = random.NextDouble(); - double requiredReliability = random.NextDouble(); - double pipingReliability = random.NextDouble(); - double pipingFactorOfSafety = random.NextDouble(); + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); - const double upliftProbability = 0; - const double heaveProbability = 0; - const double sellmeijerProbability = 0; - const double requiredProbability = 0; - const double pipingProbability = 0; - // Call - var semiProbabilisticOutput = new PipingSemiProbabilisticOutput( - upliftFactorOfSafety, - upliftReliability, - upliftProbability, - heaveFactorOfSafety, - heaveReliability, - heaveProbability, - sellmeijerFactorOfSafety, - sellmeijerReliability, - sellmeijerProbability, - requiredProbability, - requiredReliability, - pipingProbability, - pipingReliability, - pipingFactorOfSafety); + var properties = new PipingOutputProperties(new TestPipingOutput(), new PipingFailureMechanism(), assessmentSection); - var properties = new PipingOutputProperties(new TestPipingOutput(), semiProbabilisticOutput); - // Assert const string probability = "1/Oneindig"; Assert.AreEqual(probability, properties.UpliftProbability); Assert.AreEqual(probability, properties.HeaveProbability); Assert.AreEqual(probability, properties.SellmeijerProbability); Assert.AreEqual(probability, properties.RequiredProbability); Assert.AreEqual(probability, properties.PipingProbability); + mocks.VerifyAll(); } [Test] public void Constructor_Always_PropertiesHaveExpectedAttributesValues() { // Setup - var random = new Random(22); - double upliftFactorOfSafety = random.NextDouble(); - double upliftReliability = random.NextDouble(); - double upliftProbability = random.NextDouble(); - double heaveFactorOfSafety = random.NextDouble(); - double heaveReliability = random.NextDouble(); - double heaveProbability = random.NextDouble(); - double sellmeijerFactorOfSafety = random.NextDouble(); - double sellmeijerReliability = random.NextDouble(); - double sellmeijerProbability = random.NextDouble(); - double requiredProbability = random.NextDouble(); - double requiredReliability = random.NextDouble(); - double pipingProbability = random.NextDouble(); - double pipingReliability = random.NextDouble(); - double pipingFactorOfSafety = random.NextDouble(); + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); - var semiProbabilisticOutput = new PipingSemiProbabilisticOutput( - upliftFactorOfSafety, - upliftReliability, - upliftProbability, - heaveFactorOfSafety, - heaveReliability, - heaveProbability, - sellmeijerFactorOfSafety, - sellmeijerReliability, - sellmeijerProbability, - requiredProbability, - requiredReliability, - pipingProbability, - pipingReliability, - pipingFactorOfSafety); - // Call - var properties = new PipingOutputProperties(new TestPipingOutput(), semiProbabilisticOutput); + var properties = new PipingOutputProperties(new TestPipingOutput(), new PipingFailureMechanism(), assessmentSection); // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); @@ -377,6 +325,8 @@ "Veiligheidsfactor [-]", "De veiligheidsfactor voor deze berekening.", true); + + mocks.VerifyAll(); } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingOutputPropertyInfoTest.cs =================================================================== diff -u -raf990fe02513d7cd12034e597037025ecf5aa948 -r0f2cc55f2217e523d55eb173d3769f764ebc28a0 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingOutputPropertyInfoTest.cs (.../PipingOutputPropertyInfoTest.cs) (revision af990fe02513d7cd12034e597037025ecf5aa948) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingOutputPropertyInfoTest.cs (.../PipingOutputPropertyInfoTest.cs) (revision 0f2cc55f2217e523d55eb173d3769f764ebc28a0) @@ -23,6 +23,9 @@ using Core.Common.Gui.Plugin; using Core.Common.Gui.PropertyBag; using NUnit.Framework; +using Rhino.Mocks; +using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Piping.Data; using Ringtoets.Piping.Data.TestUtil; using Ringtoets.Piping.Forms.PresentationObjects; using Ringtoets.Piping.Forms.PropertyClasses; @@ -59,15 +62,20 @@ public void CreateInstance_Always_NewPropertiesWithPipingOutputAsData() { // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + var output = new TestPipingOutput(); - var context = new PipingOutputContext(output, new TestPipingSemiProbabilisticOutput()); + var context = new PipingOutputContext(output, new PipingFailureMechanism(), assessmentSection); // Call IObjectProperties objectProperties = info.CreateInstance(context); // Assert Assert.IsInstanceOf(objectProperties); Assert.AreSame(output, objectProperties.Data); + mocks.VerifyAll(); } } } \ No newline at end of file