Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs =================================================================== diff -u -rf2f7d22ee59276f5df1f83fd409899bd895ea163 -r6ce3cfa19ef59b12462bae4a77e9a7ee5a05e28c --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs (.../RingtoetsProjectTreeNodeInfoTest.cs) (revision f2f7d22ee59276f5df1f83fd409899bd895ea163) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/RingtoetsProjectTreeNodeInfoTest.cs (.../RingtoetsProjectTreeNodeInfoTest.cs) (revision 6ce3cfa19ef59b12462bae4a77e9a7ee5a05e28c) @@ -154,16 +154,16 @@ using (var treeViewControl = new TreeViewControl()) { - var guiMock = mockRepository.Stub(); - guiMock.Stub(g => g.Get(null, treeViewControl)).Return(menuBuilderMock); - guiMock.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - guiMock.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); + var gui = mockRepository.Stub(); + gui.Stub(g => g.Get(null, treeViewControl)).Return(menuBuilderMock); + gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); + gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); mockRepository.ReplayAll(); using (var plugin = new RingtoetsPlugin()) { var info = GetInfo(plugin); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call info.ContextMenuStrip(null, null, treeViewControl); @@ -177,22 +177,21 @@ public void ContextMenuStrip_Always_ContextMenuItemAddAssessmentSectionEnabled() { // Setup - var guiMock = mockRepository.StrictMock(); - guiMock.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - guiMock.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); - var project = new RingtoetsProject(); using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(cmp => cmp.Get(project, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); + var gui = mockRepository.Stub(); + gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); + gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); + gui.Stub(cmp => cmp.Get(project, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); mockRepository.ReplayAll(); using (var plugin = new RingtoetsPlugin()) { var info = GetInfo(plugin); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call using (ContextMenuStrip contextMenu = info.ContextMenuStrip(project, null, treeViewControl))