Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicLoadsStateRootContextTreeNodeInfoTest.cs =================================================================== diff -u -r2a5ebe9dbc92130937c60bd0e1af6c47ba8aac59 -rd8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicLoadsStateRootContextTreeNodeInfoTest.cs (.../HydraulicLoadsStateRootContextTreeNodeInfoTest.cs) (revision 2a5ebe9dbc92130937c60bd0e1af6c47ba8aac59) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicLoadsStateRootContextTreeNodeInfoTest.cs (.../HydraulicLoadsStateRootContextTreeNodeInfoTest.cs) (revision d8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d) @@ -37,6 +37,7 @@ using Riskeer.GrassCoverErosionOutwards.Forms.PresentationObjects; using Riskeer.Integration.Data; using Riskeer.Integration.Forms.PresentationObjects; +using Riskeer.Integration.TestUtil; using Riskeer.StabilityStoneCover.Forms.PresentationObjects; using Riskeer.WaveImpactAsphaltCover.Forms.PresentationObjects; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; @@ -214,10 +215,8 @@ using (var treeViewControl = new TreeViewControl()) { - var gui = mocks.Stub(); + IGui gui = StubFactory.CreateGuiStub(mocks); gui.Stub(g => g.Get(context, treeViewControl)).Return(menuBuilder); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); mocks.ReplayAll(); using (var plugin = new RiskeerPlugin()) @@ -259,10 +258,8 @@ var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var mocks = new MockRepository(); - 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(); using (var plugin = new RiskeerPlugin()) @@ -296,10 +293,8 @@ var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var mocks = new MockRepository(); - 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(); using (var plugin = new RiskeerPlugin()) @@ -340,10 +335,8 @@ var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var mocks = new MockRepository(); - 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(); using (var plugin = new RiskeerPlugin()) Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/MacroStabilityOutwardsAssemblyCategoriesContextTreeNodeInfoTest.cs =================================================================== diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -rd8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/MacroStabilityOutwardsAssemblyCategoriesContextTreeNodeInfoTest.cs (.../MacroStabilityOutwardsAssemblyCategoriesContextTreeNodeInfoTest.cs) (revision 48244f68eee25ef1d91701d82e4c4867f0252ffc) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/MacroStabilityOutwardsAssemblyCategoriesContextTreeNodeInfoTest.cs (.../MacroStabilityOutwardsAssemblyCategoriesContextTreeNodeInfoTest.cs) (revision d8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d) @@ -30,6 +30,7 @@ using Riskeer.Common.Data.AssessmentSection; using Riskeer.Integration.Data.StandAlone; using Riskeer.Integration.Forms.PresentationObjects; +using Riskeer.Integration.TestUtil; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos @@ -122,10 +123,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(); using (var plugin = new RiskeerPlugin()) Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -rd8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 48244f68eee25ef1d91701d82e4c4867f0252ffc) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision d8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d) @@ -44,6 +44,7 @@ using Riskeer.Integration.Data.StandAlone.SectionResults; using Riskeer.Integration.Forms.PresentationObjects; using Riskeer.Integration.Forms.PresentationObjects.StandAlone; +using Riskeer.Integration.TestUtil; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos @@ -246,10 +247,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; @@ -286,10 +285,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; @@ -313,10 +310,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; @@ -357,10 +352,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(); @@ -400,10 +393,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/MacroStabilityOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs =================================================================== diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -rd8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/MacroStabilityOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision 48244f68eee25ef1d91701d82e4c4867f0252ffc) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/MacroStabilityOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision d8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d) @@ -31,6 +31,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 @@ -126,10 +127,8 @@ 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/MicrostabilityFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -rd8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/MicrostabilityFailureMechanismContextTreeNodeInfoTest.cs (.../MicrostabilityFailureMechanismContextTreeNodeInfoTest.cs) (revision 48244f68eee25ef1d91701d82e4c4867f0252ffc) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/MicrostabilityFailureMechanismContextTreeNodeInfoTest.cs (.../MicrostabilityFailureMechanismContextTreeNodeInfoTest.cs) (revision d8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d) @@ -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/MicrostabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs =================================================================== diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -rd8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/MicrostabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../MicrostabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision 48244f68eee25ef1d91701d82e4c4867f0252ffc) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/MicrostabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../MicrostabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision d8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d) @@ -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/NormContextTreeNodeInfoTest.cs =================================================================== diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -rd8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/NormContextTreeNodeInfoTest.cs (.../NormContextTreeNodeInfoTest.cs) (revision 48244f68eee25ef1d91701d82e4c4867f0252ffc) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/NormContextTreeNodeInfoTest.cs (.../NormContextTreeNodeInfoTest.cs) (revision d8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d) @@ -30,6 +30,7 @@ using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Forms.PresentationObjects; +using Riskeer.Integration.TestUtil; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos @@ -119,9 +120,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); mocks.ReplayAll(); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -rd8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailureMechanismContextTreeNodeInfoTest.cs (.../PipingStructureFailureMechanismContextTreeNodeInfoTest.cs) (revision 48244f68eee25ef1d91701d82e4c4867f0252ffc) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailureMechanismContextTreeNodeInfoTest.cs (.../PipingStructureFailureMechanismContextTreeNodeInfoTest.cs) (revision d8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d) @@ -41,6 +41,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 @@ -243,10 +244,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; @@ -283,10 +282,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; @@ -310,10 +307,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; @@ -354,10 +349,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(); @@ -397,10 +390,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/PipingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs =================================================================== diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -rd8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../PipingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision 48244f68eee25ef1d91701d82e4c4867f0252ffc) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../PipingStructureFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision d8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d) @@ -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/ReferenceLineContextTreeNodeInfoTest.cs =================================================================== diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -rd8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/ReferenceLineContextTreeNodeInfoTest.cs (.../ReferenceLineContextTreeNodeInfoTest.cs) (revision 48244f68eee25ef1d91701d82e4c4867f0252ffc) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/ReferenceLineContextTreeNodeInfoTest.cs (.../ReferenceLineContextTreeNodeInfoTest.cs) (revision d8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d) @@ -30,6 +30,7 @@ using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Forms.PresentationObjects; +using Riskeer.Integration.TestUtil; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos @@ -138,10 +139,8 @@ 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(); using (var plugin = new RiskeerPlugin()) Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/StrengthStabilityLengthwiseConstructionFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -rd8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/StrengthStabilityLengthwiseConstructionFailureMechanismContextTreeNodeInfoTest.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismContextTreeNodeInfoTest.cs) (revision 48244f68eee25ef1d91701d82e4c4867f0252ffc) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/StrengthStabilityLengthwiseConstructionFailureMechanismContextTreeNodeInfoTest.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismContextTreeNodeInfoTest.cs) (revision d8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d) @@ -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/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultContextTreeNodeInfoTest.cs =================================================================== diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -rd8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision 48244f68eee25ef1d91701d82e4c4867f0252ffc) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision d8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d) @@ -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 @@ -119,10 +120,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/StructuresOutputContextTreeNodeInfoTest.cs =================================================================== diff -u -r1bc5f2299c66132f869d09d017327d80f4a9522c -rd8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/StructuresOutputContextTreeNodeInfoTest.cs (.../StructuresOutputContextTreeNodeInfoTest.cs) (revision 1bc5f2299c66132f869d09d017327d80f4a9522c) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/StructuresOutputContextTreeNodeInfoTest.cs (.../StructuresOutputContextTreeNodeInfoTest.cs) (revision d8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d) @@ -30,6 +30,7 @@ using Riskeer.Common.Data.Structures; using Riskeer.Common.Forms.PresentationObjects; using Riskeer.Common.Forms.Properties; +using Riskeer.Integration.TestUtil; namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos { @@ -152,9 +153,7 @@ using (var treeViewControl = new TreeViewControl()) { - var gui = mocksRepository.Stub(); - gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); + IGui gui = StubFactory.CreateGuiStub(mocksRepository); gui.Stub(cmp => cmp.Get(null, treeViewControl)).Return(menuBuilder); mocksRepository.ReplayAll(); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/TechnicalInnovationFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -rd8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/TechnicalInnovationFailureMechanismContextTreeNodeInfoTest.cs (.../TechnicalInnovationFailureMechanismContextTreeNodeInfoTest.cs) (revision 48244f68eee25ef1d91701d82e4c4867f0252ffc) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/TechnicalInnovationFailureMechanismContextTreeNodeInfoTest.cs (.../TechnicalInnovationFailureMechanismContextTreeNodeInfoTest.cs) (revision d8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d) @@ -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/TechnicalInnovationFailureMechanismSectionResultContextTreeNodeInfoTest.cs =================================================================== diff -u -r48244f68eee25ef1d91701d82e4c4867f0252ffc -rd8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/TechnicalInnovationFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../TechnicalInnovationFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision 48244f68eee25ef1d91701d82e4c4867f0252ffc) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/TechnicalInnovationFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../TechnicalInnovationFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision d8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d) @@ -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/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r87dde3cba63d491bae56a74efc4f9d058b2bc367 -rd8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision 87dde3cba63d491bae56a74efc4f9d058b2bc367) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision d8bcb9865f0953ec34cbea4c4a1334d9f1a1f31d) @@ -49,6 +49,7 @@ using Riskeer.HydraRing.Calculation.Calculator.Factory; using Riskeer.HydraRing.Calculation.Data.Input; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; +using Riskeer.Integration.TestUtil; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos @@ -183,9 +184,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(); @@ -218,9 +217,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(); @@ -268,9 +265,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(); @@ -313,9 +308,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(); @@ -359,9 +352,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(); @@ -404,9 +395,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(); @@ -508,10 +497,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()); @@ -603,9 +590,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(); @@ -666,9 +651,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();