Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb0899d90d287d9e53b52b7573a0c0fd66120fa16 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionCalculationsContextTreeNodeInfoTest.cs (.../DuneErosionCalculationsContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionCalculationsContextTreeNodeInfoTest.cs (.../DuneErosionCalculationsContextTreeNodeInfoTest.cs) (revision b0899d90d287d9e53b52b7573a0c0fd66120fa16) @@ -29,6 +29,7 @@ using Core.Gui.ContextMenu; using Core.Gui.Forms.Main; using Core.Gui.Forms.ViewHost; +using Core.Gui.TestUtil; using Core.Gui.TestUtil.ContextMenu; using NUnit.Framework; using Rhino.Mocks; @@ -45,7 +46,6 @@ using Riskeer.HydraRing.Calculation.Calculator.Factory; using Riskeer.HydraRing.Calculation.Data.Input; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.DuneErosion.Plugin.Test.TreeNodeInfos @@ -284,9 +284,7 @@ using (var treeViewControl = new TreeViewControl()) { var gui = mocksRepository.Stub(); - 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); gui.Stub(g => g.MainWindow).Return(mainWindow); gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb0899d90d287d9e53b52b7573a0c0fd66120fa16 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsContextTreeNodeInfoTest.cs) (revision b0899d90d287d9e53b52b7573a0c0fd66120fa16) @@ -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; @@ -34,6 +33,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; @@ -48,7 +48,6 @@ using Riskeer.HydraRing.Calculation.Data.Input; using Riskeer.HydraRing.Calculation.Data.Input.Hydraulics; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.DuneErosion.Plugin.Test.TreeNodeInfos @@ -393,9 +392,7 @@ var builder = 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(cmp => cmp.Get(context, treeViewControl)).Return(builder); @@ -496,9 +493,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(cmp => cmp.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); @@ -587,9 +582,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(cmp => cmp.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); @@ -677,9 +670,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(cmp => cmp.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb0899d90d287d9e53b52b7573a0c0fd66120fa16 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs) (revision b0899d90d287d9e53b52b7573a0c0fd66120fa16) @@ -31,6 +31,7 @@ using Core.Gui.ContextMenu; using Core.Gui.Forms.Main; using Core.Gui.Forms.ViewHost; +using Core.Gui.TestUtil; using Core.Gui.TestUtil.ContextMenu; using NUnit.Framework; using Rhino.Mocks; @@ -45,7 +46,6 @@ using Riskeer.HydraRing.Calculation.Calculator.Factory; using Riskeer.HydraRing.Calculation.Data.Input; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.DuneErosion.Plugin.Test.TreeNodeInfos @@ -434,9 +434,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/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb0899d90d287d9e53b52b7573a0c0fd66120fa16 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision b0899d90d287d9e53b52b7573a0c0fd66120fa16) @@ -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 NUnit.Extensions.Forms; using NUnit.Framework; @@ -50,7 +51,6 @@ using Riskeer.HydraRing.Calculation.Calculator.Factory; using Riskeer.HydraRing.Calculation.Data.Input; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.GrassCoverErosionInwards.Plugin.Test.TreeNodeInfos @@ -786,9 +786,7 @@ public void GivenValidCalculation_WhenCalculatingFromContextMenu_ThenOutputSetLogMessagesAddedAndUpdateObserver() { // Given - 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 observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb0899d90d287d9e53b52b7573a0c0fd66120fa16 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision b0899d90d287d9e53b52b7573a0c0fd66120fa16) @@ -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.HydraRing.Calculation.Calculator.Factory; using Riskeer.HydraRing.Calculation.Data.Input; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; using GrassCoverErosionInwardsPluginResources = Riskeer.GrassCoverErosionInwards.Plugin.Properties.Resources; @@ -1570,9 +1570,7 @@ public void ContextMenuStrip_ClickOnCalculateAllItem_ScheduleAllChildCalculations() { // Setup - 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 menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb0899d90d287d9e53b52b7573a0c0fd66120fa16 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationsContextTreeNodeInfoTest.cs) (revision b0899d90d287d9e53b52b7573a0c0fd66120fa16) @@ -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; @@ -48,7 +49,6 @@ using Riskeer.HydraRing.Calculation.Calculator.Factory; using Riskeer.HydraRing.Calculation.Data.Input; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.GrassCoverErosionInwards.Plugin.Test.TreeNodeInfos @@ -479,9 +479,7 @@ public void ContextMenuStrip_ClickOnCalculateAllItem_ScheduleAllChildCalculations() { // Setup - 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 menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb0899d90d287d9e53b52b7573a0c0fd66120fa16 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsCalculationsContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsCalculationsContextTreeNodeInfoTest.cs) (revision b0899d90d287d9e53b52b7573a0c0fd66120fa16) @@ -32,6 +32,7 @@ using Core.Gui.ContextMenu; using Core.Gui.Forms.Main; using Core.Gui.Forms.ViewHost; +using Core.Gui.TestUtil; using Core.Gui.TestUtil.ContextMenu; using NUnit.Framework; using Rhino.Mocks; @@ -50,7 +51,6 @@ using Riskeer.HydraRing.Calculation.Data.Input; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; using Riskeer.Revetment.Data; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.GrassCoverErosionOutwards.Plugin.Test.TreeNodeInfos @@ -335,9 +335,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/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb0899d90d287d9e53b52b7573a0c0fd66120fa16 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision b0899d90d287d9e53b52b7573a0c0fd66120fa16) @@ -33,6 +33,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; @@ -48,7 +49,6 @@ using Riskeer.HydraRing.Calculation.Data.Input; using Riskeer.HydraRing.Calculation.Data.Input.Hydraulics; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.GrassCoverErosionOutwards.Plugin.Test.TreeNodeInfos @@ -529,9 +529,7 @@ using (var treeViewControl = new TreeViewControl()) { - var mainWindow = mockRepository.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); var gui = mockRepository.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); @@ -609,9 +607,7 @@ using (var treeViewControl = new TreeViewControl()) { - var mainWindow = mockRepository.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); var gui = mockRepository.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); @@ -687,9 +683,7 @@ using (var treeViewControl = new TreeViewControl()) { - var mainWindow = mockRepository.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); var gui = mockRepository.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); @@ -762,9 +756,7 @@ using (var treeViewControl = new TreeViewControl()) { - var mainWindow = mockRepository.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); var gui = mockRepository.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb0899d90d287d9e53b52b7573a0c0fd66120fa16 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision b0899d90d287d9e53b52b7573a0c0fd66120fa16) @@ -33,6 +33,7 @@ using Core.Gui.ContextMenu; using Core.Gui.Forms.Main; using Core.Gui.Forms.ViewHost; +using Core.Gui.TestUtil; using Core.Gui.TestUtil.ContextMenu; using NUnit.Extensions.Forms; using NUnit.Framework; @@ -51,7 +52,6 @@ using Riskeer.HydraRing.Calculation.Calculator.Factory; using Riskeer.HydraRing.Calculation.Data.Input; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.GrassCoverErosionOutwards.Plugin.Test.TreeNodeInfos @@ -512,9 +512,7 @@ using (var treeViewControl = new TreeViewControl()) { - var mainWindow = mockRepository.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); var gui = mockRepository.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb0899d90d287d9e53b52b7573a0c0fd66120fa16 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision b0899d90d287d9e53b52b7573a0c0fd66120fa16) @@ -35,6 +35,7 @@ using Core.Gui.Forms.ViewHost; using Core.Gui.TestUtil.ContextMenu; using Core.Common.TestUtil; +using Core.Gui.TestUtil; using NUnit.Extensions.Forms; using NUnit.Framework; using Rhino.Mocks; @@ -52,7 +53,6 @@ using Riskeer.HydraRing.Calculation.Data.Input; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; using Riskeer.Revetment.Data; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.GrassCoverErosionOutwards.Plugin.Test.TreeNodeInfos @@ -361,9 +361,7 @@ using (var treeViewControl = new TreeViewControl()) { - var mainWindow = mockRepository.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); var gui = mockRepository.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb0899d90d287d9e53b52b7573a0c0fd66120fa16 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision b0899d90d287d9e53b52b7573a0c0fd66120fa16) @@ -33,6 +33,7 @@ using Core.Gui.Forms.Main; using Core.Gui.TestUtil.ContextMenu; using Core.Common.TestUtil; +using Core.Gui.TestUtil; using NUnit.Extensions.Forms; using NUnit.Framework; using Rhino.Mocks; @@ -51,7 +52,6 @@ using Riskeer.HydraRing.Calculation.Data.Input; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; using Riskeer.Revetment.Data; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.GrassCoverErosionOutwards.Plugin.Test.TreeNodeInfos @@ -1531,13 +1531,11 @@ 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.MainWindow).Return(mainWindow); - gui.Stub(g => g.Get(context, treeViewControl)).Return(menuBuilder);; + gui.Stub(g => g.Get(context, treeViewControl)).Return(menuBuilder); var calculatorFactory = mocks.Stub(); calculatorFactory.Stub(cf => cf.CreateWaveConditionsCosineCalculator(Arg.Is.NotNull)) Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb0899d90d287d9e53b52b7573a0c0fd66120fa16 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision b0899d90d287d9e53b52b7573a0c0fd66120fa16) @@ -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; @@ -54,7 +55,6 @@ using Riskeer.HydraRing.Calculation.TestUtil.Calculator; using Riskeer.Revetment.Data; using CoreGuiResources = Core.Gui.Properties.Resources; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.GrassCoverErosionOutwards.Plugin.Test.TreeNodeInfos @@ -1199,9 +1199,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(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); gui.Stub(g => g.MainWindow).Return(mainWindow); Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb0899d90d287d9e53b52b7573a0c0fd66120fa16 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs) (revision b0899d90d287d9e53b52b7573a0c0fd66120fa16) @@ -33,6 +33,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; @@ -48,7 +49,6 @@ using Riskeer.HydraRing.Calculation.Data.Input; using Riskeer.HydraRing.Calculation.Data.Input.Hydraulics; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.GrassCoverErosionOutwards.Plugin.Test.TreeNodeInfos @@ -521,9 +521,7 @@ { TreeNodeInfo info = GetInfo(plugin); - var mainWindow = mockRepository.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); var gui = mockRepository.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); @@ -590,9 +588,7 @@ using (var treeViewControl = new TreeViewControl()) { - var mainWindow = mockRepository.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); var gui = mockRepository.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); @@ -666,9 +662,7 @@ using (var treeViewControl = new TreeViewControl()) { - var mainWindow = mockRepository.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); var gui = mockRepository.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); @@ -742,9 +736,7 @@ using (var treeViewControl = new TreeViewControl()) { - var mainWindow = mockRepository.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); var gui = mockRepository.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb0899d90d287d9e53b52b7573a0c0fd66120fa16 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs) (revision b0899d90d287d9e53b52b7573a0c0fd66120fa16) @@ -33,6 +33,7 @@ using Core.Gui.ContextMenu; using Core.Gui.Forms.Main; using Core.Gui.Forms.ViewHost; +using Core.Gui.TestUtil; using Core.Gui.TestUtil.ContextMenu; using NUnit.Extensions.Forms; using NUnit.Framework; @@ -51,7 +52,6 @@ using Riskeer.HydraRing.Calculation.Calculator.Factory; using Riskeer.HydraRing.Calculation.Data.Input; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.GrassCoverErosionOutwards.Plugin.Test.TreeNodeInfos @@ -512,9 +512,7 @@ using (var treeViewControl = new TreeViewControl()) { - var mainWindow = mockRepository.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); var gui = mockRepository.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb0899d90d287d9e53b52b7573a0c0fd66120fa16 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision b0899d90d287d9e53b52b7573a0c0fd66120fa16) @@ -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.HydraRing.Calculation.Data.Input; using Riskeer.HydraRing.Calculation.Data.Input.Structures; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.HeightStructures.Plugin.Test.TreeNodeInfos @@ -1129,9 +1129,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/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb0899d90d287d9e53b52b7573a0c0fd66120fa16 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationScenarioContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationScenarioContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationScenarioContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationScenarioContextTreeNodeInfoTest.cs) (revision b0899d90d287d9e53b52b7573a0c0fd66120fa16) @@ -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.HydraRing.Calculation.Data.Input; using Riskeer.HydraRing.Calculation.Data.Input.Structures; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.HeightStructures.Plugin.Test.TreeNodeInfos @@ -1091,9 +1091,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/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb0899d90d287d9e53b52b7573a0c0fd66120fa16 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationsContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationsContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationsContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationsContextTreeNodeInfoTest.cs) (revision b0899d90d287d9e53b52b7573a0c0fd66120fa16) @@ -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.HydraRing.Calculation.Data.Input; using Riskeer.HydraRing.Calculation.Data.Input.Structures; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.HeightStructures.Plugin.Test.TreeNodeInfos @@ -520,9 +520,7 @@ 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/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb0899d90d287d9e53b52b7573a0c0fd66120fa16 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision b0899d90d287d9e53b52b7573a0c0fd66120fa16) @@ -35,6 +35,7 @@ using Core.Gui.ContextMenu; using Core.Gui.Forms.Main; using Core.Gui.Forms.ViewHost; +using Core.Gui.TestUtil; using Core.Gui.TestUtil.ContextMenu; using NUnit.Extensions.Forms; using NUnit.Framework; @@ -50,7 +51,6 @@ using Riskeer.HydraRing.Calculation.Data.Input.Hydraulics; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; using Riskeer.Integration.Data; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos @@ -510,9 +510,7 @@ using (var treeViewControl = new TreeViewControl()) { - var mainWindow = mockRepository.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); var gui = mockRepository.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); @@ -600,9 +598,7 @@ using (var treeViewControl = new TreeViewControl()) { - var mainWindow = mockRepository.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); var gui = mockRepository.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); @@ -689,9 +685,7 @@ using (var treeViewControl = new TreeViewControl()) { - var mainWindow = mockRepository.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); var gui = mockRepository.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); @@ -772,9 +766,7 @@ using (var treeViewControl = new TreeViewControl()) { - var mainWindow = mockRepository.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); var gui = mockRepository.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb0899d90d287d9e53b52b7573a0c0fd66120fa16 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision b0899d90d287d9e53b52b7573a0c0fd66120fa16) @@ -35,6 +35,7 @@ using Core.Gui.ContextMenu; using Core.Gui.Forms.Main; using Core.Gui.Forms.ViewHost; +using Core.Gui.TestUtil; using Core.Gui.TestUtil.ContextMenu; using NUnit.Extensions.Forms; using NUnit.Framework; @@ -50,7 +51,6 @@ using Riskeer.HydraRing.Calculation.Calculator.Factory; using Riskeer.HydraRing.Calculation.Data.Input; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos @@ -453,9 +453,7 @@ using (var treeViewControl = new TreeViewControl()) { - var mainWindow = mockRepository.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); var gui = mockRepository.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb0899d90d287d9e53b52b7573a0c0fd66120fa16 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision b0899d90d287d9e53b52b7573a0c0fd66120fa16) @@ -36,6 +36,7 @@ using Core.Gui.Forms.Main; using Core.Gui.Forms.ViewHost; using Core.Gui.Plugin; +using Core.Gui.TestUtil; using Core.Gui.TestUtil.ContextMenu; using NUnit.Extensions.Forms; using NUnit.Framework; @@ -52,7 +53,6 @@ using Riskeer.HydraRing.Calculation.TestUtil.Calculator; using Riskeer.Integration.Data; using Riskeer.Integration.Forms.PresentationObjects; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos @@ -556,9 +556,7 @@ using (var treeViewControl = new TreeViewControl()) using (var plugin = new RiskeerPlugin()) { - 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/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb0899d90d287d9e53b52b7573a0c0fd66120fa16 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsContextTreeNodeInfoTest.cs) (revision b0899d90d287d9e53b52b7573a0c0fd66120fa16) @@ -35,6 +35,7 @@ using Core.Gui.ContextMenu; using Core.Gui.Forms.Main; using Core.Gui.Forms.ViewHost; +using Core.Gui.TestUtil; using Core.Gui.TestUtil.ContextMenu; using NUnit.Extensions.Forms; using NUnit.Framework; @@ -50,7 +51,6 @@ using Riskeer.HydraRing.Calculation.Data.Input.Hydraulics; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; using Riskeer.Integration.Data; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos @@ -510,16 +510,14 @@ using (var treeViewControl = new TreeViewControl()) { - var mainWindow = mockRepository.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); var gui = mockRepository.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); - ; + gui.Stub(g => g.DocumentViewController).Return(mockRepository.Stub()); gui.Stub(g => g.ViewCommands).Return(mockRepository.Stub()); gui.Stub(g => g.ProjectStore).Return(mockRepository.Stub()); @@ -601,9 +599,7 @@ using (var treeViewControl = new TreeViewControl()) { - var mainWindow = mockRepository.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); var gui = mockRepository.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); @@ -690,9 +686,7 @@ using (var treeViewControl = new TreeViewControl()) { - var mainWindow = mockRepository.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); var gui = mockRepository.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); @@ -775,9 +769,7 @@ using (var treeViewControl = new TreeViewControl()) { - var mainWindow = mockRepository.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); var gui = mockRepository.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -rb0899d90d287d9e53b52b7573a0c0fd66120fa16 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs) (revision b0899d90d287d9e53b52b7573a0c0fd66120fa16) @@ -35,6 +35,7 @@ using Core.Gui.ContextMenu; using Core.Gui.Forms.Main; using Core.Gui.Forms.ViewHost; +using Core.Gui.TestUtil; using Core.Gui.TestUtil.ContextMenu; using NUnit.Extensions.Forms; using NUnit.Framework; @@ -50,7 +51,6 @@ using Riskeer.HydraRing.Calculation.Calculator.Factory; using Riskeer.HydraRing.Calculation.Data.Input; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; -using CoreGuiTestUtilResources = Core.Gui.TestUtil.Properties.Resources; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.Integration.Plugin.Test.TreeNodeInfos @@ -453,9 +453,7 @@ using (var treeViewControl = new TreeViewControl()) { - var mainWindow = mockRepository.Stub(); - mainWindow.Stub(mw => mw.ApplicationIcon).Return(CoreGuiTestUtilResources.TestIcon); - mainWindow.Stub(mw => mw.Handle).Return(IntPtr.Zero); + IMainWindow mainWindow = MainWindowTestHelper.CreateMainWindowStub(mockRepository); var gui = mockRepository.Stub(); gui.Stub(g => g.MainWindow).Return(mainWindow);