Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -re315307a730a87022136e7fa7b97a570d37399dc -r40b1fa451f977a22d49c8bc37d68c8dd047262e1 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision e315307a730a87022136e7fa7b97a570d37399dc) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 40b1fa451f977a22d49c8bc37d68c8dd047262e1) @@ -12,6 +12,7 @@ using NUnit.Extensions.Forms; using NUnit.Framework; using Rhino.Mocks; +using Ringtoets.Common.Data; using Ringtoets.Piping.Calculation.TestUtil; using Ringtoets.Piping.Data; using Ringtoets.Piping.Data.TestUtil; @@ -62,13 +63,15 @@ var testname = "testName"; var group = new PipingCalculationGroup { Name = testname }; var pipingFailureMechanismMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); var groupContext = new PipingCalculationGroupContext(group, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock); + pipingFailureMechanismMock, + assessmentSectionMock); // Call var text = info.Text(groupContext); @@ -93,12 +96,14 @@ // Setup var group = new PipingCalculationGroup(); var pipingFailureMechanismMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); var groupContext = new PipingCalculationGroupContext(group, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock); + pipingFailureMechanismMock, + assessmentSectionMock); mocks.ReplayAll(); @@ -117,12 +122,14 @@ // Setup var group = new PipingCalculationGroup(); var pipingFailureMechanismMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); - var groupContext = new PipingCalculationGroupContext(@group, + var groupContext = new PipingCalculationGroupContext(group, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock); + pipingFailureMechanismMock, + assessmentSectionMock); // Call var children = info.ChildNodeObjects(groupContext); @@ -142,31 +149,34 @@ var childGroup = new PipingCalculationGroup(); var group = new PipingCalculationGroup(); - @group.Children.Add(calculationItem); - @group.Children.Add(childCalculation); - @group.Children.Add(childGroup); + group.Children.Add(calculationItem); + group.Children.Add(childCalculation); + group.Children.Add(childGroup); var pipingFailureMechanismMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); - var nodeData = new PipingCalculationGroupContext(@group, + var nodeData = new PipingCalculationGroupContext(group, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock); + pipingFailureMechanismMock, + assessmentSectionMock); // Call var children = info.ChildNodeObjects(nodeData).ToArray(); // Assert - Assert.AreEqual(@group.Children.Count, children.Length); + Assert.AreEqual(group.Children.Count, children.Length); Assert.AreSame(calculationItem, children[0]); var returnedCalculationContext = (PipingCalculationContext) children[1]; Assert.AreSame(childCalculation, returnedCalculationContext.WrappedData); Assert.AreSame(pipingFailureMechanismMock, returnedCalculationContext.PipingFailureMechanism); var returnedCalculationGroupContext = (PipingCalculationGroupContext)children[2]; Assert.AreSame(childGroup, returnedCalculationGroupContext.WrappedData); Assert.AreSame(pipingFailureMechanismMock, returnedCalculationGroupContext.PipingFailureMechanism); + Assert.AreSame(assessmentSectionMock, returnedCalculationGroupContext.AssessmentSection); mocks.VerifyAll(); } @@ -179,23 +189,26 @@ var parentGroup = new PipingCalculationGroup(); var group = new PipingCalculationGroup(); - parentGroup.Children.Add(@group); - @group.Children.Add(new PipingCalculation + parentGroup.Children.Add(group); + group.Children.Add(new PipingCalculation { Output = new TestPipingOutput() }); var pipingFailureMechanismMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); var parentData = new PipingCalculationGroupContext(parentGroup, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock); + pipingFailureMechanismMock, + assessmentSectionMock); - var nodeData = new PipingCalculationGroupContext(@group, + var nodeData = new PipingCalculationGroupContext(group, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock); + pipingFailureMechanismMock, + assessmentSectionMock); var applicationFeatureCommandHandler = mocks.Stub(); var exportImportHandler = mocks.Stub(); @@ -295,18 +308,20 @@ var gui = mocks.StrictMock(); var group = new PipingCalculationGroup(); - @group.Children.Add(new PipingCalculation + group.Children.Add(new PipingCalculation { Output = new TestPipingOutput() }); var pipingFailureMechanismMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); var parentData = new object(); - var nodeData = new PipingCalculationGroupContext(@group, + var nodeData = new PipingCalculationGroupContext(group, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock); + pipingFailureMechanismMock, + assessmentSectionMock); var applicationFeatureCommandHandler = mocks.Stub(); var exportImportHandler = mocks.Stub(); @@ -400,18 +415,20 @@ var gui = mocks.StrictMock(); var group = new PipingCalculationGroup(); - @group.Children.Add(new PipingCalculation + group.Children.Add(new PipingCalculation { Output = new TestPipingOutput() }); var pipingFailureMechanismMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); var parentData = new PipingFailureMechanism(); - var nodeData = new PipingCalculationGroupContext(@group, + var nodeData = new PipingCalculationGroupContext(group, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock); + pipingFailureMechanismMock, + assessmentSectionMock); var applicationFeatureCommandHandler = mocks.Stub(); var exportImportHandler = mocks.Stub(); @@ -502,10 +519,12 @@ var group = new PipingCalculationGroup(); var parentData = new PipingFailureMechanism(); var pipingFailureMechanismMock = mocks.StrictMock(); - var nodeData = new PipingCalculationGroupContext(@group, + var assessmentSectionMock = mocks.StrictMock(); + var nodeData = new PipingCalculationGroupContext(group, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock); + pipingFailureMechanismMock, + assessmentSectionMock); gui.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); @@ -535,10 +554,12 @@ var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var group = new PipingCalculationGroup(); var pipingFailureMechanismMock = mocks.StrictMock(); - var nodeData = new PipingCalculationGroupContext(@group, + var assessmentSectionMock = mocks.StrictMock(); + var nodeData = new PipingCalculationGroupContext(group, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock); + pipingFailureMechanismMock, + assessmentSectionMock); var calculationItem = mocks.Stub(); calculationItem.Expect(ci => ci.Name).Return("Nieuwe map"); @@ -554,21 +575,21 @@ plugin.Gui = gui; - @group.Children.Add(calculationItem); + group.Children.Add(calculationItem); nodeData.Attach(observer); ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); // Precondition - Assert.AreEqual(1, @group.Children.Count); + Assert.AreEqual(1, group.Children.Count); // Call contextMenu.Items[contextMenuAddCalculationGroupIndex].PerformClick(); // Assert - Assert.AreEqual(2, @group.Children.Count); - var newlyAddedItem = @group.Children.Last(); + Assert.AreEqual(2, group.Children.Count); + var newlyAddedItem = group.Children.Last(); Assert.IsInstanceOf(newlyAddedItem); Assert.AreEqual("Nieuwe map (1)", newlyAddedItem.Name, "An item with the same name default name already exists, therefore '(1)' needs to be appended."); @@ -584,10 +605,12 @@ var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var group = new PipingCalculationGroup(); var pipingFailureMechanismMock = mocks.StrictMock(); - var nodeData = new PipingCalculationGroupContext(@group, + var assessmentSectionMock = mocks.StrictMock(); + var nodeData = new PipingCalculationGroupContext(group, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock); + pipingFailureMechanismMock, + assessmentSectionMock); var calculationItem = mocks.Stub(); calculationItem.Expect(ci => ci.Name).Return("Nieuwe berekening"); @@ -603,21 +626,21 @@ plugin.Gui = gui; - @group.Children.Add(calculationItem); + group.Children.Add(calculationItem); nodeData.Attach(observer); var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); // Precondition - Assert.AreEqual(1, @group.Children.Count); + Assert.AreEqual(1, group.Children.Count); // Call contextMenu.Items[contextMenuAddCalculationIndex].PerformClick(); // Assert - Assert.AreEqual(2, @group.Children.Count); - var newlyAddedItem = @group.Children.Last(); + Assert.AreEqual(2, group.Children.Count); + var newlyAddedItem = group.Children.Last(); Assert.IsInstanceOf(newlyAddedItem); Assert.AreEqual("Nieuwe berekening (1)", newlyAddedItem.Name, "An item with the same name default name already exists, therefore '(1)' needs to be appended."); @@ -649,11 +672,13 @@ group.Children.Add(invalidCalculation); var pipingFailureMechanismMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); var nodeData = new PipingCalculationGroupContext(group, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock); + pipingFailureMechanismMock, + assessmentSectionMock); gui.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); @@ -701,16 +726,18 @@ var emptyChildGroup = new PipingCalculationGroup(); var group = new PipingCalculationGroup(); - @group.Children.Add(childGroup); - @group.Children.Add(emptyChildGroup); - @group.Children.Add(invalidCalculation); + group.Children.Add(childGroup); + group.Children.Add(emptyChildGroup); + group.Children.Add(invalidCalculation); var pipingFailureMechanismMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); - var nodeData = new PipingCalculationGroupContext(@group, + var nodeData = new PipingCalculationGroupContext(group, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock); + pipingFailureMechanismMock, + assessmentSectionMock); gui.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); gui.Expect(g => g.MainWindow).Return(mainWindow); @@ -767,16 +794,18 @@ var emptyChildGroup = new PipingCalculationGroup(); var group = new PipingCalculationGroup(); - @group.Children.Add(childGroup); - @group.Children.Add(emptyChildGroup); - @group.Children.Add(calculation2); + group.Children.Add(childGroup); + group.Children.Add(emptyChildGroup); + group.Children.Add(calculation2); var pipingFailureMechanismMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); - var nodeData = new PipingCalculationGroupContext(@group, + var nodeData = new PipingCalculationGroupContext(group, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock); + pipingFailureMechanismMock, + assessmentSectionMock); gui.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); @@ -803,15 +832,15 @@ }; // Precondition - Assert.IsTrue(@group.HasOutput); + Assert.IsTrue(group.HasOutput); var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl); // Call contextMenu.Items[contextMenuClearOutputIndex].PerformClick(); // Assert - Assert.AreNotEqual(confirm, @group.HasOutput); + Assert.AreNotEqual(confirm, group.HasOutput); Assert.AreNotEqual(confirm, calculation1.HasOutput); Assert.AreNotEqual(confirm, calculation2.HasOutput); @@ -855,20 +884,22 @@ observer.Expect(o => o.UpdateObserver()); var group = new PipingCalculationGroup(); var pipingFailureMechanismMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); - var nodeData = new PipingCalculationGroupContext(@group, + var nodeData = new PipingCalculationGroupContext(group, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock); + pipingFailureMechanismMock, + assessmentSectionMock); nodeData.Attach(observer); // Call const string newName = "new name"; info.OnNodeRenamed(nodeData, newName); // Assert - Assert.AreEqual(newName, @group.Name); + Assert.AreEqual(newName, group.Name); mocks.VerifyAll(); } @@ -878,15 +909,17 @@ // Setup var group = new PipingCalculationGroup(); var pipingFailureMechanismMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); - var nodeData = new PipingCalculationGroupContext(@group, + var nodeData = new PipingCalculationGroupContext(group, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock); + pipingFailureMechanismMock, + assessmentSectionMock); var parentNodeData = new PipingFailureMechanism(); - parentNodeData.CalculationsGroup.Children.Add(@group); + parentNodeData.CalculationsGroup.Children.Add(group); mocks.ReplayAll(); @@ -904,19 +937,22 @@ // Setup var group = new PipingCalculationGroup(); var pipingFailureMechanismMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); - var nodeData = new PipingCalculationGroupContext(@group, + var nodeData = new PipingCalculationGroupContext(group, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock); + pipingFailureMechanismMock, + assessmentSectionMock); var parentGroup = new PipingCalculationGroup(); - parentGroup.Children.Add(@group); + parentGroup.Children.Add(group); var parentNodeData = new PipingCalculationGroupContext(parentGroup, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock); + pipingFailureMechanismMock, + assessmentSectionMock); mocks.ReplayAll(); @@ -934,21 +970,24 @@ // Setup var group = new PipingCalculationGroup(); var pipingFailureMechanismMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); - var nodeData = new PipingCalculationGroupContext(@group, + var nodeData = new PipingCalculationGroupContext(group, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock); + pipingFailureMechanismMock, + assessmentSectionMock); var parentGroup = new PipingCalculationGroup(); var parentNodeData = new PipingCalculationGroupContext(parentGroup, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock); + pipingFailureMechanismMock, + assessmentSectionMock); // Precondition - CollectionAssert.DoesNotContain(parentGroup.Children, @group); + CollectionAssert.DoesNotContain(parentGroup.Children, group); // Call bool isRemovalAllowed = info.CanRemove(nodeData, parentNodeData); @@ -965,19 +1004,22 @@ observer.Expect(o => o.UpdateObserver()); var group = new PipingCalculationGroup(); var pipingFailureMechanismMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); - var nodeData = new PipingCalculationGroupContext(@group, + var nodeData = new PipingCalculationGroupContext(group, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock); + pipingFailureMechanismMock, + assessmentSectionMock); var parentGroup = new PipingCalculationGroup(); - parentGroup.Children.Add(@group); + parentGroup.Children.Add(group); var parentNodeData = new PipingCalculationGroupContext(parentGroup, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock); + pipingFailureMechanismMock, + assessmentSectionMock); parentNodeData.Attach(observer); // Precondition @@ -987,7 +1029,7 @@ info.OnNodeRemoved(nodeData, parentNodeData); // Assert - CollectionAssert.DoesNotContain(parentGroup.Children, @group); + CollectionAssert.DoesNotContain(parentGroup.Children, group); mocks.VerifyAll(); } @@ -997,12 +1039,14 @@ // Setup var group = new PipingCalculationGroup(); var pipingFailureMechanismMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); var groupContext = new PipingCalculationGroupContext(group, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock); + pipingFailureMechanismMock, + assessmentSectionMock); // Call var canDrag = info.CanDrag(groupContext, null); @@ -1017,12 +1061,14 @@ // Setup var group = new PipingCalculationGroup(); var pipingFailureMechanismMock = mocks.StrictMock(); + var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); var groupContext = new PipingCalculationGroupContext(group, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanismMock); + pipingFailureMechanismMock, + assessmentSectionMock); // Call var canDrag = info.CanDrag(groupContext, pipingFailureMechanismMock); @@ -1301,7 +1347,8 @@ dataContext = new PipingCalculationGroupContext(data, Enumerable.Empty(), Enumerable.Empty(), - failureMechanism); + failureMechanism, + null); } /// @@ -1339,7 +1386,8 @@ dataContext = new PipingCalculationGroupContext(group, Enumerable.Empty(), Enumerable.Empty(), - pipingFailureMechanism); + pipingFailureMechanism, + null); break; default: throw new NotSupportedException();