Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rd8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d -r6492aa58a4d485a9c87d80b7529e1d36b5fd61b0 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision d8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision 6492aa58a4d485a9c87d80b7529e1d36b5fd61b0) @@ -434,9 +434,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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilityContextTreeNodeInfoTest.cs =================================================================== diff -u -ra4bb32d891f5f1603dca7d0cf1db831bdec0471d -r6492aa58a4d485a9c87d80b7529e1d36b5fd61b0 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilityContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilityContextTreeNodeInfoTest.cs) (revision a4bb32d891f5f1603dca7d0cf1db831bdec0471d) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilityContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilityContextTreeNodeInfoTest.cs) (revision 6492aa58a4d485a9c87d80b7529e1d36b5fd61b0) @@ -49,6 +49,7 @@ using Riskeer.HydraRing.Calculation.Data.Input.Hydraulics; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; using Riskeer.Integration.Data; +using Riskeer.Integration.TestUtil; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos @@ -160,9 +161,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); mockRepository.ReplayAll(); @@ -194,9 +193,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -244,9 +241,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -286,9 +281,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -335,9 +328,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -392,9 +383,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -445,9 +434,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -500,10 +487,8 @@ { IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); - var gui = mockRepository.Stub(); + IGui gui = StubFactory.CreateGuiStub(mockRepository); 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.ProjectStore).Return(mockRepository.Stub()); @@ -585,10 +570,8 @@ { IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); - var gui = mockRepository.Stub(); + IGui gui = StubFactory.CreateGuiStub(mockRepository); 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.ProjectStore).Return(mockRepository.Stub()); @@ -669,10 +652,8 @@ { IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); - var gui = mockRepository.Stub(); + IGui gui = StubFactory.CreateGuiStub(mockRepository); 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.ProjectStore).Return(mockRepository.Stub()); @@ -746,10 +727,8 @@ { IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); - var gui = mockRepository.Stub(); + IGui gui = StubFactory.CreateGuiStub(mockRepository); 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.ProjectStore).Return(mockRepository.Stub()); @@ -854,9 +833,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); mockRepository.ReplayAll(); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r43c03afe6a6c7bbe3e76697d38515afb10d424f2 -r6492aa58a4d485a9c87d80b7529e1d36b5fd61b0 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision 43c03afe6a6c7bbe3e76697d38515afb10d424f2) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision 6492aa58a4d485a9c87d80b7529e1d36b5fd61b0) @@ -50,6 +50,7 @@ using Riskeer.HydraRing.Calculation.Data.Input; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; using Riskeer.Integration.Data; +using Riskeer.Integration.TestUtil; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos @@ -185,9 +186,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -220,9 +219,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -291,10 +288,8 @@ { IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); - var gui = mockRepository.Stub(); + IGui gui = StubFactory.CreateGuiStub(mockRepository); 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.ProjectStore).Return(mockRepository.Stub()); @@ -338,9 +333,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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -387,9 +380,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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -437,9 +428,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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -484,9 +473,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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -527,9 +514,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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -583,10 +568,8 @@ { IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); - var gui = mockRepository.Stub(); + IGui gui = StubFactory.CreateGuiStub(mockRepository); 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.ProjectStore).Return(mockRepository.Stub()); @@ -680,9 +663,7 @@ { var calculationObserver = mockRepository.StrictMock(); - var gui = mockRepository.Stub(); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); + IGui gui = StubFactory.CreateGuiStub(mockRepository); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); mockRepository.ReplayAll(); @@ -745,9 +726,7 @@ var calculationObserver = mockRepository.StrictMock(); calculationObserver.Expect(o => o.UpdateObserver()); - var gui = mockRepository.Stub(); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); + IGui gui = StubFactory.CreateGuiStub(mockRepository); 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.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs =================================================================== diff -u -r58ccb1e4c46029972c424d66338b099b05888912 -r6492aa58a4d485a9c87d80b7529e1d36b5fd61b0 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs) (revision 58ccb1e4c46029972c424d66338b099b05888912) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs) (revision 6492aa58a4d485a9c87d80b7529e1d36b5fd61b0) @@ -49,6 +49,7 @@ using Riskeer.HydraRing.Calculation.Data.Input.Hydraulics; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; using Riskeer.Integration.Data; +using Riskeer.Integration.TestUtil; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos @@ -236,9 +237,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); mockRepository.ReplayAll(); @@ -269,9 +268,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -318,9 +315,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -359,9 +354,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -407,9 +400,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -466,9 +457,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -521,9 +510,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -579,10 +566,8 @@ { IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); - var gui = mockRepository.Stub(); + IGui gui = StubFactory.CreateGuiStub(mockRepository); 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.ProjectStore).Return(mockRepository.Stub()); @@ -666,10 +651,8 @@ { IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); - var gui = mockRepository.Stub(); + IGui gui = StubFactory.CreateGuiStub(mockRepository); 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.ProjectStore).Return(mockRepository.Stub()); @@ -751,10 +734,8 @@ { IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); - var gui = mockRepository.Stub(); + IGui gui = StubFactory.CreateGuiStub(mockRepository); 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.ProjectStore).Return(mockRepository.Stub()); @@ -829,10 +810,8 @@ { IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); - var gui = mockRepository.Stub(); + IGui gui = StubFactory.CreateGuiStub(mockRepository); 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.ProjectStore).Return(mockRepository.Stub()); @@ -939,9 +918,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); mockRepository.ReplayAll(); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -r6492aa58a4d485a9c87d80b7529e1d36b5fd61b0 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs (.../WaterPressureAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs) (revision 48244f68eee25ef1d91701d82e4c4867f0252ffc) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs (.../WaterPressureAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs) (revision 6492aa58a4d485a9c87d80b7529e1d36b5fd61b0) @@ -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/WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs =================================================================== diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -r6492aa58a4d485a9c87d80b7529e1d36b5fd61b0 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision 48244f68eee25ef1d91701d82e4c4867f0252ffc) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../WaterPressureAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision 6492aa58a4d485a9c87d80b7529e1d36b5fd61b0) @@ -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/WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r43c03afe6a6c7bbe3e76697d38515afb10d424f2 -r6492aa58a4d485a9c87d80b7529e1d36b5fd61b0 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision 43c03afe6a6c7bbe3e76697d38515afb10d424f2) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision 6492aa58a4d485a9c87d80b7529e1d36b5fd61b0) @@ -50,6 +50,7 @@ using Riskeer.HydraRing.Calculation.Data.Input; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; using Riskeer.Integration.Data; +using Riskeer.Integration.TestUtil; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos @@ -185,9 +186,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -220,9 +219,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -291,10 +288,8 @@ { IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); - var gui = mockRepository.Stub(); + IGui gui = StubFactory.CreateGuiStub(mockRepository); 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.ProjectStore).Return(mockRepository.Stub()); @@ -338,9 +333,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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -387,9 +380,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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -437,9 +428,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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -484,9 +473,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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -527,9 +514,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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -583,10 +568,8 @@ { IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); - var gui = mockRepository.Stub(); + IGui gui = StubFactory.CreateGuiStub(mockRepository); 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.ProjectStore).Return(mockRepository.Stub()); @@ -680,9 +663,7 @@ { var calculationObserver = mockRepository.StrictMock(); - var gui = mockRepository.Stub(); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); + IGui gui = StubFactory.CreateGuiStub(mockRepository); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); mockRepository.ReplayAll(); @@ -745,9 +726,7 @@ var calculationObserver = mockRepository.StrictMock(); calculationObserver.Expect(o => o.UpdateObserver()); - var gui = mockRepository.Stub(); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); + IGui gui = StubFactory.CreateGuiStub(mockRepository); 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.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs =================================================================== diff -u -r58ccb1e4c46029972c424d66338b099b05888912 -r6492aa58a4d485a9c87d80b7529e1d36b5fd61b0 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs) (revision 58ccb1e4c46029972c424d66338b099b05888912) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs) (revision 6492aa58a4d485a9c87d80b7529e1d36b5fd61b0) @@ -49,6 +49,7 @@ using Riskeer.HydraRing.Calculation.Data.Input.Hydraulics; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; using Riskeer.Integration.Data; +using Riskeer.Integration.TestUtil; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos @@ -236,9 +237,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); mockRepository.ReplayAll(); @@ -269,9 +268,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -318,9 +315,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -359,9 +354,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -407,9 +400,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -466,9 +457,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -521,9 +510,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); mockRepository.ReplayAll(); @@ -579,10 +566,8 @@ { IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); - var gui = mockRepository.Stub(); + IGui gui = StubFactory.CreateGuiStub(mockRepository); 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.ProjectStore).Return(mockRepository.Stub()); @@ -666,10 +651,8 @@ { IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); - var gui = mockRepository.Stub(); + IGui gui = StubFactory.CreateGuiStub(mockRepository); 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.ProjectStore).Return(mockRepository.Stub()); @@ -751,10 +734,8 @@ { IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); - var gui = mockRepository.Stub(); + IGui gui = StubFactory.CreateGuiStub(mockRepository); 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.ProjectStore).Return(mockRepository.Stub()); @@ -829,10 +810,8 @@ { IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); - var gui = mockRepository.Stub(); + IGui gui = StubFactory.CreateGuiStub(mockRepository); 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.ProjectStore).Return(mockRepository.Stub()); @@ -939,9 +918,7 @@ 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(mockRepository); gui.Stub(cmp => cmp.MainWindow).Return(mockRepository.Stub()); gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); mockRepository.ReplayAll(); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/UpdateInfos/ForeshoreProfileContextUpdateInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -r6492aa58a4d485a9c87d80b7529e1d36b5fd61b0 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/UpdateInfos/ForeshoreProfileContextUpdateInfoTest.cs (.../ForeshoreProfileContextUpdateInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/UpdateInfos/ForeshoreProfileContextUpdateInfoTest.cs (.../ForeshoreProfileContextUpdateInfoTest.cs) (revision 6492aa58a4d485a9c87d80b7529e1d36b5fd61b0) @@ -39,6 +39,7 @@ using Riskeer.Common.Forms.PresentationObjects; using Riskeer.Common.IO.FileImporters; using Riskeer.Integration.Plugin.Properties; +using Riskeer.Integration.TestUtil; namespace Riskeer.Integration.Plugin.Test.UpdateInfos { @@ -232,10 +233,8 @@ var assessmentSection = mocks.Stub(); var mainWindow = mocks.Stub(); - 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(); var calculationWithoutOutput = mocks.Stub(); calculationWithoutOutput.Stub(calc => calc.HasOutput).Return(false); @@ -277,10 +276,8 @@ var assessmentSection = mocks.Stub(); var mainWindow = mocks.Stub(); - 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(); var calculationWithoutOutput = mocks.Stub(); calculationWithoutOutput.Stub(calc => calc.HasOutput).Return(true); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs =================================================================== diff -u -r54e76db3801063d1d387d861517b7e89ef7f191f -r6492aa58a4d485a9c87d80b7529e1d36b5fd61b0 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs) (revision 54e76db3801063d1d387d861517b7e89ef7f191f) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs) (revision 6492aa58a4d485a9c87d80b7529e1d36b5fd61b0) @@ -42,6 +42,7 @@ using Riskeer.Common.Forms.PresentationObjects; using Riskeer.Common.Forms.TestUtil; using Riskeer.Common.Forms.Views; +using Riskeer.Integration.TestUtil; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Integration.Plugin.Test.ViewInfos @@ -274,9 +275,7 @@ { // Setup var mocks = new MockRepository(); - 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(g => g.ViewCommands).Return(mocks.Stub()); gui.Stub(g => g.MainWindow).Return(mocks.Stub()); gui.Stub(g => g.DocumentViewController).Return(mocks.Stub()); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs =================================================================== diff -u -r54e76db3801063d1d387d861517b7e89ef7f191f -r6492aa58a4d485a9c87d80b7529e1d36b5fd61b0 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs) (revision 54e76db3801063d1d387d861517b7e89ef7f191f) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs) (revision 6492aa58a4d485a9c87d80b7529e1d36b5fd61b0) @@ -42,6 +42,7 @@ using Riskeer.Common.Forms.PresentationObjects; using Riskeer.Common.Forms.TestUtil; using Riskeer.Common.Forms.Views; +using Riskeer.Integration.TestUtil; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Integration.Plugin.Test.ViewInfos @@ -274,9 +275,7 @@ { // Setup var mocks = new MockRepository(); - 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(g => g.ViewCommands).Return(mocks.Stub()); gui.Stub(g => g.MainWindow).Return(mocks.Stub()); gui.Stub(g => g.DocumentViewController).Return(mocks.Stub()); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs =================================================================== diff -u -r54e76db3801063d1d387d861517b7e89ef7f191f -r6492aa58a4d485a9c87d80b7529e1d36b5fd61b0 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs (.../WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs) (revision 54e76db3801063d1d387d861517b7e89ef7f191f) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs (.../WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs) (revision 6492aa58a4d485a9c87d80b7529e1d36b5fd61b0) @@ -42,6 +42,7 @@ using Riskeer.Common.Forms.PresentationObjects; using Riskeer.Common.Forms.TestUtil; using Riskeer.Common.Forms.Views; +using Riskeer.Integration.TestUtil; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Integration.Plugin.Test.ViewInfos @@ -274,9 +275,7 @@ { // Setup var mocks = new MockRepository(); - 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(g => g.ViewCommands).Return(mocks.Stub()); gui.Stub(g => g.MainWindow).Return(mocks.Stub()); gui.Stub(g => g.DocumentViewController).Return(mocks.Stub());