Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r39ad631dab6b2ae544ccdabf22fad6b4e5493218 -r95487d39e17289b2a656e34d85b808186222c0ee --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationContextTreeNodeInfoTest.cs (.../PipingCalculationContextTreeNodeInfoTest.cs) (revision 39ad631dab6b2ae544ccdabf22fad6b4e5493218) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationContextTreeNodeInfoTest.cs (.../PipingCalculationContextTreeNodeInfoTest.cs) (revision 95487d39e17289b2a656e34d85b808186222c0ee) @@ -57,6 +57,10 @@ { Name = testname }; + + var pipingFailureMechanismMock = mocks.StrictMock(); + mocks.ReplayAll(); + var pipingCalculationContext = new PipingCalculationContext(calculation, new[] { @@ -65,7 +69,8 @@ new[] { new TestPipingSoilProfile() - }); + }, + pipingFailureMechanismMock); // Call var text = info.Text(pipingCalculationContext); @@ -91,6 +96,10 @@ { Output = new PipingOutput(0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }; + + var pipingFailureMechanismMock = mocks.StrictMock(); + mocks.ReplayAll(); + var pipingCalculationContext = new PipingCalculationContext(calculation, new[] { @@ -99,7 +108,8 @@ new[] { new TestPipingSoilProfile() - }); + }, + pipingFailureMechanismMock); mocks.ReplayAll(); @@ -120,6 +130,10 @@ { Output = new PipingOutput(0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }; + + var pipingFailureMechanismMock = mocks.StrictMock(); + mocks.ReplayAll(); + var pipingCalculationContext = new PipingCalculationContext(calculation, new[] { @@ -128,7 +142,8 @@ new[] { new TestPipingSoilProfile() - }); + }, + pipingFailureMechanismMock); // Call var children = info.ChildNodeObjects(pipingCalculationContext).ToArray(); @@ -148,9 +163,13 @@ public void GetChildNodeObjects_WithoutOutput_ReturnNoChildNodes() { // Setup + var pipingFailureMechanismMock = mocks.StrictMock(); + mocks.ReplayAll(); + var pipingCalculationContext = new PipingCalculationContext(new PipingCalculation(), Enumerable.Empty(), - Enumerable.Empty()); + Enumerable.Empty(), + pipingFailureMechanismMock); // Precondition Assert.IsFalse(pipingCalculationContext.WrappedData.HasOutput); @@ -187,15 +206,18 @@ var observerMock = mocks.StrictMock(); observerMock.Expect(o => o.UpdateObserver()); - mocks.ReplayAll(); - var calculation = new PipingCalculation { Name = "" }; + + var pipingFailureMechanismMock = mocks.StrictMock(); + mocks.ReplayAll(); + var pipingCalculationsInputs = new PipingCalculationContext(calculation, Enumerable.Empty(), - Enumerable.Empty()); + Enumerable.Empty(), + pipingFailureMechanismMock); pipingCalculationsInputs.Attach(observerMock); // Call @@ -223,9 +245,11 @@ var gui = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); var calculation = new PipingCalculation(); + var pipingFailureMechanismMock = mocks.StrictMock(); var nodeData = new PipingCalculationContext(calculation, Enumerable.Empty(), - Enumerable.Empty()); + Enumerable.Empty(), + pipingFailureMechanismMock); gui.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); @@ -253,9 +277,11 @@ { Output = new TestPipingOutput() }; + var pipingFailureMechanismMock = mocks.StrictMock(); var nodeData = new PipingCalculationContext(calculation, Enumerable.Empty(), - Enumerable.Empty()); + Enumerable.Empty(), + pipingFailureMechanismMock); gui.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); @@ -281,9 +307,11 @@ var gui = mocks.StrictMock(); var menuBuilderMock = mocks.Stub(); var treeViewControlMock = mocks.StrictMock(); + var pipingFailureMechanismMock = mocks.StrictMock(); var nodeData = new PipingCalculationContext(new PipingCalculation(), Enumerable.Empty(), - Enumerable.Empty()); + Enumerable.Empty(), + pipingFailureMechanismMock); menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock); @@ -324,12 +352,17 @@ var group = new PipingCalculationGroup("", groupNameEditable); group.Children.Add(calculationToBeRemoved); + var pipingFailureMechanismMock = mocks.StrictMock(); + mocks.ReplayAll(); + var calculationContext = new PipingCalculationContext(calculationToBeRemoved, Enumerable.Empty(), - Enumerable.Empty()); + Enumerable.Empty(), + pipingFailureMechanismMock); var groupContext = new PipingCalculationGroupContext(group, Enumerable.Empty(), - Enumerable.Empty()); + Enumerable.Empty(), + pipingFailureMechanismMock); // Call bool removalAllowed = info.CanRemove(calculationContext, groupContext); @@ -347,12 +380,17 @@ var calculationToBeRemoved = new PipingCalculation(); var group = new PipingCalculationGroup("", groupNameEditable); + var pipingFailureMechanismMock = mocks.StrictMock(); + mocks.ReplayAll(); + var calculationContext = new PipingCalculationContext(calculationToBeRemoved, Enumerable.Empty(), - Enumerable.Empty()); + Enumerable.Empty(), + pipingFailureMechanismMock); var groupContext = new PipingCalculationGroupContext(group, Enumerable.Empty(), - Enumerable.Empty()); + Enumerable.Empty(), + pipingFailureMechanismMock); // Call bool removalAllowed = info.CanRemove(calculationContext, groupContext); @@ -366,11 +404,13 @@ { // Setup var dataMock = mocks.StrictMock(); + var pipingFailureMechanismMock = mocks.StrictMock(); mocks.ReplayAll(); var nodeMock = new PipingCalculationContext(new PipingCalculation(), Enumerable.Empty(), - Enumerable.Empty()); + Enumerable.Empty(), + pipingFailureMechanismMock); // Call bool removalAllowed = info.CanRemove(nodeMock, dataMock); @@ -389,21 +429,24 @@ var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); - mocks.ReplayAll(); - var elementToBeRemoved = new PipingCalculation(); var group = new PipingCalculationGroup(); group.Children.Add(elementToBeRemoved); group.Children.Add(new PipingCalculation()); group.Attach(observer); + var pipingFailureMechanismMock = mocks.StrictMock(); + mocks.ReplayAll(); + var calculationContext = new PipingCalculationContext(elementToBeRemoved, Enumerable.Empty(), - Enumerable.Empty()); + Enumerable.Empty(), + pipingFailureMechanismMock); var groupContext = new PipingCalculationGroupContext(group, Enumerable.Empty(), - Enumerable.Empty()); + Enumerable.Empty(), + pipingFailureMechanismMock); // Precondition Assert.IsTrue(info.CanRemove(calculationContext, groupContext)); @@ -428,9 +471,11 @@ var observer = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); var calculation = new PipingCalculation(); + var pipingFailureMechanismMock = mocks.StrictMock(); var pipingCalculationContext = new PipingCalculationContext(calculation, Enumerable.Empty(), - Enumerable.Empty()); + Enumerable.Empty(), + pipingFailureMechanismMock); observer.Expect(o => o.UpdateObserver()); @@ -480,9 +525,11 @@ var observer = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); var calculation = new PipingCalculation(); + var pipingFailureMechanismMock = mocks.StrictMock(); var pipingCalculationContext = new PipingCalculationContext(calculation, Enumerable.Empty(), - Enumerable.Empty()); + Enumerable.Empty(), + pipingFailureMechanismMock); gui.Expect(cmp => cmp.Get(pipingCalculationContext, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); @@ -521,9 +568,11 @@ var calculateContextMenuItemIndex = 1; var calculation = new PipingCalculation(); var validPipingInput = new TestPipingInput(); + var pipingFailureMechanismMock = mocks.StrictMock(); var pipingCalculationContext = new PipingCalculationContext(calculation, Enumerable.Empty(), - Enumerable.Empty()); + Enumerable.Empty(), + pipingFailureMechanismMock); gui.Expect(g => g.Get(pipingCalculationContext, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Expect(g => g.MainWindow).Return(mainWindow); @@ -596,9 +645,11 @@ var observer = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); var calculation = new PipingCalculation(); + var pipingFailureMechanismMock = mocks.StrictMock(); var pipingCalculationContext = new PipingCalculationContext(calculation, Enumerable.Empty(), - Enumerable.Empty()); + Enumerable.Empty(), + pipingFailureMechanismMock); gui.Expect(cmp => cmp.Get(pipingCalculationContext, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder());