Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/GrassCoverSlipOffOutwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -re1349b9fcd5da0f77b75edeee961d679a9d667d9 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/GrassCoverSlipOffOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 48244f68eee25ef1d91701d82e4c4867f0252ffc) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/GrassCoverSlipOffOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision e1349b9fcd5da0f77b75edeee961d679a9d667d9) @@ -37,6 +37,7 @@ using Riskeer.Integration.Data.StandAlone; using Riskeer.Integration.Data.StandAlone.SectionResults; using Riskeer.Integration.Forms.PresentationObjects.StandAlone; +using Riskeer.Integration.TestUtil; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos @@ -227,10 +228,8 @@ menuBuilder.Expect(mb => mb.Build()).Return(null); } - var gui = mocks.Stub(); + IGui gui = StubFactory.CreateGuiStub(mocks); gui.Stub(cmp => cmp.Get(context, treeView)).Return(menuBuilder); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); mocks.ReplayAll(); plugin.Gui = gui; @@ -267,10 +266,8 @@ menuBuilder.Expect(mb => mb.Build()).Return(null); } - var gui = mocks.Stub(); + IGui gui = StubFactory.CreateGuiStub(mocks); gui.Stub(cmp => cmp.Get(context, treeView)).Return(menuBuilder); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); mocks.ReplayAll(); plugin.Gui = gui; @@ -294,10 +291,8 @@ var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var gui = mocks.Stub(); + IGui gui = StubFactory.CreateGuiStub(mocks); gui.Stub(cmp => cmp.Get(context, treeView)).Return(menuBuilder); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); mocks.ReplayAll(); plugin.Gui = gui; @@ -338,10 +333,8 @@ { var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var gui = mocks.Stub(); + IGui gui = StubFactory.CreateGuiStub(mocks); gui.Stub(g => g.ViewCommands).Return(viewCommands); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); gui.Stub(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); mocks.ReplayAll(); @@ -381,10 +374,8 @@ using (var treeViewControl = new TreeViewControl()) { - var gui = mocks.Stub(); + IGui gui = StubFactory.CreateGuiStub(mocks); gui.Stub(g => g.ViewCommands).Return(viewCommands); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); gui.Stub(g => g.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder); mocks.ReplayAll(); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/GrassCoverSlipOffOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs =================================================================== diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -re1349b9fcd5da0f77b75edeee961d679a9d667d9 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/GrassCoverSlipOffOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision 48244f68eee25ef1d91701d82e4c4867f0252ffc) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/GrassCoverSlipOffOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision e1349b9fcd5da0f77b75edeee961d679a9d667d9) @@ -30,6 +30,7 @@ using Riskeer.Common.Forms.PresentationObjects; using Riskeer.Integration.Data.StandAlone; using Riskeer.Integration.Data.StandAlone.SectionResults; +using Riskeer.Integration.TestUtil; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos @@ -118,10 +119,8 @@ using (plugin) using (var treeViewControl = new TreeViewControl()) { - var gui = mocks.Stub(); + IGui gui = StubFactory.CreateGuiStub(mocks); gui.Stub(g => g.Get(null, treeViewControl)).Return(menuBuilder); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); mocks.ReplayAll(); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs =================================================================== diff -u -r1da3bfcce5b70ce3aacf15c6964f45b72152c99a -re1349b9fcd5da0f77b75edeee961d679a9d667d9 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision 1da3bfcce5b70ce3aacf15c6964f45b72152c99a) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision e1349b9fcd5da0f77b75edeee961d679a9d667d9) @@ -54,6 +54,7 @@ using Riskeer.HydraRing.Calculation.TestUtil.Calculator; using Riskeer.Integration.Data; using Riskeer.Integration.Forms.PresentationObjects; +using Riskeer.Integration.TestUtil; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos @@ -164,9 +165,7 @@ using (var treeViewControl = new TreeViewControl()) { - var gui = mocks.Stub(); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); + IGui gui = StubFactory.CreateGuiStub(mocks); gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilder); gui.Stub(cmp => cmp.MainWindow).Return(mocks.Stub()); mocks.ReplayAll(); @@ -214,10 +213,8 @@ context, treeViewControl); - var gui = mocks.Stub(); + IGui gui = StubFactory.CreateGuiStub(mocks); gui.Stub(g => g.Get(context, treeViewControl)).Return(builder); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); gui.Stub(cmp => cmp.MainWindow).Return(mocks.Stub()); mocks.ReplayAll(); @@ -361,9 +358,7 @@ using (var treeViewControl = new TreeViewControl()) { - var gui = mocks.Stub(); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); + IGui gui = StubFactory.CreateGuiStub(mocks); gui.Stub(cmp => cmp.MainWindow).Return(mocks.Stub()); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); mocks.ReplayAll(); @@ -413,9 +408,7 @@ using (var treeViewControl = new TreeViewControl()) { - var gui = mocks.Stub(); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); + IGui gui = StubFactory.CreateGuiStub(mocks); gui.Stub(cmp => cmp.MainWindow).Return(mocks.Stub()); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); mocks.ReplayAll(); @@ -467,9 +460,7 @@ var mockRepository = new MockRepository(); using (var treeViewControl = new TreeViewControl()) { - var gui = mockRepository.Stub(); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); + IGui gui = StubFactory.CreateGuiStub(mocks); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -512,9 +503,7 @@ var mockRepository = new MockRepository(); using (var treeViewControl = new TreeViewControl()) { - var gui = mockRepository.Stub(); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); + IGui gui = StubFactory.CreateGuiStub(mocks); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -568,10 +557,8 @@ { IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mocks); - var gui = mocks.Stub(); + IGui gui = StubFactory.CreateGuiStub(mocks); gui.Stub(g => g.MainWindow).Return(mainWindow); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(g => g.DocumentViewController).Return(mocks.Stub()); gui.Stub(g => g.ViewCommands).Return(mocks.Stub()); @@ -698,9 +685,7 @@ { var affectedCalculationObserver = mockRepository.StrictMock(); - var gui = mockRepository.Stub(); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); + IGui gui = StubFactory.CreateGuiStub(mocks); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); mockRepository.ReplayAll(); @@ -764,9 +749,7 @@ affectedCalculationObserver.Expect(o => o.UpdateObserver()); var unAffectedCalculationObserver = mockRepository.StrictMock(); - var gui = mockRepository.Stub(); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); + IGui gui = StubFactory.CreateGuiStub(mocks); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); mockRepository.ReplayAll(); Index: Riskeer/Integration/test/Riskeer.Integration.TestUtil/StubFactory.cs =================================================================== diff -u -r0eab9d948d5bd86b8e844769ed0861db9909958a -re1349b9fcd5da0f77b75edeee961d679a9d667d9 --- Riskeer/Integration/test/Riskeer.Integration.TestUtil/StubFactory.cs (.../StubFactory.cs) (revision 0eab9d948d5bd86b8e844769ed0861db9909958a) +++ Riskeer/Integration/test/Riskeer.Integration.TestUtil/StubFactory.cs (.../StubFactory.cs) (revision e1349b9fcd5da0f77b75edeee961d679a9d667d9) @@ -43,6 +43,8 @@ gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); gui.Stub(g => g.ViewHost).Return(mockRepository.Stub()); + gui.Replay(); + return gui; } }