Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationContextNodePresenter.cs =================================================================== diff -u -r8cae5d69ac2d4cf678486ac2b457c0dfe97089d5 -r698721e646747d5a5b3a1850e7b4ec46a2857bfa --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationContextNodePresenter.cs (.../PipingCalculationContextNodePresenter.cs) (revision 8cae5d69ac2d4cf678486ac2b457c0dfe97089d5) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationContextNodePresenter.cs (.../PipingCalculationContextNodePresenter.cs) (revision 698721e646747d5a5b3a1850e7b4ec46a2857bfa) @@ -60,12 +60,10 @@ protected override IEnumerable GetChildNodeObjects(PipingCalculationContext pipingCalculationContext) { yield return pipingCalculationContext.WrappedData.Comments; - yield return new PipingInputContext - { - WrappedPipingInput = pipingCalculationContext.WrappedData.InputParameters, - AvailablePipingSurfaceLines = pipingCalculationContext.AvailablePipingSurfaceLines, - AvailablePipingSoilProfiles = pipingCalculationContext.AvailablePipingSoilProfiles - }; + yield return new PipingInputContext(pipingCalculationContext.WrappedData.InputParameters, + pipingCalculationContext.AvailablePipingSurfaceLines, + pipingCalculationContext.AvailablePipingSoilProfiles + ); if (pipingCalculationContext.WrappedData.HasOutput) { yield return pipingCalculationContext.WrappedData.Output; Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingInputContext.cs =================================================================== diff -u -r79e69f1b4b303862f3572d0f6cb60acf63a957e9 -r698721e646747d5a5b3a1850e7b4ec46a2857bfa --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingInputContext.cs (.../PipingInputContext.cs) (revision 79e69f1b4b303862f3572d0f6cb60acf63a957e9) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingInputContext.cs (.../PipingInputContext.cs) (revision 698721e646747d5a5b3a1850e7b4ec46a2857bfa) @@ -1,8 +1,5 @@ using System.Collections.Generic; -using System.Linq; -using Core.Common.Base; - using Ringtoets.Piping.Data; namespace Ringtoets.Piping.Forms.PresentationObjects @@ -12,44 +9,9 @@ /// and allowing for selecting a surfaceline or soil profile based on data available /// in a piping failure mechanism. /// - public class PipingInputContext : IObservable + public class PipingInputContext : PipingContext { - public PipingInputContext() - { - AvailablePipingSurfaceLines = Enumerable.Empty(); - AvailablePipingSoilProfiles = Enumerable.Empty(); - } - - /// - /// Gets or sets the wrapped piping input parameters instance. - /// - public PipingInput WrappedPipingInput { get; set; } - - /// - /// Gets or sets the available piping surface lines in order for the user to select - /// one to set . - /// - public IEnumerable AvailablePipingSurfaceLines { get; set; } - - /// - /// Gets or sets the available piping soil profiles in order for the user to select - /// one to set . - /// - public IEnumerable AvailablePipingSoilProfiles { get; set; } - - public void Attach(IObserver observer) - { - WrappedPipingInput.Attach(observer); - } - - public void Detach(IObserver observer) - { - WrappedPipingInput.Detach(observer); - } - - public void NotifyObservers() - { - WrappedPipingInput.NotifyObservers(); - } + public PipingInputContext(PipingInput input, IEnumerable surfaceLines, IEnumerable profiles): + base(input, surfaceLines, profiles){ } } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs =================================================================== diff -u -r10b304d4b5cb2283801cdb16204baf2a42ab5967 -r698721e646747d5a5b3a1850e7b4ec46a2857bfa --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs (.../PipingInputContextProperties.cs) (revision 10b304d4b5cb2283801cdb16204baf2a42ab5967) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs (.../PipingInputContextProperties.cs) (revision 698721e646747d5a5b3a1850e7b4ec46a2857bfa) @@ -27,12 +27,12 @@ { get { - return data.WrappedPipingInput.SurfaceLine; + return data.WrappedData.SurfaceLine; } set { - data.WrappedPipingInput.SurfaceLine = value; - data.WrappedPipingInput.NotifyObservers(); + data.WrappedData.SurfaceLine = value; + data.WrappedData.NotifyObservers(); } } @@ -44,12 +44,12 @@ { get { - return data.WrappedPipingInput.SoilProfile; + return data.WrappedData.SoilProfile; } set { - data.WrappedPipingInput.SoilProfile = value; - data.WrappedPipingInput.NotifyObservers(); + data.WrappedData.SoilProfile = value; + data.WrappedData.NotifyObservers(); } } @@ -64,12 +64,12 @@ { get { - return data.WrappedPipingInput.UpliftModelFactor; + return data.WrappedData.UpliftModelFactor; } set { - data.WrappedPipingInput.UpliftModelFactor = value; - data.WrappedPipingInput.NotifyObservers(); + data.WrappedData.UpliftModelFactor = value; + data.WrappedData.NotifyObservers(); } } @@ -80,12 +80,12 @@ { get { - return data.WrappedPipingInput.SellmeijerModelFactor; + return data.WrappedData.SellmeijerModelFactor; } set { - data.WrappedPipingInput.SellmeijerModelFactor = value; - data.WrappedPipingInput.NotifyObservers(); + data.WrappedData.SellmeijerModelFactor = value; + data.WrappedData.NotifyObservers(); } } @@ -100,7 +100,7 @@ { get { - return data.WrappedPipingInput.CriticalHeaveGradient; + return data.WrappedData.CriticalHeaveGradient; } } @@ -320,12 +320,12 @@ { get { - return data.WrappedPipingInput.SellmeijerReductionFactor; + return data.WrappedData.SellmeijerReductionFactor; } set { - data.WrappedPipingInput.SellmeijerReductionFactor = value; - data.WrappedPipingInput.NotifyObservers(); + data.WrappedData.SellmeijerReductionFactor = value; + data.WrappedData.NotifyObservers(); } } @@ -353,12 +353,12 @@ { get { - return PipingSemiProbabilisticDesignValueFactory.GetSeepageLength(data.WrappedPipingInput); + return PipingSemiProbabilisticDesignValueFactory.GetSeepageLength(data.WrappedData); } set { - data.WrappedPipingInput.SeepageLength = value.Distribution; - data.WrappedPipingInput.NotifyObservers(); + data.WrappedData.SeepageLength = value.Distribution; + data.WrappedData.NotifyObservers(); } } @@ -369,12 +369,12 @@ { get { - return data.WrappedPipingInput.SandParticlesVolumicWeight; + return data.WrappedData.SandParticlesVolumicWeight; } set { - data.WrappedPipingInput.SandParticlesVolumicWeight = value; - data.WrappedPipingInput.NotifyObservers(); + data.WrappedData.SandParticlesVolumicWeight = value; + data.WrappedData.NotifyObservers(); } } @@ -385,12 +385,12 @@ { get { - return data.WrappedPipingInput.WhitesDragCoefficient; + return data.WrappedData.WhitesDragCoefficient; } set { - data.WrappedPipingInput.WhitesDragCoefficient = value; - data.WrappedPipingInput.NotifyObservers(); + data.WrappedData.WhitesDragCoefficient = value; + data.WrappedData.NotifyObservers(); } } @@ -402,12 +402,12 @@ { get { - return PipingSemiProbabilisticDesignValueFactory.GetDiameter70(data.WrappedPipingInput); + return PipingSemiProbabilisticDesignValueFactory.GetDiameter70(data.WrappedData); } set { - data.WrappedPipingInput.Diameter70 = value.Distribution; - data.WrappedPipingInput.NotifyObservers(); + data.WrappedData.Diameter70 = value.Distribution; + data.WrappedData.NotifyObservers(); } } @@ -434,12 +434,12 @@ { get { - return PipingSemiProbabilisticDesignValueFactory.GetDarcyPermeability(data.WrappedPipingInput); + return PipingSemiProbabilisticDesignValueFactory.GetDarcyPermeability(data.WrappedData); } set { - data.WrappedPipingInput.DarcyPermeability = value.Distribution; - data.WrappedPipingInput.NotifyObservers(); + data.WrappedData.DarcyPermeability = value.Distribution; + data.WrappedData.NotifyObservers(); } } @@ -450,12 +450,12 @@ { get { - return data.WrappedPipingInput.WaterKinematicViscosity; + return data.WrappedData.WaterKinematicViscosity; } set { - data.WrappedPipingInput.WaterKinematicViscosity = value; - data.WrappedPipingInput.NotifyObservers(); + data.WrappedData.WaterKinematicViscosity = value; + data.WrappedData.NotifyObservers(); } } @@ -466,12 +466,12 @@ { get { - return data.WrappedPipingInput.Gravity; + return data.WrappedData.Gravity; } set { - data.WrappedPipingInput.Gravity = value; - data.WrappedPipingInput.NotifyObservers(); + data.WrappedData.Gravity = value; + data.WrappedData.NotifyObservers(); } } @@ -483,12 +483,12 @@ { get { - return PipingSemiProbabilisticDesignValueFactory.GetThicknessAquiferLayer(data.WrappedPipingInput); + return PipingSemiProbabilisticDesignValueFactory.GetThicknessAquiferLayer(data.WrappedData); } set { - data.WrappedPipingInput.ThicknessAquiferLayer = value.Distribution; - data.WrappedPipingInput.NotifyObservers(); + data.WrappedData.ThicknessAquiferLayer = value.Distribution; + data.WrappedData.NotifyObservers(); } } @@ -499,12 +499,12 @@ { get { - return data.WrappedPipingInput.MeanDiameter70; + return data.WrappedData.MeanDiameter70; } set { - data.WrappedPipingInput.MeanDiameter70 = value; - data.WrappedPipingInput.NotifyObservers(); + data.WrappedData.MeanDiameter70 = value; + data.WrappedData.NotifyObservers(); } } @@ -515,12 +515,12 @@ { get { - return data.WrappedPipingInput.BeddingAngle; + return data.WrappedData.BeddingAngle; } set { - data.WrappedPipingInput.BeddingAngle = value; - data.WrappedPipingInput.NotifyObservers(); + data.WrappedData.BeddingAngle = value; + data.WrappedData.NotifyObservers(); } } @@ -546,90 +546,90 @@ { get { - return data.WrappedPipingInput.WaterVolumetricWeight; + return data.WrappedData.WaterVolumetricWeight; } set { - data.WrappedPipingInput.WaterVolumetricWeight = value; - data.WrappedPipingInput.NotifyObservers(); + data.WrappedData.WaterVolumetricWeight = value; + data.WrappedData.NotifyObservers(); } } private double PiezometricHeadPolder { get { - return data.WrappedPipingInput.PiezometricHeadPolder; + return data.WrappedData.PiezometricHeadPolder; } set { - data.WrappedPipingInput.PiezometricHeadPolder = value; - data.WrappedPipingInput.NotifyObservers(); + data.WrappedData.PiezometricHeadPolder = value; + data.WrappedData.NotifyObservers(); } } private double AssessmentLevel { get { - return data.WrappedPipingInput.AssessmentLevel; + return data.WrappedData.AssessmentLevel; } set { - data.WrappedPipingInput.AssessmentLevel = value; - data.WrappedPipingInput.NotifyObservers(); + data.WrappedData.AssessmentLevel = value; + data.WrappedData.NotifyObservers(); } } private double PiezometricHeadExit { get { - return data.WrappedPipingInput.PiezometricHeadExit; + return data.WrappedData.PiezometricHeadExit; } set { - data.WrappedPipingInput.PiezometricHeadExit = value; - data.WrappedPipingInput.NotifyObservers(); + data.WrappedData.PiezometricHeadExit = value; + data.WrappedData.NotifyObservers(); } } private DesignVariable DampingFactorExit { get { - return PipingSemiProbabilisticDesignValueFactory.GetDampingFactorExit(data.WrappedPipingInput); + return PipingSemiProbabilisticDesignValueFactory.GetDampingFactorExit(data.WrappedData); } set { - data.WrappedPipingInput.DampingFactorExit = value.Distribution; - data.WrappedPipingInput.NotifyObservers(); + data.WrappedData.DampingFactorExit = value.Distribution; + data.WrappedData.NotifyObservers(); } } private DesignVariable PhreaticLevelExit { get { - return PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(data.WrappedPipingInput); + return PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(data.WrappedData); } set { - data.WrappedPipingInput.PhreaticLevelExit = value.Distribution; - data.WrappedPipingInput.NotifyObservers(); + data.WrappedData.PhreaticLevelExit = value.Distribution; + data.WrappedData.NotifyObservers(); } } private DesignVariable ThicknessCoverageLayer { get { - return PipingSemiProbabilisticDesignValueFactory.GetThicknessCoverageLayer(data.WrappedPipingInput); + return PipingSemiProbabilisticDesignValueFactory.GetThicknessCoverageLayer(data.WrappedData); } set { - data.WrappedPipingInput.ThicknessCoverageLayer = value.Distribution; - data.WrappedPipingInput.NotifyObservers(); + data.WrappedData.ThicknessCoverageLayer = value.Distribution; + data.WrappedData.NotifyObservers(); } } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/DesignVariableTypeConverter.cs =================================================================== diff -u -re95dbee6ea6b002476a7827a03f6584b779ad594 -r698721e646747d5a5b3a1850e7b4ec46a2857bfa --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/DesignVariableTypeConverter.cs (.../DesignVariableTypeConverter.cs) (revision e95dbee6ea6b002476a7827a03f6584b779ad594) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/DesignVariableTypeConverter.cs (.../DesignVariableTypeConverter.cs) (revision 698721e646747d5a5b3a1850e7b4ec46a2857bfa) @@ -105,7 +105,7 @@ // might want to reconsider how we want to propagate IObservable updates! var inputParameterContextProperties = dynamicPropertyBag.WrappedObject as PipingInputContextProperties; return inputParameterContextProperties != null ? - ((PipingInputContext)inputParameterContextProperties.Data).WrappedPipingInput: + ((PipingInputContext)inputParameterContextProperties.Data).WrappedData: null; } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs =================================================================== diff -u -r8cae5d69ac2d4cf678486ac2b457c0dfe97089d5 -r698721e646747d5a5b3a1850e7b4ec46a2857bfa --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs (.../PipingCalculationContextNodePresenterTest.cs) (revision 8cae5d69ac2d4cf678486ac2b457c0dfe97089d5) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs (.../PipingCalculationContextNodePresenterTest.cs) (revision 698721e646747d5a5b3a1850e7b4ec46a2857bfa) @@ -128,7 +128,7 @@ Assert.AreEqual(4, children.Length); Assert.AreSame(pipingCalculationContext.WrappedData.Comments, children[0]); var pipingInputContext = (PipingInputContext)children[1]; - Assert.AreSame(pipingCalculationContext.WrappedData.InputParameters, pipingInputContext.WrappedPipingInput); + Assert.AreSame(pipingCalculationContext.WrappedData.InputParameters, pipingInputContext.WrappedData); CollectionAssert.AreEqual(pipingCalculationContext.AvailablePipingSurfaceLines, pipingInputContext.AvailablePipingSurfaceLines); CollectionAssert.AreEqual(pipingCalculationContext.AvailablePipingSoilProfiles, pipingInputContext.AvailablePipingSoilProfiles); Assert.AreSame(pipingCalculationContext.WrappedData.Output, children[2]); @@ -159,7 +159,7 @@ Assert.AreEqual(4, children.Length); Assert.AreSame(pipingCalculationContext.WrappedData.Comments, children[0]); var pipingInputContext = (PipingInputContext)children[1]; - Assert.AreSame(pipingCalculationContext.WrappedData.InputParameters, pipingInputContext.WrappedPipingInput); + Assert.AreSame(pipingCalculationContext.WrappedData.InputParameters, pipingInputContext.WrappedData); CollectionAssert.AreEqual(pipingCalculationContext.AvailablePipingSurfaceLines, pipingInputContext.AvailablePipingSurfaceLines); CollectionAssert.AreEqual(pipingCalculationContext.AvailablePipingSoilProfiles, pipingInputContext.AvailablePipingSoilProfiles); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingInputContextNodePresenterTest.cs =================================================================== diff -u -r8cae5d69ac2d4cf678486ac2b457c0dfe97089d5 -r698721e646747d5a5b3a1850e7b4ec46a2857bfa --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingInputContextNodePresenterTest.cs (.../PipingInputContextNodePresenterTest.cs) (revision 8cae5d69ac2d4cf678486ac2b457c0dfe97089d5) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingInputContextNodePresenterTest.cs (.../PipingInputContextNodePresenterTest.cs) (revision 698721e646747d5a5b3a1850e7b4ec46a2857bfa) @@ -1,5 +1,7 @@ using System; using System.Drawing; +using System.Linq; + using Core.Common.Controls.TreeView; using Core.Common.Gui; using Core.Common.Gui.ContextMenu; @@ -9,6 +11,7 @@ using Rhino.Mocks; using Ringtoets.Common.Forms.NodePresenters; +using Ringtoets.Piping.Data; using Ringtoets.Piping.Forms.NodePresenters; using Ringtoets.Piping.Forms.PresentationObjects; @@ -69,7 +72,7 @@ currentNode.ForegroundColor = Color.AliceBlue; - var nodeData = new PipingInputContext(); + var nodeData = new PipingInputContext(new PipingInput(), Enumerable.Empty(), Enumerable.Empty()); var nodePresenter = new PipingInputContextNodePresenter(contextMenuBuilderProviderMock); @@ -127,7 +130,7 @@ var contextMenuBuilderProviderMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); - var nodeData = new PipingInputContext(); + var nodeData = new PipingInputContext(new PipingInput(), Enumerable.Empty(), Enumerable.Empty()); var nodePresenter = new PipingInputContextNodePresenter(contextMenuBuilderProviderMock); @@ -160,7 +163,7 @@ var nodePresenter = new PipingInputContextNodePresenter(contextMenuBuilderProviderMock); // Call - nodePresenter.GetContextMenu(nodeMock, new PipingInputContext()); + nodePresenter.GetContextMenu(nodeMock, new PipingInputContext(new PipingInput(), Enumerable.Empty(), Enumerable.Empty())); // Assert mockRepository.VerifyAll(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingInputContextTest.cs =================================================================== diff -u -rfb32e3411873a7b4c567792b9f335eba462e2702 -r698721e646747d5a5b3a1850e7b4ec46a2857bfa --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingInputContextTest.cs (.../PipingInputContextTest.cs) (revision fb32e3411873a7b4c567792b9f335eba462e2702) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingInputContextTest.cs (.../PipingInputContextTest.cs) (revision 698721e646747d5a5b3a1850e7b4ec46a2857bfa) @@ -1,9 +1,12 @@ -using Core.Common.Base; +using System.Linq; +using Core.Common.Base; + using NUnit.Framework; using Rhino.Mocks; +using Ringtoets.Piping.Calculation.TestUtil; using Ringtoets.Piping.Data; using Ringtoets.Piping.Forms.PresentationObjects; @@ -13,16 +16,21 @@ public class PipingInputContextTest { [Test] - public void DefaultConstructpr_ExpectedValues() + public void ParameteredConstructor_ExpectedValues() { + // Setup + var pipingInput = new PipingInput(); + var surfaceLines = new[] { new RingtoetsPipingSurfaceLine() }; + var profiles = new[] { new TestPipingSoilProfile() }; + // Call - var context = new PipingInputContext(); + var context = new PipingInputContext(pipingInput, surfaceLines, profiles); // Assert - Assert.IsInstanceOf(context); - Assert.IsNull(context.WrappedPipingInput); - CollectionAssert.IsEmpty(context.AvailablePipingSurfaceLines); - CollectionAssert.IsEmpty(context.AvailablePipingSoilProfiles); + Assert.IsInstanceOf>(context); + Assert.AreSame(pipingInput, context.WrappedData); + CollectionAssert.AreEqual(surfaceLines, context.AvailablePipingSurfaceLines); + CollectionAssert.AreEqual(profiles, context.AvailablePipingSoilProfiles); } [Test] @@ -34,10 +42,9 @@ observer.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); - var presentationObject = new PipingInputContext - { - WrappedPipingInput = new PipingInput() - }; + var presentationObject = new PipingInputContext(new PipingInput(), + Enumerable.Empty(), + Enumerable.Empty()); presentationObject.Attach(observer); // Call @@ -55,10 +62,9 @@ var observer = mocks.StrictMock(); mocks.ReplayAll(); - var presentationObject = new PipingInputContext - { - WrappedPipingInput = new PipingInput() - }; + var presentationObject = new PipingInputContext(new PipingInput(), + Enumerable.Empty(), + Enumerable.Empty()); presentationObject.Attach(observer); presentationObject.Detach(observer); @@ -79,10 +85,9 @@ mocks.ReplayAll(); var pipingInput = new PipingInput(); - var presentationObject = new PipingInputContext - { - WrappedPipingInput = pipingInput - }; + var presentationObject = new PipingInputContext(pipingInput, + Enumerable.Empty(), + Enumerable.Empty()); presentationObject.Attach(observer); // Call Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs =================================================================== diff -u -r79e69f1b4b303862f3572d0f6cb60acf63a957e9 -r698721e646747d5a5b3a1850e7b4ec46a2857bfa --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision 79e69f1b4b303862f3572d0f6cb60acf63a957e9) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision 698721e646747d5a5b3a1850e7b4ec46a2857bfa) @@ -1,4 +1,5 @@ using System; +using System.Linq; using Core.Common.Base; using Core.Common.Gui; @@ -51,7 +52,9 @@ var properties = new PipingInputContextProperties { - Data = new PipingInputContext{WrappedPipingInput = inputParameters} + Data = new PipingInputContext(inputParameters, + Enumerable.Empty(), + Enumerable.Empty()) }; // Call & Assert @@ -104,7 +107,9 @@ var properties = new PipingInputContextProperties { - Data = new PipingInputContext{WrappedPipingInput = inputParameters} + Data = new PipingInputContext(inputParameters, + Enumerable.Empty(), + Enumerable.Empty()) }; // Call & Assert @@ -157,7 +162,9 @@ // Call new PipingInputContextProperties { - Data = new PipingInputContext{WrappedPipingInput = inputParameters}, + Data = new PipingInputContext(inputParameters, + Enumerable.Empty(), + Enumerable.Empty()), AssessmentLevelSellmeijer = assessmentLevel, WaterVolumetricWeightUplift = waterVolumetricWeight, UpliftModelFactor = upliftModelFactor, Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LognormalDistributionDesignVariableTypeConverterTest.cs =================================================================== diff -u -re95dbee6ea6b002476a7827a03f6584b779ad594 -r698721e646747d5a5b3a1850e7b4ec46a2857bfa --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LognormalDistributionDesignVariableTypeConverterTest.cs (.../LognormalDistributionDesignVariableTypeConverterTest.cs) (revision e95dbee6ea6b002476a7827a03f6584b779ad594) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LognormalDistributionDesignVariableTypeConverterTest.cs (.../LognormalDistributionDesignVariableTypeConverterTest.cs) (revision 698721e646747d5a5b3a1850e7b4ec46a2857bfa) @@ -1,4 +1,6 @@ using System.ComponentModel; +using System.Linq; + using Core.Common.Base; using Core.Common.Utils.PropertyBag; @@ -130,10 +132,9 @@ { // Scenario var inputParameters = new PipingInput(); - var inputParametersContext = new PipingInputContext - { - WrappedPipingInput = inputParameters - }; + var inputParametersContext = new PipingInputContext(inputParameters, + Enumerable.Empty(), + Enumerable.Empty()); var inputParameterContextProperties = new PipingInputContextProperties { Data = inputParametersContext Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs =================================================================== diff -u -re95dbee6ea6b002476a7827a03f6584b779ad594 -r698721e646747d5a5b3a1850e7b4ec46a2857bfa --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs (.../NormalDistributionDesignVariableTypeConverterTest.cs) (revision e95dbee6ea6b002476a7827a03f6584b779ad594) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs (.../NormalDistributionDesignVariableTypeConverterTest.cs) (revision 698721e646747d5a5b3a1850e7b4ec46a2857bfa) @@ -1,4 +1,6 @@ using System.ComponentModel; +using System.Linq; + using Core.Common.Base; using Core.Common.Utils.PropertyBag; @@ -129,10 +131,9 @@ { // Scenario var inputParameters = new PipingInput(); - var inputParametersContext = new PipingInputContext - { - WrappedPipingInput = inputParameters - }; + var inputParametersContext = new PipingInputContext(inputParameters, + Enumerable.Empty(), + Enumerable.Empty()); var inputParameterContextProperties = new PipingInputContextProperties { Data = inputParametersContext Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSoilProfileSelectionEditorTest.cs =================================================================== diff -u -re95dbee6ea6b002476a7827a03f6584b779ad594 -r698721e646747d5a5b3a1850e7b4ec46a2857bfa --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSoilProfileSelectionEditorTest.cs (.../PipingInputContextSoilProfileSelectionEditorTest.cs) (revision e95dbee6ea6b002476a7827a03f6584b779ad594) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSoilProfileSelectionEditorTest.cs (.../PipingInputContextSoilProfileSelectionEditorTest.cs) (revision 698721e646747d5a5b3a1850e7b4ec46a2857bfa) @@ -1,5 +1,6 @@ using System; using System.ComponentModel; +using System.Linq; using System.Windows.Forms.Design; using Core.Common.Utils.PropertyBag; @@ -21,14 +22,16 @@ public void EditValue_NoCurrentItemInAvailableItems_ReturnsOriginalValue() { // Setup - var pipingInputContext = new PipingInputContext + var pipingInput = new PipingInput { - AvailablePipingSoilProfiles = new[] { new TestPipingSoilProfile() }, - WrappedPipingInput = new PipingInput - { - SoilProfile = new TestPipingSoilProfile() - } + SoilProfile = new TestPipingSoilProfile() }; + var pipingInputContext = new PipingInputContext(pipingInput, + Enumerable.Empty(), + new[] + { + new TestPipingSoilProfile() + }); var properties = new PipingInputContextProperties { @@ -63,14 +66,16 @@ { // Setup var soilProfile = new TestPipingSoilProfile(); - var inputParametersContext = new PipingInputContext + var pipingInput = new PipingInput { - AvailablePipingSoilProfiles = new[] { soilProfile }, - WrappedPipingInput = new PipingInput - { - SoilProfile = soilProfile - } + SoilProfile = soilProfile }; + var inputParametersContext = new PipingInputContext(pipingInput, + Enumerable.Empty(), + new[] + { + soilProfile + }); var properties = new PipingInputContextProperties { Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs =================================================================== diff -u -re95dbee6ea6b002476a7827a03f6584b779ad594 -r698721e646747d5a5b3a1850e7b4ec46a2857bfa --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs (.../PipingInputContextSurfaceLineSelectionEditorTest.cs) (revision e95dbee6ea6b002476a7827a03f6584b779ad594) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs (.../PipingInputContextSurfaceLineSelectionEditorTest.cs) (revision 698721e646747d5a5b3a1850e7b4ec46a2857bfa) @@ -1,5 +1,6 @@ using System; using System.ComponentModel; +using System.Linq; using System.Windows.Forms.Design; using Core.Common.Utils.PropertyBag; @@ -20,14 +21,16 @@ public void EditValue_NoCurrentItemInAvailableItems_ReturnsOriginalValue() { // Setup - var inputParametersContext = new PipingInputContext + var pipingInput = new PipingInput { - AvailablePipingSurfaceLines = new[] { new RingtoetsPipingSurfaceLine() }, - WrappedPipingInput = new PipingInput - { - SurfaceLine = new RingtoetsPipingSurfaceLine() - } + SurfaceLine = new RingtoetsPipingSurfaceLine() }; + var inputParametersContext = new PipingInputContext(pipingInput, + new[] + { + new RingtoetsPipingSurfaceLine() + }, + Enumerable.Empty()); var properties = new PipingInputContextProperties { @@ -62,14 +65,16 @@ { // Setup var surfaceLine = new RingtoetsPipingSurfaceLine(); - var inputParametersContext = new PipingInputContext + var pipingInput = new PipingInput { - AvailablePipingSurfaceLines = new[] { surfaceLine }, - WrappedPipingInput = new PipingInput - { - SurfaceLine = surfaceLine - } + SurfaceLine = surfaceLine }; + var inputParametersContext = new PipingInputContext(pipingInput, + new[] + { + surfaceLine + }, + Enumerable.Empty()); var properties = new PipingInputContextProperties {