Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismSectionsContextTreeNodeInfoTest.cs =================================================================== diff -u -rd65d6b037600ccd69f386d9164172dd2c133356e -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismSectionsContextTreeNodeInfoTest.cs (.../FailureMechanismSectionsContextTreeNodeInfoTest.cs) (revision d65d6b037600ccd69f386d9164172dd2c133356e) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismSectionsContextTreeNodeInfoTest.cs (.../FailureMechanismSectionsContextTreeNodeInfoTest.cs) (revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2) @@ -114,7 +114,6 @@ public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods() { // Setup - var treeViewControlMock = mocks.StrictMock(); var menuBuilderMock = mocks.StrictMock(); menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock); @@ -125,20 +124,23 @@ var context = new FailureMechanismSectionsContext(failureMechanism, assessmentSection); var gui = mocks.StrictMock(); - gui.Expect(cmp => cmp.Get(context, treeViewControlMock)).Return(menuBuilderMock); gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); - mocks.ReplayAll(); - - using (var plugin = new RingtoetsGuiPlugin()) + using (var treeViewControl = new TreeViewControl()) { - var info = GetInfo(plugin); + gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilderMock); + mocks.ReplayAll(); - plugin.Gui = gui; + using (var plugin = new RingtoetsGuiPlugin()) + { + var info = GetInfo(plugin); - // Call - info.ContextMenuStrip(context, null, treeViewControlMock); + plugin.Gui = gui; + + // Call + info.ContextMenuStrip(context, null, treeViewControl); + } } // Assert mocks.VerifyAll();