Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -r0e0eff94d9452eeebda5f68f183414d4ee3df413 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 0e0eff94d9452eeebda5f68f183414d4ee3df413) @@ -32,6 +32,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.StabilityPointStructures.Data; using Riskeer.StabilityPointStructures.Data.TestUtil; using Riskeer.StabilityPointStructures.Forms.PresentationObjects; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.StabilityPointStructures.Plugin.Test.TreeNodeInfos @@ -1509,9 +1509,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); gui.Stub(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder); gui.Stub(g => g.MainWindow).Return(mainWindow); Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -r0e0eff94d9452eeebda5f68f183414d4ee3df413 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationScenarioContextTreeNodeInfoTest.cs) (revision 0e0eff94d9452eeebda5f68f183414d4ee3df413) @@ -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 NUnit.Extensions.Forms; using NUnit.Framework; @@ -49,7 +50,6 @@ using Riskeer.StabilityPointStructures.Data; using Riskeer.StabilityPointStructures.Data.TestUtil; using Riskeer.StabilityPointStructures.Forms.PresentationObjects; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.StabilityPointStructures.Plugin.Test.TreeNodeInfos @@ -953,9 +953,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.Get(calculationContext, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -r0e0eff94d9452eeebda5f68f183414d4ee3df413 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationsContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationsContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationsContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationsContextTreeNodeInfoTest.cs) (revision 0e0eff94d9452eeebda5f68f183414d4ee3df413) @@ -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 NUnit.Extensions.Forms; using NUnit.Framework; @@ -50,7 +51,6 @@ using Riskeer.StabilityPointStructures.Data; using Riskeer.StabilityPointStructures.Data.TestUtil; using Riskeer.StabilityPointStructures.Forms.PresentationObjects; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.StabilityPointStructures.Plugin.Test.TreeNodeInfos @@ -463,9 +463,7 @@ using (var plugin = new StabilityPointStructuresPlugin()) using (var treeViewControl = new TreeViewControl()) { - var mainWindow = mocksRepository.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mocksRepository); var gui = mocksRepository.Stub(); gui.Stub(g => g.Get(context, treeViewControl)).Return(menuBuilder); Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -r0e0eff94d9452eeebda5f68f183414d4ee3df413 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverCalculationsContextTreeNodeInfoTest.cs (.../StabilityStoneCoverCalculationsContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverCalculationsContextTreeNodeInfoTest.cs (.../StabilityStoneCoverCalculationsContextTreeNodeInfoTest.cs) (revision 0e0eff94d9452eeebda5f68f183414d4ee3df413) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.Collections.Generic; using System.Drawing; using System.IO; @@ -31,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 NUnit.Framework; using Rhino.Mocks; @@ -47,7 +47,6 @@ using Riskeer.Revetment.Data; using Riskeer.StabilityStoneCover.Data; using Riskeer.StabilityStoneCover.Forms.PresentationObjects; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.StabilityStoneCover.Plugin.Test.TreeNodeInfos @@ -310,9 +309,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.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -r0e0eff94d9452eeebda5f68f183414d4ee3df413 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 0e0eff94d9452eeebda5f68f183414d4ee3df413) @@ -32,6 +32,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; @@ -50,7 +51,6 @@ using Riskeer.StabilityStoneCover.Data; using Riskeer.StabilityStoneCover.Data.TestUtil; using Riskeer.StabilityStoneCover.Forms.PresentationObjects; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.StabilityStoneCover.Plugin.Test.TreeNodeInfos @@ -1302,10 +1302,9 @@ viewCommands, context, 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.Get(context, treeViewControl)).Return(menuBuilder); gui.Stub(g => g.MainWindow).Return(mainWindow); Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -r0e0eff94d9452eeebda5f68f183414d4ee3df413 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 0e0eff94d9452eeebda5f68f183414d4ee3df413) @@ -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; @@ -53,7 +54,6 @@ using Riskeer.StabilityStoneCover.Data.TestUtil; using Riskeer.StabilityStoneCover.Forms.PresentationObjects; using CoreGuiResources = Core.Gui.Properties.Resources; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.StabilityStoneCover.Plugin.Test.TreeNodeInfos @@ -1150,9 +1150,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); gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); gui.Stub(g => g.MainWindow).Return(mainWindow); Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -r0e0eff94d9452eeebda5f68f183414d4ee3df413 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverCalculationsContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverCalculationsContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverCalculationsContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverCalculationsContextTreeNodeInfoTest.cs) (revision 0e0eff94d9452eeebda5f68f183414d4ee3df413) @@ -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 NUnit.Framework; using Rhino.Mocks; @@ -47,7 +48,6 @@ using Riskeer.Revetment.Data; using Riskeer.WaveImpactAsphaltCover.Data; using Riskeer.WaveImpactAsphaltCover.Forms.PresentationObjects; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.WaveImpactAsphaltCover.Plugin.Test.TreeNodeInfos @@ -309,9 +309,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.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -r0e0eff94d9452eeebda5f68f183414d4ee3df413 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 0e0eff94d9452eeebda5f68f183414d4ee3df413) @@ -50,7 +50,6 @@ using Riskeer.Revetment.Data; using Riskeer.WaveImpactAsphaltCover.Data; using Riskeer.WaveImpactAsphaltCover.Forms.PresentationObjects; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.WaveImpactAsphaltCover.Plugin.Test.TreeNodeInfos @@ -1488,9 +1487,7 @@ observer.Expect(o => o.UpdateObserver()); calculation.Attach(observer); - 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.Get(context, treeViewControl)).Return(menuBuilder); Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -r0e0eff94d9452eeebda5f68f183414d4ee3df413 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 0e0eff94d9452eeebda5f68f183414d4ee3df413) @@ -52,7 +52,6 @@ using Riskeer.WaveImpactAsphaltCover.Data; using Riskeer.WaveImpactAsphaltCover.Forms.PresentationObjects; using CoreGuiResources = Core.Gui.Properties.Resources; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.WaveImpactAsphaltCover.Plugin.Test.TreeNodeInfos @@ -1173,9 +1172,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); gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); gui.Stub(g => g.MainWindow).Return(mainWindow);