Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb544605d2b97d5d2d0e00953f95c6d11264a8e42 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision b544605d2b97d5d2d0e00953f95c6d11264a8e42) @@ -32,6 +32,7 @@ using Core.Gui.ContextMenu; using Core.Gui.Forms.Main; using Core.Gui.Plugin; +using Core.Gui.TestUtil; using Core.Gui.TestUtil.ContextMenu; using NUnit.Extensions.Forms; using NUnit.Framework; @@ -49,7 +50,6 @@ using Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Calculators; using Riskeer.MacroStabilityInwards.Primitives; using CoreGuiResources = Core.Gui.Properties.Resources; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.MacroStabilityInwards.Plugin.Test.TreeNodeInfos @@ -859,9 +859,7 @@ var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var mainWindow = mocks.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mocks); var gui = mocks.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb544605d2b97d5d2d0e00953f95c6d11264a8e42 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision b544605d2b97d5d2d0e00953f95c6d11264a8e42) @@ -30,6 +30,7 @@ using Core.Gui; using Core.Gui.ContextMenu; using Core.Gui.Forms.Main; +using Core.Gui.TestUtil; using Core.Gui.TestUtil.ContextMenu; using log4net.Core; using NUnit.Extensions.Forms; @@ -46,7 +47,6 @@ using Riskeer.MacroStabilityInwards.Forms.PresentationObjects; using Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Calculators; using Riskeer.MacroStabilityInwards.Primitives; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.MacroStabilityInwards.Plugin.Test.TreeNodeInfos @@ -431,9 +431,7 @@ failureMechanism, assessmentSection); - var mainWindow = mocks.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mocks); var gui = mocks.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); @@ -548,9 +546,7 @@ failureMechanism, assessmentSection); - var mainWindow = mocks.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mocks); var gui = mocks.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb544605d2b97d5d2d0e00953f95c6d11264a8e42 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationsContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationsContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationsContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationsContextTreeNodeInfoTest.cs) (revision b544605d2b97d5d2d0e00953f95c6d11264a8e42) @@ -30,6 +30,7 @@ using Core.Gui.Commands; using Core.Gui.ContextMenu; using Core.Gui.Forms.Main; +using Core.Gui.TestUtil; using Core.Gui.TestUtil.ContextMenu; using NUnit.Extensions.Forms; using NUnit.Framework; @@ -45,7 +46,6 @@ using Riskeer.MacroStabilityInwards.Forms.PresentationObjects; using Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Calculators; using CoreGuiResources = Core.Gui.Properties.Resources; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.MacroStabilityInwards.Plugin.Test.TreeNodeInfos @@ -576,9 +576,7 @@ var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var mainWindow = mocks.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mocks); var gui = mocks.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb544605d2b97d5d2d0e00953f95c6d11264a8e42 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision b544605d2b97d5d2d0e00953f95c6d11264a8e42) @@ -34,6 +34,7 @@ using Core.Gui.ContextMenu; using Core.Gui.Forms.Main; using Core.Gui.Plugin; +using Core.Gui.TestUtil; using Core.Gui.TestUtil.ContextMenu; using NUnit.Extensions.Forms; using NUnit.Framework; @@ -60,7 +61,6 @@ using Riskeer.Piping.Primitives; using Riskeer.Piping.Primitives.TestUtil; using CoreGuiResources = Core.Gui.Properties.Resources; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Piping.Plugin.Test.TreeNodeInfos @@ -1478,9 +1478,7 @@ using (var treeViewControl = new TreeViewControl()) { - var mainWindow = mocks.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mocks); var gui = mocks.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb544605d2b97d5d2d0e00953f95c6d11264a8e42 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationsContextTreeNodeInfoTest.cs (.../PipingCalculationsContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationsContextTreeNodeInfoTest.cs (.../PipingCalculationsContextTreeNodeInfoTest.cs) (revision b544605d2b97d5d2d0e00953f95c6d11264a8e42) @@ -31,6 +31,7 @@ using Core.Gui.Commands; using Core.Gui.ContextMenu; using Core.Gui.Forms.Main; +using Core.Gui.TestUtil; using Core.Gui.TestUtil.ContextMenu; using NUnit.Extensions.Forms; using NUnit.Framework; @@ -52,7 +53,6 @@ using Riskeer.Piping.Forms.PresentationObjects; using Riskeer.Piping.KernelWrapper.TestUtil.SubCalculator; using CoreGuiResources = Core.Gui.Properties.Resources; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Piping.Plugin.Test.TreeNodeInfos @@ -732,9 +732,7 @@ var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var mainWindow = mocks.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mocks); var gui = mocks.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb544605d2b97d5d2d0e00953f95c6d11264a8e42 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs (.../ProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/Probabilistic/ProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs (.../ProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision b544605d2b97d5d2d0e00953f95c6d11264a8e42) @@ -32,6 +32,7 @@ using Core.Gui; using Core.Gui.ContextMenu; using Core.Gui.Forms.Main; +using Core.Gui.TestUtil; using Core.Gui.TestUtil.ContextMenu; using log4net.Core; using NUnit.Extensions.Forms; @@ -52,7 +53,6 @@ using Riskeer.Piping.Forms.PresentationObjects; using Riskeer.Piping.Forms.PresentationObjects.Probabilistic; using Riskeer.Piping.Primitives; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Piping.Plugin.Test.TreeNodeInfos.Probabilistic @@ -881,9 +881,7 @@ failureMechanism, assessmentSection); - var mainWindow = mocks.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mocks); var gui = mocks.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); @@ -1002,9 +1000,7 @@ failureMechanism, assessmentSection); - var mainWindow = mocks.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mocks); var gui = mocks.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb544605d2b97d5d2d0e00953f95c6d11264a8e42 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs (.../SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs (.../SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision b544605d2b97d5d2d0e00953f95c6d11264a8e42) @@ -31,6 +31,7 @@ using Core.Gui; using Core.Gui.ContextMenu; using Core.Gui.Forms.Main; +using Core.Gui.TestUtil; using Core.Gui.TestUtil.ContextMenu; using log4net.Core; using NUnit.Extensions.Forms; @@ -50,7 +51,6 @@ using Riskeer.Piping.Forms.PresentationObjects.SemiProbabilistic; using Riskeer.Piping.KernelWrapper.TestUtil.SubCalculator; using Riskeer.Piping.Primitives; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Piping.Plugin.Test.TreeNodeInfos.SemiProbabilistic @@ -829,9 +829,7 @@ failureMechanism, assessmentSection); - var mainWindow = mocks.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mocks); var gui = mocks.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); @@ -956,9 +954,7 @@ failureMechanism, assessmentSection); - var mainWindow = mocks.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mocks); var gui = mocks.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow);