Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructureTreeNodeInfoTest.cs =================================================================== diff -u -r2a0fbe6ec22928831305671ecd4f41030b827250 -rd30b839df8d71c1742a96ada6e422b44cdc9efff --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructureTreeNodeInfoTest.cs (.../ClosingStructureTreeNodeInfoTest.cs) (revision 2a0fbe6ec22928831305671ecd4f41030b827250) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructureTreeNodeInfoTest.cs (.../ClosingStructureTreeNodeInfoTest.cs) (revision d30b839df8d71c1742a96ada6e422b44cdc9efff) @@ -240,20 +240,24 @@ { // Setup var menuBuilderMock = mocks.StrictMock(); - menuBuilderMock.Expect(mb => mb.AddDeleteItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.Build()).Return(null); + using (mocks.Ordered()) + { + menuBuilderMock.Expect(mb => mb.AddDeleteItem()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.Build()).Return(null); + } + using (var treeViewControl = new TreeViewControl()) { ClosingStructure nodeData = new TestClosingStructure(); - var guiMock = mocks.StrictMock(); - guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilderMock); + var gui = mocks.Stub(); + gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilderMock); mocks.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call info.ContextMenuStrip(nodeData, null, treeViewControl); Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rfb9bf56793b90226745888c194ba6ae760f83f4c -rd30b839df8d71c1742a96ada6e422b44cdc9efff --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision fb9bf56793b90226745888c194ba6ae760f83f4c) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision d30b839df8d71c1742a96ada6e422b44cdc9efff) @@ -196,7 +196,6 @@ var failureMechanism = new ClosingStructuresFailureMechanism(); var assessmentSection = mocksRepository.Stub(); var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, assessmentSection); - var guiMock = mocksRepository.StrictMock(); var menuBuilderMock = mocksRepository.StrictMock(); using (mocksRepository.Ordered()) @@ -219,10 +218,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(cmp => cmp.Get(failureMechanismContext, treeViewControl)).Return(menuBuilderMock); + var gui = mocksRepository.Stub(); + gui.Stub(cmp => cmp.Get(failureMechanismContext, treeViewControl)).Return(menuBuilderMock); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); @@ -242,7 +242,6 @@ }; var assessmentSection = mocksRepository.Stub(); var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, assessmentSection); - var guiMock = mocksRepository.StrictMock(); var menuBuilderMock = mocksRepository.StrictMock(); using (mocksRepository.Ordered()) @@ -256,10 +255,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(cmp => cmp.Get(failureMechanismContext, treeViewControl)).Return(menuBuilderMock); + var gui = mocksRepository.Stub(); + gui.Stub(cmp => cmp.Get(failureMechanismContext, treeViewControl)).Return(menuBuilderMock); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); @@ -279,15 +279,15 @@ var failureMechanism = new ClosingStructuresFailureMechanism(); var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var guiMock = mocksRepository.StrictMock(); - guiMock.Expect(cmp => cmp.Get(failureMechanismContext, treeView)).Return(menuBuilder); - guiMock.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - guiMock.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); - + var gui = mocksRepository.Stub(); + gui.Stub(cmp => cmp.Get(failureMechanismContext, treeView)).Return(menuBuilder); + gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); + gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; + // Call using (ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, assessmentSection, treeView)) { @@ -332,15 +332,15 @@ }; var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var guiMock = mocksRepository.StrictMock(); - guiMock.Expect(cmp => cmp.Get(failureMechanismContext, treeView)).Return(menuBuilder); - guiMock.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - guiMock.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); - + var gui = mocksRepository.Stub(); + gui.Stub(cmp => cmp.Get(failureMechanismContext, treeView)).Return(menuBuilder); + gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); + gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; + // Call using (ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, assessmentSection, treeView)) { @@ -364,18 +364,18 @@ var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, assessmentSection); var viewCommandsMock = mocksRepository.StrictMock(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var guiMock = mocksRepository.StrictMock(); viewCommandsMock.Expect(vs => vs.RemoveAllViewsForItem(failureMechanismContext)); - guiMock.Stub(g => g.ViewCommands).Return(viewCommandsMock); using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); - + var gui = mocksRepository.Stub(); + gui.Stub(g => g.ViewCommands).Return(viewCommandsMock); + gui.Stub(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) { // Call @@ -399,18 +399,18 @@ var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, assessmentSection); var viewCommandsMock = mocksRepository.StrictMock(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var guiMock = mocksRepository.StrictMock(); viewCommandsMock.Expect(vs => vs.RemoveAllViewsForItem(failureMechanismContext)); - guiMock.Stub(g => g.ViewCommands).Return(viewCommandsMock); using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); - + var gui = mocksRepository.Stub(); + gui.Stub(g => g.ViewCommands).Return(viewCommandsMock); + gui.Stub(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) { // Call @@ -426,7 +426,6 @@ public void ContextMenuStrip_NoHydraulicBoundaryDatabase_ContextMenuItemCalculateAllAndValidateAllDisabledAndTooltipSet() { // Setup - var guiMock = mocksRepository.StrictMock(); var failureMechanism = new TestClosingStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation()); @@ -437,11 +436,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - + var gui = mocksRepository.Stub(); + gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) @@ -466,7 +465,6 @@ public void ContextMenuStrip_HydraulicBoundaryDatabaseNotValid_ContextMenuItemCalculateAllAndValidateAllDisabledAndTooltipSet() { // Setup - var guiMock = mocksRepository.StrictMock(); var failureMechanism = new TestClosingStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation()); @@ -478,11 +476,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - + var gui = mocksRepository.Stub(); + gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) @@ -509,7 +507,6 @@ public void ContextMenuStrip_FailureMechanismContributionZero_ContextMenuItemCalculateAllAndValidateAllDisabledAndTooltipSet() { // Setup - var guiMock = mocksRepository.StrictMock(); var failureMechanism = new ClosingStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation()); @@ -529,11 +526,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - + var gui = mocksRepository.Stub(); + gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) @@ -558,7 +555,6 @@ public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemCalculateAllAndValidateAllEnabled() { // Setup - var guiMock = mocksRepository.StrictMock(); var failureMechanism = new TestClosingStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation()); @@ -578,11 +574,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - + var gui = mocksRepository.Stub(); + gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) @@ -605,7 +601,6 @@ public void ContextMenuStrip_ClickOnCalculateAllItem_ScheduleAllChildCalculations() { // Setup - var guiMock = mocksRepository.StrictMock(); var mainWindowStub = mocksRepository.Stub(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -641,12 +636,12 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); - guiMock.Expect(g => g.MainWindow).Return(mainWindowStub); - + var gui = mocksRepository.Stub(); + gui.Stub(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); + gui.Stub(g => g.MainWindow).Return(mainWindowStub); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; DialogBoxHandler = (name, wnd) => { Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresInputContextTreeNodeInfoTest.cs =================================================================== diff -u -rf2f7d22ee59276f5df1f83fd409899bd895ea163 -rd30b839df8d71c1742a96ada6e422b44cdc9efff --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresInputContextTreeNodeInfoTest.cs (.../ClosingStructuresInputContextTreeNodeInfoTest.cs) (revision f2f7d22ee59276f5df1f83fd409899bd895ea163) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresInputContextTreeNodeInfoTest.cs (.../ClosingStructuresInputContextTreeNodeInfoTest.cs) (revision d30b839df8d71c1742a96ada6e422b44cdc9efff) @@ -105,18 +105,22 @@ public void ContextMenuStrip_Always_CallsBuilderMethods() { // Setup - var guiMock = mocks.StrictMock(); var menuBuilderMock = mocks.StrictMock(); using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock); + var gui = mocks.Stub(); + gui.Stub(g => g.Get(null, treeViewControl)).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.Build()).Return(null); + using (mocks.Ordered()) + { + menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.Build()).Return(null); + } + mocks.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call info.ContextMenuStrip(null, null, treeViewControl); Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresScenariosContextTreeNodeInfoTest.cs =================================================================== diff -u -rf2f7d22ee59276f5df1f83fd409899bd895ea163 -rd30b839df8d71c1742a96ada6e422b44cdc9efff --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresScenariosContextTreeNodeInfoTest.cs (.../ClosingStructuresScenariosContextTreeNodeInfoTest.cs) (revision f2f7d22ee59276f5df1f83fd409899bd895ea163) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresScenariosContextTreeNodeInfoTest.cs (.../ClosingStructuresScenariosContextTreeNodeInfoTest.cs) (revision d30b839df8d71c1742a96ada6e422b44cdc9efff) @@ -104,18 +104,22 @@ public void ContextMenuStrip_Always_CallsBuilderMethods() { // Setup - var guiMock = mocks.StrictMock(); var menuBuilderMock = mocks.StrictMock(); using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock); + var gui = mocks.Stub(); + gui.Stub(g => g.Get(null, treeViewControl)).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.Build()).Return(null); + using (mocks.Ordered()) + { + menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.Build()).Return(null); + } + mocks.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call info.ContextMenuStrip(null, null, treeViewControl); Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismSectionResultContextTest.cs =================================================================== diff -u -re775448bfb8290e43d62340a53a08723bbc035c6 -rd30b839df8d71c1742a96ada6e422b44cdc9efff --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismSectionResultContextTest.cs (.../FailureMechanismSectionResultContextTest.cs) (revision e775448bfb8290e43d62340a53a08723bbc035c6) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismSectionResultContextTest.cs (.../FailureMechanismSectionResultContextTest.cs) (revision d30b839df8d71c1742a96ada6e422b44cdc9efff) @@ -39,7 +39,7 @@ { // Setup var mocks = new MockRepository(); - var failureMechanismMock = mocks.StrictMock(); + var failureMechanism = mocks.Stub(); mocks.ReplayAll(); var failureMechanismSectionResults = new[] @@ -48,12 +48,12 @@ }; // Call - var context = new FailureMechanismSectionResultContext(failureMechanismSectionResults, failureMechanismMock); + var context = new FailureMechanismSectionResultContext(failureMechanismSectionResults, failureMechanism); // Assert Assert.IsInstanceOf>>(context); Assert.AreSame(failureMechanismSectionResults, context.WrappedData); - Assert.AreSame(failureMechanismMock, context.FailureMechanism); + Assert.AreSame(failureMechanism, context.FailureMechanism); mocks.VerifyAll(); } Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuBuilderTest.cs =================================================================== diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -rd30b839df8d71c1742a96ada6e422b44cdc9efff --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuBuilderTest.cs (.../RingtoetsContextMenuBuilderTest.cs) (revision b4e3629ea2130359117dd403af8db3c8ae0c680b) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuBuilderTest.cs (.../RingtoetsContextMenuBuilderTest.cs) (revision d30b839df8d71c1742a96ada6e422b44cdc9efff) @@ -259,8 +259,8 @@ var importHandlerMock = mocks.StrictMock(); var exportHandlerMock = mocks.StrictMock(); var viewCommandsMock = mocks.StrictMock(); - var failureMechanismMock = mocks.Stub(); - failureMechanismMock.Stub(fm => fm.Calculations).Return(new List()); + var failureMechanism = mocks.Stub(); + failureMechanism.Stub(fm => fm.Calculations).Return(new List()); mocks.ReplayAll(); @@ -270,12 +270,12 @@ importHandlerMock, exportHandlerMock, viewCommandsMock, - failureMechanismMock, + failureMechanism, treeViewControl); var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder); // Call - var result = ringtoetsContextMenuBuilder.AddClearAllCalculationOutputInFailureMechanismItem(failureMechanismMock).Build(); + var result = ringtoetsContextMenuBuilder.AddClearAllCalculationOutputInFailureMechanismItem(failureMechanism).Build(); // Assert Assert.IsInstanceOf(result); Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rfb9bf56793b90226745888c194ba6ae760f83f4c -rd30b839df8d71c1742a96ada6e422b44cdc9efff --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs (.../DuneErosionFailureMechanismContextTreeNodeInfoTest.cs) (revision fb9bf56793b90226745888c194ba6ae760f83f4c) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs (.../DuneErosionFailureMechanismContextTreeNodeInfoTest.cs) (revision d30b839df8d71c1742a96ada6e422b44cdc9efff) @@ -167,7 +167,6 @@ var failureMechanism = new DuneErosionFailureMechanism(); var assessmentSection = mocksRepository.Stub(); var failureMechanismContext = new DuneErosionFailureMechanismContext(failureMechanism, assessmentSection); - var guiMock = mocksRepository.StrictMock(); var menuBuilderMock = mocksRepository.StrictMock(); using (mocksRepository.Ordered()) @@ -185,10 +184,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(cmp => cmp.Get(failureMechanismContext, treeViewControl)).Return(menuBuilderMock); + var gui = mocksRepository.Stub(); + gui.Stub(cmp => cmp.Get(failureMechanismContext, treeViewControl)).Return(menuBuilderMock); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); @@ -208,7 +208,6 @@ }; var assessmentSection = mocksRepository.Stub(); var failureMechanismContext = new DuneErosionFailureMechanismContext(failureMechanism, assessmentSection); - var guiMock = mocksRepository.StrictMock(); var menuBuilderMock = mocksRepository.StrictMock(); using (mocksRepository.Ordered()) @@ -222,10 +221,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(cmp => cmp.Get(failureMechanismContext, treeViewControl)).Return(menuBuilderMock); + var gui = mocksRepository.Stub(); + gui.Stub(cmp => cmp.Get(failureMechanismContext, treeViewControl)).Return(menuBuilderMock); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); @@ -245,15 +245,15 @@ var failureMechanism = new DuneErosionFailureMechanism(); var failureMechanismContext = new DuneErosionFailureMechanismContext(failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var guiMock = mocksRepository.StrictMock(); - guiMock.Expect(cmp => cmp.Get(failureMechanismContext, treeView)).Return(menuBuilder); - guiMock.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - guiMock.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); - + var gui = mocksRepository.Stub(); + gui.Stub(cmp => cmp.Get(failureMechanismContext, treeView)).Return(menuBuilder); + gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); + gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; + // Call using (ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, assessmentSection, treeView)) { @@ -281,15 +281,15 @@ }; var failureMechanismContext = new DuneErosionFailureMechanismContext(failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var guiMock = mocksRepository.StrictMock(); - guiMock.Expect(cmp => cmp.Get(failureMechanismContext, treeView)).Return(menuBuilder); - guiMock.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - guiMock.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); - + var gui = mocksRepository.Stub(); + gui.Stub(cmp => cmp.Get(failureMechanismContext, treeView)).Return(menuBuilder); + gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); + gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; + // Call using (ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, assessmentSection, treeView)) { @@ -313,18 +313,18 @@ var failureMechanismContext = new DuneErosionFailureMechanismContext(failureMechanism, assessmentSection); var viewCommandsMock = mocksRepository.StrictMock(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var guiMock = mocksRepository.StrictMock(); viewCommandsMock.Expect(vs => vs.RemoveAllViewsForItem(failureMechanismContext)); - guiMock.Stub(g => g.ViewCommands).Return(viewCommandsMock); using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); - + var gui = mocksRepository.Stub(); + gui.Stub(g => g.ViewCommands).Return(viewCommandsMock); + gui.Stub(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) { // Call @@ -348,18 +348,18 @@ var failureMechanismContext = new DuneErosionFailureMechanismContext(failureMechanism, assessmentSection); var viewCommandsMock = mocksRepository.StrictMock(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var guiMock = mocksRepository.StrictMock(); viewCommandsMock.Expect(vs => vs.RemoveAllViewsForItem(failureMechanismContext)); - guiMock.Stub(g => g.ViewCommands).Return(viewCommandsMock); using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); - + var gui = mocksRepository.Stub(); + gui.Stub(g => g.ViewCommands).Return(viewCommandsMock); + gui.Stub(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; + using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) { // Call Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -rfb9bf56793b90226745888c194ba6ae760f83f4c -rd30b839df8d71c1742a96ada6e422b44cdc9efff --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision fb9bf56793b90226745888c194ba6ae760f83f4c) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision d30b839df8d71c1742a96ada6e422b44cdc9efff) @@ -174,7 +174,6 @@ public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods() { // Setup - var guiMock = mocks.StrictMock(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var assessmentSection = mocks.Stub(); var calculation = new GrassCoverErosionInwardsCalculation(); @@ -199,11 +198,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilderMock); - + var gui = mocks.Stub(); + gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilderMock); mocks.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call info.ContextMenuStrip(nodeData, null, treeViewControl); @@ -216,26 +215,27 @@ public void ContextMenuStrip_Always_AddCustomItems() { // Setup - var guiMock = mocks.StrictMock(); - var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); + string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); + var assessmentSection = mocks.Stub(); + assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase + { + FilePath = validFilePath, + Version = "random" + }; + var calculation = new GrassCoverErosionInwardsCalculation(); + var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); var nodeData = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); - assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase - { - FilePath = validFilePath, - Version = "random" - }; - + var gui = mocks.Stub(); + gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); mocks.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, assessmentSection, treeViewControl)) @@ -266,20 +266,18 @@ public void ContextMenuStrip_NoHydraulicBoundaryDatabase_ContextMenuItemPerformCalculationDisabledAndTooltipSet() { // Setup - var guiMock = mocks.StrictMock(); - var assessmentSection = mocks.Stub(); var calculation = new GrassCoverErosionInwardsCalculation(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); var nodeData = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSection); using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); - + var gui = mocks.Stub(); + gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); mocks.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) @@ -298,8 +296,6 @@ public void ContextMenuStrip_HydraulicBoundaryDatabaseNotValid_ContextMenuItemPerformCalculationDisabledAndTooltipSet() { // Setup - var guiMock = mocks.StrictMock(); - var assessmentSection = mocks.Stub(); assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); @@ -309,11 +305,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); - + var gui = mocks.Stub(); + gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); mocks.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) @@ -333,8 +329,6 @@ public void ContextMenuStrip_FailureMechanismContributionZero_ContextMenuItemPerformCalculationDisabledAndTooltipSet() { // Setup - var guiMock = mocks.StrictMock(); - string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); var assessmentSection = mocks.Stub(); @@ -350,11 +344,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); - + var gui = mocks.Stub(); + gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); mocks.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) @@ -373,8 +367,6 @@ public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemPerformCalculationEnabled() { // Setup - var guiMock = mocks.StrictMock(); - string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); var assessmentSection = mocks.Stub(); @@ -390,11 +382,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); - + var gui = mocks.Stub(); + gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); mocks.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) @@ -412,20 +404,18 @@ public void ContextMenuStrip_NoHydraulicBoundaryDatabase_ContextMenuItemValidateCalculationDisabledAndTooltipSet() { // Setup - var guiMock = mocks.StrictMock(); - var assessmentSection = mocks.Stub(); var calculation = new GrassCoverErosionInwardsCalculation(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); var nodeData = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSection); using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); - + var gui = mocks.Stub(); + gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); mocks.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) @@ -444,8 +434,6 @@ public void ContextMenuStrip_HydraulicBoundaryDatabaseNotValid_ContextMenuItemValidateCalculationDisabledAndTooltipSet() { // Setup - var guiMock = mocks.StrictMock(); - var assessmentSection = mocks.Stub(); assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); @@ -455,11 +443,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); - + var gui = mocks.Stub(); + gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); mocks.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) @@ -479,8 +467,6 @@ public void ContextMenuStrip_FailureMechanismContributionZero_ContextMenuItemValidateCalculationDisabledAndTooltipSet() { // Setup - var guiMock = mocks.StrictMock(); - string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); var assessmentSection = mocks.Stub(); @@ -496,11 +482,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); - + var gui = mocks.Stub(); + gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); mocks.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) @@ -519,8 +505,6 @@ public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemValidateCalculationEnabled() { // Setup - var guiMock = mocks.StrictMock(); - string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); var assessmentSection = mocks.Stub(); @@ -536,11 +520,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); - + var gui = mocks.Stub(); + gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); mocks.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) @@ -639,7 +623,6 @@ public void GivenCalculation_WhenValidatingFromContextMenu_ThenLogMessagesAdded() { // Given - var gui = mocks.StrictMock(); var observerMock = mocks.StrictMock(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); @@ -670,8 +653,8 @@ using (var treeViewControl = new TreeViewControl()) { - gui.Expect(g => g.Get(calculationContext, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); - + var gui = mocks.Stub(); + gui.Stub(g => g.Get(calculationContext, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); mocks.ReplayAll(); plugin.Gui = gui; Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rfb9bf56793b90226745888c194ba6ae760f83f4c -rd30b839df8d71c1742a96ada6e422b44cdc9efff --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision fb9bf56793b90226745888c194ba6ae760f83f4c) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision d30b839df8d71c1742a96ada6e422b44cdc9efff) @@ -70,7 +70,7 @@ private const int contextMenuClearAllIndexNestedGroup = 7; private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, "HydraulicBoundaryDatabaseImporter"); - private IGui guiMock; + private IGui gui; private TreeNodeInfo info; private MockRepository mocks; private GrassCoverErosionInwardsPlugin plugin; @@ -79,10 +79,10 @@ public void SetUp() { mocks = new MockRepository(); - guiMock = mocks.StrictMock(); + gui = mocks.Stub(); plugin = new GrassCoverErosionInwardsPlugin { - Gui = guiMock + Gui = gui }; info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(GrassCoverErosionInwardsCalculationGroupContext)); @@ -206,8 +206,8 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(cmp => cmp.Get(groupContext, treeViewControl)).Return(menuBuilderMock); - guiMock.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); + gui.Stub(cmp => cmp.Get(groupContext, treeViewControl)).Return(menuBuilderMock); + gui.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); mocks.ReplayAll(); // Call @@ -232,8 +232,8 @@ { var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - guiMock.Expect(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder); - guiMock.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); + gui.Stub(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder); + gui.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); mocks.ReplayAll(); @@ -307,7 +307,7 @@ menuBuilderMock.Expect(mb => mb.Build()).Return(null); } - guiMock.Expect(cmp => cmp.Get(groupContext, treeViewControl)).Return(menuBuilderMock); + gui.Stub(cmp => cmp.Get(groupContext, treeViewControl)).Return(menuBuilderMock); mocks.ReplayAll(); @@ -335,7 +335,7 @@ using (var treeViewControl = new TreeViewControl()) { var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - guiMock.Expect(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder); + gui.Stub(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder); mocks.ReplayAll(); @@ -407,8 +407,8 @@ viewCommandsHandlerMock, nodeData, treeViewControl); - guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - guiMock.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); + gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); + gui.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); mocks.ReplayAll(); // Call @@ -460,8 +460,8 @@ viewCommandsHandlerMock, nodeData, treeViewControl); - guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - guiMock.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); + gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); + gui.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); mocks.ReplayAll(); // Call @@ -509,8 +509,8 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - guiMock.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); + gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); + gui.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); mocks.ReplayAll(); @@ -559,8 +559,8 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - guiMock.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); + gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); + gui.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); mocks.ReplayAll(); @@ -609,8 +609,8 @@ viewCommandsHandlerMock, nodeData, treeViewControl); - guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - guiMock.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); + gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); + gui.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); mocks.ReplayAll(); // Call @@ -661,8 +661,8 @@ viewCommandsHandlerMock, nodeData, treeViewControl); - guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - guiMock.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); + gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); + gui.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); mocks.ReplayAll(); // Call @@ -710,8 +710,8 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - guiMock.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); + gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); + gui.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); mocks.ReplayAll(); @@ -759,8 +759,8 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - guiMock.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); + gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); + gui.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); mocks.ReplayAll(); @@ -789,8 +789,8 @@ using (var treeViewControl = new TreeViewControl()) { var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - guiMock.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); + gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); + gui.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); mocks.ReplayAll(); @@ -823,8 +823,8 @@ using (var treeViewControl = new TreeViewControl()) { var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - guiMock.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); + gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); + gui.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); mocks.ReplayAll(); @@ -881,12 +881,12 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder); - guiMock.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); + gui.Stub(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder); + gui.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); mocks.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; using (ContextMenuStrip contextMenu = info.ContextMenuStrip(groupContext, null, treeViewControl)) { @@ -951,13 +951,13 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder); - guiMock.Expect(g => g.MainWindow).Return(mainWindowStub); - guiMock.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); + gui.Stub(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder); + gui.Stub(g => g.MainWindow).Return(mainWindowStub); + gui.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); mocks.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; DialogBoxHandler = (name, wnd) => { @@ -1011,8 +1011,8 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); - guiMock.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); + gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); + gui.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); mocks.ReplayAll(); @@ -1057,8 +1057,8 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); - guiMock.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); + gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); + gui.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); mocks.ReplayAll(); @@ -1110,13 +1110,13 @@ var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var mainWindow = mocks.Stub(); - guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); - guiMock.Expect(g => g.MainWindow).Return(mainWindow); - guiMock.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); + gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); + gui.Stub(g => g.MainWindow).Return(mainWindow); + gui.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); mocks.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; DialogBoxHandler = (name, wnd) => { @@ -1168,13 +1168,13 @@ var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var mainWindow = mocks.Stub(); - guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); - guiMock.Expect(g => g.MainWindow).Return(mainWindow); - guiMock.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); + gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); + gui.Stub(g => g.MainWindow).Return(mainWindow); + gui.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); mocks.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; DialogBoxHandler = (name, wnd) => { @@ -1233,13 +1233,13 @@ var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var mainWindow = mocks.Stub(); - guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); - guiMock.Expect(g => g.MainWindow).Return(mainWindow); - guiMock.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); + gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); + gui.Stub(g => g.MainWindow).Return(mainWindow); + gui.Stub(cmp => cmp.ViewCommands).Return(mocks.Stub()); mocks.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; DialogBoxHandler = (name, wnd) => { Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rfb9bf56793b90226745888c194ba6ae760f83f4c -rd30b839df8d71c1742a96ada6e422b44cdc9efff --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision fb9bf56793b90226745888c194ba6ae760f83f4c) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision d30b839df8d71c1742a96ada6e422b44cdc9efff) @@ -182,7 +182,6 @@ var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var assessmentSection = mocksRepository.Stub(); var failureMechanismContext = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSection); - var guiMock = mocksRepository.StrictMock(); var menuBuilderMock = mocksRepository.StrictMock(); using (mocksRepository.Ordered()) @@ -205,11 +204,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(cmp => cmp.Get(failureMechanismContext, treeViewControl)).Return(menuBuilderMock); - + var gui = mocksRepository.Stub(); + gui.Stub(cmp => cmp.Get(failureMechanismContext, treeViewControl)).Return(menuBuilderMock); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); @@ -228,7 +227,6 @@ }; var assessmentSection = mocksRepository.Stub(); var failureMechanismContext = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSection); - var guiMock = mocksRepository.StrictMock(); var menuBuilderMock = mocksRepository.StrictMock(); using (mocksRepository.Ordered()) @@ -242,11 +240,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(cmp => cmp.Get(failureMechanismContext, treeViewControl)).Return(menuBuilderMock); - + var gui = mocksRepository.Stub(); + gui.Stub(cmp => cmp.Get(failureMechanismContext, treeViewControl)).Return(menuBuilderMock); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call info.ContextMenuStrip(failureMechanismContext, null, treeViewControl); @@ -265,15 +263,14 @@ var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var failureMechanismContext = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var guiMock = mocksRepository.StrictMock(); - guiMock.Expect(cmp => cmp.Get(failureMechanismContext, treeView)).Return(menuBuilder); - guiMock.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - guiMock.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); - + var gui = mocksRepository.Stub(); + gui.Stub(cmp => cmp.Get(failureMechanismContext, treeView)).Return(menuBuilder); + gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); + gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call using (ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, assessmentSection, treeView)) @@ -320,15 +317,14 @@ }; var failureMechanismContext = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var guiMock = mocksRepository.StrictMock(); - guiMock.Expect(cmp => cmp.Get(failureMechanismContext, treeView)).Return(menuBuilder); - guiMock.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - guiMock.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); - + var gui = mocksRepository.Stub(); + gui.Stub(cmp => cmp.Get(failureMechanismContext, treeView)).Return(menuBuilder); + gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); + gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call using (ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, assessmentSection, treeView)) @@ -353,18 +349,17 @@ var failureMechanismContext = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSection); var viewCommandsMock = mocksRepository.StrictMock(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var guiMock = mocksRepository.StrictMock(); viewCommandsMock.Expect(vs => vs.RemoveAllViewsForItem(failureMechanismContext)); - guiMock.Stub(g => g.ViewCommands).Return(viewCommandsMock); using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); - + var gui = mocksRepository.Stub(); + gui.Stub(g => g.ViewCommands).Return(viewCommandsMock); + gui.Stub(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) { @@ -389,18 +384,17 @@ var failureMechanismContext = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSection); var viewCommandsMock = mocksRepository.StrictMock(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var guiMock = mocksRepository.StrictMock(); viewCommandsMock.Expect(vs => vs.RemoveAllViewsForItem(failureMechanismContext)); - guiMock.Stub(g => g.ViewCommands).Return(viewCommandsMock); using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); - + var gui = mocksRepository.Stub(); + gui.Stub(g => g.ViewCommands).Return(viewCommandsMock); + gui.Stub(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) { @@ -417,22 +411,20 @@ public void ContextMenuStrip_NoHydraulicBoundaryDatabase_ContextMenuItemCalculateAllDisabledAndTooltipSet() { // Setup - var guiMock = mocksRepository.StrictMock(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); var assessmentSection = mocksRepository.Stub(); - var nodeData = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - + var gui = mocksRepository.Stub(); + gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) @@ -451,7 +443,6 @@ public void ContextMenuStrip_HydraulicBoundaryDatabaseNotValid_ContextMenuItemCalculateAllDisabledAndTooltipSet() { // Setup - var guiMock = mocksRepository.StrictMock(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); @@ -463,11 +454,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - + var gui = mocksRepository.Stub(); + gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) @@ -487,7 +478,6 @@ public void ContextMenuStrip_FailureMechanismContributionZero_ContextMenuItemCalculateAllDisabledAndTooltipSet() { // Setup - var guiMock = mocksRepository.StrictMock(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); @@ -505,11 +495,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - + var gui = mocksRepository.Stub(); + gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) @@ -528,7 +518,6 @@ public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemCalculateAllEnabled() { // Setup - var guiMock = mocksRepository.StrictMock(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); @@ -546,11 +535,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - + var gui = mocksRepository.Stub(); + gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) @@ -568,7 +557,6 @@ public void ContextMenuStrip_NoHydraulicBoundaryDatabase_ContextMenuItemValidateAllDisabledAndTooltipSet() { // Setup - var guiMock = mocksRepository.StrictMock(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); @@ -579,11 +567,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - + var gui = mocksRepository.Stub(); + gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) @@ -602,7 +590,6 @@ public void ContextMenuStrip_HydraulicBoundaryDatabaseNotValid_ContextMenuItemValidateAllDisabledAndTooltipSet() { // Setup - var guiMock = mocksRepository.StrictMock(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); @@ -614,11 +601,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - + var gui = mocksRepository.Stub(); + gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call using (ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl)) @@ -638,7 +625,6 @@ public void ContextMenuStrip_FailureMechanismContributionZero_ContextMenuItemValidateAllDisabledAndTooltipSet() { // Setup - var guiMock = mocksRepository.StrictMock(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); @@ -656,11 +642,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - + var gui = mocksRepository.Stub(); + gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) @@ -679,7 +665,6 @@ public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemValidateAllEnabled() { // Setup - var guiMock = mocksRepository.StrictMock(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); @@ -697,11 +682,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); - + var gui = mocksRepository.Stub(); + gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl)) @@ -719,7 +704,6 @@ public void ContextMenuStrip_ClickOnCalculateAllItem_ScheduleAllChildCalculations() { // Setup - var guiMock = mocksRepository.StrictMock(); var mainWindowStub = mocksRepository.Stub(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -757,12 +741,12 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); - guiMock.Expect(g => g.MainWindow).Return(mainWindowStub); - + var gui = mocksRepository.Stub(); + gui.Stub(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); + gui.Stub(g => g.MainWindow).Return(mainWindowStub); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; DialogBoxHandler = (name, wnd) => { @@ -800,7 +784,6 @@ public void ContextMenuStrip_ClickOnValidateAllItem_ValidateAllChildCalculations() { // Setup - var guiMock = mocksRepository.StrictMock(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); @@ -834,11 +817,11 @@ using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); - + var gui = mocksRepository.Stub(); + gui.Stub(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; using (ContextMenuStrip contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl)) { Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs =================================================================== diff -u -rfb9bf56793b90226745888c194ba6ae760f83f4c -rd30b839df8d71c1742a96ada6e422b44cdc9efff --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs) (revision fb9bf56793b90226745888c194ba6ae760f83f4c) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs) (revision d30b839df8d71c1742a96ada6e422b44cdc9efff) @@ -124,21 +124,24 @@ public void ContextMenuStrip_Always_CallsBuilderMethods() { // Setup - var guiMock = mocksRepository.StrictMock(); var menuBuilderMock = mocksRepository.StrictMock(); - menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.Build()).Return(null); - mocksRepository.ReplayAll(); + using (mocksRepository.Ordered()) + { + menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.Build()).Return(null); + } - plugin.Gui = guiMock; - using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock); + var gui = mocksRepository.Stub(); + gui.Stub(g => g.Get(null, treeViewControl)).Return(menuBuilderMock); + mocksRepository.ReplayAll(); + plugin.Gui = gui; + // Call info.ContextMenuStrip(null, null, treeViewControl); } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsOutputTreeNodeInfoTest.cs =================================================================== diff -u -rf2f7d22ee59276f5df1f83fd409899bd895ea163 -rd30b839df8d71c1742a96ada6e422b44cdc9efff --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsOutputTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsOutputTreeNodeInfoTest.cs) (revision f2f7d22ee59276f5df1f83fd409899bd895ea163) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsOutputTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsOutputTreeNodeInfoTest.cs) (revision d30b839df8d71c1742a96ada6e422b44cdc9efff) @@ -110,18 +110,21 @@ public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods() { // Setup - var guiMock = mocksRepository.StrictMock(); var menuBuilderMock = mocksRepository.StrictMock(); - menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); - menuBuilderMock.Expect(mb => mb.Build()).Return(null); + using (mocksRepository.Ordered()) + { + menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.Build()).Return(null); + } using (var treeViewControl = new TreeViewControl()) { - guiMock.Expect(cmp => cmp.Get(null, treeViewControl)).Return(menuBuilderMock); + var gui = mocksRepository.Stub(); + gui.Stub(cmp => cmp.Get(null, treeViewControl)).Return(menuBuilderMock); mocksRepository.ReplayAll(); - plugin.Gui = guiMock; + plugin.Gui = gui; // Call info.ContextMenuStrip(null, null, treeViewControl); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelLocationsContextPropertyInfoTest.cs =================================================================== diff -u -rc48f16746209f799f93c6fc79a5202a9e3fd419f -rd30b839df8d71c1742a96ada6e422b44cdc9efff --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelLocationsContextPropertyInfoTest.cs (.../DesignWaterLevelLocationsContextPropertyInfoTest.cs) (revision c48f16746209f799f93c6fc79a5202a9e3fd419f) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelLocationsContextPropertyInfoTest.cs (.../DesignWaterLevelLocationsContextPropertyInfoTest.cs) (revision d30b839df8d71c1742a96ada6e422b44cdc9efff) @@ -54,12 +54,12 @@ { // Setup MockRepository mockRepository = new MockRepository(); - var assessmentSectionMock = mockRepository.Stub(); + var assessmentSection = mockRepository.Stub(); var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); - assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase; + assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase; mockRepository.ReplayAll(); - DesignWaterLevelLocationsContext context = new DesignWaterLevelLocationsContext(assessmentSectionMock); + DesignWaterLevelLocationsContext context = new DesignWaterLevelLocationsContext(assessmentSection); using (RingtoetsPlugin plugin = new RingtoetsPlugin()) { Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightLocationsContextPropertyInfoTest.cs =================================================================== diff -u -rc48f16746209f799f93c6fc79a5202a9e3fd419f -rd30b839df8d71c1742a96ada6e422b44cdc9efff --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightLocationsContextPropertyInfoTest.cs (.../WaveHeightLocationsContextPropertyInfoTest.cs) (revision c48f16746209f799f93c6fc79a5202a9e3fd419f) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightLocationsContextPropertyInfoTest.cs (.../WaveHeightLocationsContextPropertyInfoTest.cs) (revision d30b839df8d71c1742a96ada6e422b44cdc9efff) @@ -54,12 +54,12 @@ { // Setup MockRepository mockRepository = new MockRepository(); - var assessmentSectionMock = mockRepository.Stub(); + var assessmentSection = mockRepository.Stub(); var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); - assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase; + assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase; mockRepository.ReplayAll(); - WaveHeightLocationsContext context = new WaveHeightLocationsContext(assessmentSectionMock); + WaveHeightLocationsContext context = new WaveHeightLocationsContext(assessmentSection); using (RingtoetsPlugin plugin = new RingtoetsPlugin()) { Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/StabilityPointStructuresFailureMechanismViewInfoTest.cs =================================================================== diff -u -r8c1fffbb415e7c2470be6d3fa2971103777d418e -rd30b839df8d71c1742a96ada6e422b44cdc9efff --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/StabilityPointStructuresFailureMechanismViewInfoTest.cs (.../StabilityPointStructuresFailureMechanismViewInfoTest.cs) (revision 8c1fffbb415e7c2470be6d3fa2971103777d418e) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/StabilityPointStructuresFailureMechanismViewInfoTest.cs (.../StabilityPointStructuresFailureMechanismViewInfoTest.cs) (revision d30b839df8d71c1742a96ada6e422b44cdc9efff) @@ -87,20 +87,20 @@ public void CloseForData_ViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse() { // Setup - var assessmentSectionStub = mocks.Stub(); - var otherAssessmentSectionMock = mocks.Stub(); + var assessmentSection = mocks.Stub(); + var otherAssessmentSection = mocks.Stub(); mocks.ReplayAll(); var failureMechanism = new TestFailureMechanism(); - var failureMechanismContext = new FailureMechanismContext(failureMechanism, assessmentSectionStub); + var failureMechanismContext = new FailureMechanismContext(failureMechanism, assessmentSection); using (var view = new FailureMechanismView { Data = failureMechanismContext }) { // Call - bool closeForData = info.CloseForData(view, otherAssessmentSectionMock); + bool closeForData = info.CloseForData(view, otherAssessmentSection); // Assert Assert.IsFalse(closeForData); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs =================================================================== diff -u -r275f2693e9148678accdd5c423ed18ea5c78d409 -rd30b839df8d71c1742a96ada6e422b44cdc9efff --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs (.../StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs) (revision 275f2693e9148678accdd5c423ed18ea5c78d409) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs (.../StrengthStabilityLengthwiseConstructionResultViewInfoTest.cs) (revision d30b839df8d71c1742a96ada6e422b44cdc9efff) @@ -165,7 +165,7 @@ var failureMechanism = new StrengthStabilityLengthwiseConstructionFailureMechanism(); var otherFailureMechanism = mocks.Stub("N", "C"); - assessmentSection.Expect(asm => asm.GetFailureMechanisms()).Return(new[] + assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(new[] { otherFailureMechanism }); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverResultViewInfoTest.cs =================================================================== diff -u -r275f2693e9148678accdd5c423ed18ea5c78d409 -rd30b839df8d71c1742a96ada6e422b44cdc9efff --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverResultViewInfoTest.cs (.../WaterPressureAsphaltCoverResultViewInfoTest.cs) (revision 275f2693e9148678accdd5c423ed18ea5c78d409) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverResultViewInfoTest.cs (.../WaterPressureAsphaltCoverResultViewInfoTest.cs) (revision d30b839df8d71c1742a96ada6e422b44cdc9efff) @@ -164,7 +164,8 @@ var assessmentSection = mocks.Stub(); var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism(); var otherFailureMechanism = mocks.Stub("N", "C"); - assessmentSection.Expect(asm => asm.GetFailureMechanisms()).Return(new[] + + assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(new[] { otherFailureMechanism });