Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/Probabilistic/ProbabilisticPipingInputContextProperties.cs =================================================================== diff -u -r3c5251ed6df34120400ec143c00c8448539b0fa5 -rc4b429e9de1d444d9f19235b4b513c32302d62b8 --- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/Probabilistic/ProbabilisticPipingInputContextProperties.cs (.../ProbabilisticPipingInputContextProperties.cs) (revision 3c5251ed6df34120400ec143c00c8448539b0fa5) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/Probabilistic/ProbabilisticPipingInputContextProperties.cs (.../ProbabilisticPipingInputContextProperties.cs) (revision c4b429e9de1d444d9f19235b4b513c32302d62b8) @@ -446,8 +446,8 @@ { get { - - return GetSection().Name ?? "-"; + FailureMechanismSection failureMechanismSection = GetSection(); + return failureMechanismSection == null ? "-" : failureMechanismSection.Name; } } Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -r872302182641ae7c8acfbbdb87554dfe5d8c2a32 -rc4b429e9de1d444d9f19235b4b513c32302d62b8 --- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 872302182641ae7c8acfbbdb87554dfe5d8c2a32) +++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision c4b429e9de1d444d9f19235b4b513c32302d62b8) @@ -58,6 +58,7 @@ using Riskeer.Piping.Forms.PresentationObjects.Probabilistic; using Riskeer.Piping.Forms.PresentationObjects.SemiProbabilistic; using Riskeer.Piping.Forms.PropertyClasses; +using Riskeer.Piping.Forms.PropertyClasses.Probabilistic; using Riskeer.Piping.Forms.PropertyClasses.SemiProbabilistic; using Riskeer.Piping.Forms.Views; using Riskeer.Piping.IO.Configurations; @@ -90,6 +91,12 @@ () => GetNormativeAssessmentLevel(context.AssessmentSection, context.PipingCalculation), new ObservablePropertyChangeHandler(context.PipingCalculation, context.WrappedData)) }; + yield return new PropertyInfo + { + CreateInstance = context => new ProbabilisticPipingInputContextProperties(context, + () => GetNormativeAssessmentLevel(context.AssessmentSection, context.PipingCalculation), + new ObservablePropertyChangeHandler(context.PipingCalculation, context.WrappedData)) + }; yield return new PropertyInfo { CreateInstance = context => new SemiProbabilisticPipingOutputProperties(context.WrappedData, context.FailureMechanism, context.AssessmentSection) @@ -568,7 +575,7 @@ #endregion - private static RoundedDouble GetNormativeAssessmentLevel(IAssessmentSection assessmentSection, SemiProbabilisticPipingCalculation calculation) + private static RoundedDouble GetNormativeAssessmentLevel(IAssessmentSection assessmentSection, IPipingCalculation calculation) { return assessmentSection.GetNormativeAssessmentLevel(calculation.InputParameters.HydraulicBoundaryLocation); } Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/ProbabilisticPipingInputContextPropertyInfoTest.cs =================================================================== diff -u --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/ProbabilisticPipingInputContextPropertyInfoTest.cs (revision 0) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/ProbabilisticPipingInputContextPropertyInfoTest.cs (revision c4b429e9de1d444d9f19235b4b513c32302d62b8) @@ -0,0 +1,150 @@ +// Copyright (C) Stichting Deltares 2019. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System.Linq; +using Core.Common.Gui.Plugin; +using Core.Common.Gui.PropertyBag; +using NUnit.Framework; +using Riskeer.Common.Data.Contribution; +using Riskeer.Common.Data.TestUtil; +using Riskeer.Piping.Data; +using Riskeer.Piping.Data.Probabilistic; +using Riskeer.Piping.Data.SoilProfile; +using Riskeer.Piping.Forms.PresentationObjects.Probabilistic; +using Riskeer.Piping.Forms.PropertyClasses.Probabilistic; +using Riskeer.Piping.Primitives; + +namespace Riskeer.Piping.Plugin.Test.PropertyInfos +{ + [TestFixture] + public class ProbabilisticPipingInputContextPropertyInfoTest + { + private PipingPlugin plugin; + private PropertyInfo info; + + [SetUp] + public void SetUp() + { + plugin = new PipingPlugin(); + info = plugin.GetPropertyInfos().First(tni => tni.PropertyObjectType == typeof(ProbabilisticPipingInputContextProperties)); + } + + [TearDown] + public void TearDown() + { + plugin.Dispose(); + } + + [Test] + public void Initialized_Always_ExpectedPropertiesSet() + { + // Assert + Assert.AreEqual(typeof(ProbabilisticPipingInputContext), info.DataType); + Assert.AreEqual(typeof(ProbabilisticPipingInputContextProperties), info.PropertyObjectType); + } + + [Test] + public void CreateInstance_WithContextAndNormTypeSignaling_ExpectedProperties() + { + // Setup + var assessmentSection = new AssessmentSectionStub + { + FailureMechanismContribution = + { + NormativeNorm = NormType.Signaling + } + }; + + var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); + var scenario = new ProbabilisticPipingCalculation(new GeneralPipingInput()) + { + InputParameters = + { + HydraulicBoundaryLocation = hydraulicBoundaryLocation + } + }; + + var failureMechanism = new PipingFailureMechanism(); + var context = new ProbabilisticPipingInputContext( + scenario.InputParameters, + scenario, + Enumerable.Empty(), + Enumerable.Empty(), + failureMechanism, + assessmentSection); + + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + { + hydraulicBoundaryLocation + }, true); + + // Call + IObjectProperties objectProperties = info.CreateInstance(context); + + // Assert + Assert.IsInstanceOf(objectProperties); + Assert.AreSame(context, objectProperties.Data); + } + + [Test] + public void CreateInstance_WithContextAndNormTypeLowerLimit_ExpectedProperties() + { + // Setup + var assessmentSection = new AssessmentSectionStub + { + FailureMechanismContribution = + { + NormativeNorm = NormType.LowerLimit + } + }; + + var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); + var scenario = new ProbabilisticPipingCalculation(new GeneralPipingInput()) + { + InputParameters = + { + HydraulicBoundaryLocation = hydraulicBoundaryLocation + } + }; + + var failureMechanism = new PipingFailureMechanism(); + var context = new ProbabilisticPipingInputContext( + scenario.InputParameters, + scenario, + Enumerable.Empty(), + Enumerable.Empty(), + failureMechanism, + assessmentSection); + + assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + { + hydraulicBoundaryLocation + }, true); + + // Call + IObjectProperties objectProperties = info.CreateInstance(context); + + // Assert + Assert.IsInstanceOf(objectProperties); + Assert.AreSame(context, objectProperties.Data); + } + } +}