Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -rcb903e8cdb76e9733979fe508ee097107c022a28 -rea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationContextTreeNodeInfoTest.cs) (revision cb903e8cdb76e9733979fe508ee097107c022a28) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationContextTreeNodeInfoTest.cs) (revision ea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a) @@ -109,7 +109,7 @@ mocks.ReplayAll(); var failureMechanism = new HeightStructuresFailureMechanism(); - var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput); + var calculation = new HeightStructuresCalculation(); var calculationContext = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock); // Call @@ -139,7 +139,7 @@ mocks.ReplayAll(); var failureMechanism = new HeightStructuresFailureMechanism(); - var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput) + var calculation = new HeightStructuresCalculation { Output = new TestHeightStructuresOutput() }; @@ -174,7 +174,7 @@ var treeViewControlMock = mocks.StrictMock(); var failureMechanism = new HeightStructuresFailureMechanism(); var assessmentSectionMock = mocks.StrictMock(); - var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput); + var calculation = new HeightStructuresCalculation(); var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock); var menuBuilderMock = mocks.StrictMock(); @@ -213,7 +213,7 @@ var treeViewControlMock = mocks.StrictMock(); var failureMechanism = new HeightStructuresFailureMechanism(); var assessmentSectionMock = mocks.StrictMock(); - var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput); + var calculation = new HeightStructuresCalculation(); var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -251,7 +251,7 @@ var treeViewControlMock = mocks.StrictMock(); var failureMechanism = new HeightStructuresFailureMechanism(); var assessmentSectionMock = mocks.StrictMock(); - var calculation = new HeightStructuresCalculation(new GeneralHeightStructuresInput()); + var calculation = new HeightStructuresCalculation(); var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock); var guiMock = mocks.StrictMock(); @@ -290,7 +290,7 @@ var assessmentSectionMock = mocks.StrictMock(); assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase).Return(null); - var calculation = new HeightStructuresCalculation(new GeneralHeightStructuresInput()); + var calculation = new HeightStructuresCalculation(); var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock); guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); @@ -328,7 +328,7 @@ var assessmentSectionMock = mocks.StrictMock(); assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase()); - var calculation = new HeightStructuresCalculation(new GeneralHeightStructuresInput()); + var calculation = new HeightStructuresCalculation(); var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock); guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); @@ -375,7 +375,7 @@ var assessmentSectionMock = mocks.StrictMock(); assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); - var calculation = new HeightStructuresCalculation(new GeneralHeightStructuresInput()); + var calculation = new HeightStructuresCalculation(); var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock); guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); @@ -429,7 +429,7 @@ { HydraulicBoundaryDatabase = hydraulicBoundaryDatabase }; - var calculation = new HeightStructuresCalculation(new GeneralHeightStructuresInput()) + var calculation = new HeightStructuresCalculation { Output = new ProbabilityAssessmentOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN), InputParameters = @@ -478,7 +478,7 @@ // Setup var group = new CalculationGroup(); var failureMechanism = new HeightStructuresFailureMechanism(); - var elementToBeRemoved = new HeightStructuresCalculation(failureMechanism.GeneralInput); + var elementToBeRemoved = new HeightStructuresCalculation(); var observerMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); var calculationContext = new HeightStructuresCalculationContext(elementToBeRemoved, @@ -493,7 +493,7 @@ mocks.ReplayAll(); group.Children.Add(elementToBeRemoved); - group.Children.Add(new HeightStructuresCalculation(failureMechanism.GeneralInput)); + group.Children.Add(new HeightStructuresCalculation()); group.Attach(observerMock); // Precondition