Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r95487d39e17289b2a656e34d85b808186222c0ee -r20f311390d1e8daa85500e8f031d11e9f0f5d9f4 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 95487d39e17289b2a656e34d85b808186222c0ee) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 20f311390d1e8daa85500e8f031d11e9f0f5d9f4) @@ -135,36 +135,18 @@ failureMechanism.CalculationsGroup.Children.Add(draggedItem); failureMechanism.CalculationsGroup.Children.Add(targetGroup); - #region Mock node tree for source and target in same failure mechanism - - var failureMechanismNode = mocks.Stub(); - failureMechanismNode.Tag = failureMechanism; - - var failureMechanismGroupNode = mocks.Stub(); - failureMechanismGroupNode.Tag = failureMechanism.CalculationsGroup; - - var calculationNode = mocks.Stub(); - calculationNode.Tag = draggedItemContext; - - var targetGroupNode = mocks.Stub(); - targetGroupNode.Tag = targetGroupContext; - - #endregion - - mocks.ReplayAll(); - switch (methodToTest) { case DragDropTestMethod.CanDrop: // Call - DragOperations supportedOperations = info.CanDrop(calculationNode, targetGroupNode, DragOperations.Move); + DragOperations supportedOperations = info.CanDrop(draggedItemContext, targetGroupContext, DragOperations.Move); // Assert Assert.AreEqual(DragOperations.Move, supportedOperations); break; case DragDropTestMethod.CanInsert: // Call - bool canInsert = info.CanInsert(calculationNode, targetGroupNode); + bool canInsert = info.CanInsert(draggedItemContext, targetGroupContext); // Assert Assert.IsTrue(canInsert); @@ -199,46 +181,18 @@ targetFailureMechanism.CalculationsGroup.Children.Add(targetGroup); - #region Mock node tree for source IPipingCalculationItem - - var sourceFailureMechanismNode = mocks.Stub(); - sourceFailureMechanismNode.Tag = sourceFailureMechanism; - - var sourceFailureMechanismGroupNode = mocks.Stub(); - sourceFailureMechanismGroupNode.Tag = sourceFailureMechanism.CalculationsGroup; - - var calculationNode = mocks.Stub(); - calculationNode.Tag = draggedItemContext; - - #endregion - - #region Mock node tree for target PipingCalculationGroup - - var targetFailureMechanismNode = mocks.Stub(); - targetFailureMechanismNode.Tag = targetFailureMechanism; - - var targetFailureMechanismGroupNode = mocks.Stub(); - targetFailureMechanismGroupNode.Tag = targetFailureMechanism.CalculationsGroup; - - var groupNode = mocks.Stub(); - groupNode.Tag = targetGroupContext; - - #endregion - - mocks.ReplayAll(); - switch (methodToTest) { case DragDropTestMethod.CanDrop: // Call - DragOperations supportedOperations = info.CanDrop(calculationNode, groupNode, DragOperations.Move); + DragOperations supportedOperations = info.CanDrop(draggedItemContext, targetGroupContext, DragOperations.Move); // Assert Assert.AreEqual(DragOperations.None, supportedOperations); break; case DragDropTestMethod.CanInsert: // Call - bool canInsert = info.CanInsert(calculationNode, groupNode); + bool canInsert = info.CanInsert(draggedItemContext, targetGroupContext); // Assert Assert.IsFalse(canInsert);