Index: Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs =================================================================== diff -u -r4c288b5894b926ba5fdd7f6222c813c19b9701b8 -r540cb5503a23ea9ea7b1e633888df92fa0531151 --- Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs (.../HydraulicBoundaryLocationCalculationGuiService.cs) (revision 4c288b5894b926ba5fdd7f6222c813c19b9701b8) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs (.../HydraulicBoundaryLocationCalculationGuiService.cs) (revision 540cb5503a23ea9ea7b1e633888df92fa0531151) @@ -106,9 +106,9 @@ messageProvider)); } - public void RunActivities(string hydraulicBoundaryDatabaseFilePath, - string preprocessorDirectory, - IEnumerable activities) + private void RunActivities(string hydraulicBoundaryDatabaseFilePath, + string preprocessorDirectory, + IEnumerable activities) where TActivity : Activity { if (activities == null) Index: Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/IHydraulicBoundaryLocationCalculationGuiService.cs =================================================================== diff -u -r4c288b5894b926ba5fdd7f6222c813c19b9701b8 -r540cb5503a23ea9ea7b1e633888df92fa0531151 --- Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/IHydraulicBoundaryLocationCalculationGuiService.cs (.../IHydraulicBoundaryLocationCalculationGuiService.cs) (revision 4c288b5894b926ba5fdd7f6222c813c19b9701b8) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/IHydraulicBoundaryLocationCalculationGuiService.cs (.../IHydraulicBoundaryLocationCalculationGuiService.cs) (revision 540cb5503a23ea9ea7b1e633888df92fa0531151) @@ -21,7 +21,6 @@ using System; using System.Collections.Generic; -using Core.Common.Base.Service; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Service.MessageProviders; @@ -67,18 +66,5 @@ IEnumerable calculations, double norm, ICalculationMessageProvider messageProvider); - - /// - /// Runs the given . - /// - /// The type of activity to run. - /// The path of the hydraulic boundary database file. - /// The preprocessor directory. - /// The collection of to run. - /// Thrown when is null. - void RunActivities(string hydraulicBoundaryDatabaseFilePath, - string preprocessorDirectory, - IEnumerable activities) - where TActivity : Activity; } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs =================================================================== diff -u -rb6f3b68404cad00988843342f68022dc743e74c1 -r540cb5503a23ea9ea7b1e633888df92fa0531151 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs (.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs) (revision b6f3b68404cad00988843342f68022dc743e74c1) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs (.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs) (revision 540cb5503a23ea9ea7b1e633888df92fa0531151) @@ -23,7 +23,6 @@ using System.IO; using System.Linq; using System.Windows.Forms; -using Core.Common.Base.Service; using Core.Common.TestUtil; using NUnit.Extensions.Forms; using NUnit.Framework; @@ -422,100 +421,9 @@ mockRepository.VerifyAll(); } - [Test] - public void RunActivities_ActivitiesNull_ThrowsArgumentNullException() - { - // Setup - using (var viewParent = new Form()) - { - var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent); - - // Call - TestDelegate test = () => guiService.RunActivities(validFilePath, validPreprocessorDirectory, null); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("activities", paramName); - } - } - - [Test] - public void RunActivities_HydraulicDatabaseDoesNotExist_LogsError() - { - // Setup - using (var viewParent = new Form()) - { - var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent); - - // Call - Action call = () => guiService.RunActivities("Does not exist", - validPreprocessorDirectory, - Enumerable.Empty()); - - // Assert - TestHelper.AssertLogMessages(call, messages => - { - string[] msgs = messages.ToArray(); - Assert.AreEqual(1, msgs.Length); - StringAssert.StartsWith("Berekeningen konden niet worden gestart. ", msgs.First()); - }); - } - } - - [Test] - public void RunActivities_WithActivities_RunsActivities() - { - // Setup - using (var viewParent = new Form()) - { - var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent); - var activity = new TestActivity(); - - DialogBoxHandler = (name, wnd) => - { - // Expect an activity dialog which is automatically closed - }; - - // Precondition - Assert.IsFalse(activity.HasRun); - - // Call - Action call = () => guiService.RunActivities(validFilePath, - validPreprocessorDirectory, - new[] - { - activity - }); - - // Assert - TestHelper.AssertLogMessages(call, messages => - { - string[] msgs = messages.ToArray(); - Assert.AreEqual(2, msgs.Length); - StringAssert.AreNotEqualIgnoringCase("is gestart.", msgs[0]); - StringAssert.AreNotEqualIgnoringCase("is gelukt.", msgs[1]); - }); - Assert.IsTrue(activity.HasRun); - } - } - public override void Setup() { mockRepository = new MockRepository(); } - - private class TestActivity : Activity - { - public bool HasRun { get; private set; } - - protected override void OnRun() - { - HasRun = true; - } - - protected override void OnCancel() {} - - protected override void OnFinish() {} - } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -rb6f3b68404cad00988843342f68022dc743e74c1 -r540cb5503a23ea9ea7b1e633888df92fa0531151 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision b6f3b68404cad00988843342f68022dc743e74c1) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 540cb5503a23ea9ea7b1e633888df92fa0531151) @@ -1035,7 +1035,7 @@ failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.FactorizedLowerLimitNorm), new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonPluginResources.Hydraulic_category_boundary_factorizedLowerLimitNorm_name))); - hydraulicBoundaryLocationCalculationGuiService.RunActivities(hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, calculations); + ActivityProgressDialogRunner.Run(Gui.MainWindow, calculations); }); SetHydraulicsMenuItemEnabledStateAndTooltip(assessmentSection, waveHeightItem); @@ -1144,7 +1144,7 @@ failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.FactorizedLowerLimitNorm), new WaveHeightCalculationMessageProvider(RingtoetsCommonPluginResources.Hydraulic_category_boundary_factorizedLowerLimitNorm_name))); - hydraulicBoundaryLocationCalculationGuiService.RunActivities(hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, calculations); + ActivityProgressDialogRunner.Run(Gui.MainWindow, calculations); }); SetHydraulicsMenuItemEnabledStateAndTooltip(assessmentSection, waveHeightItem); Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -rd3b14a0f327184e0239e5239c826805c565fe8be -r540cb5503a23ea9ea7b1e633888df92fa0531151 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision d3b14a0f327184e0239e5239c826805c565fe8be) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 540cb5503a23ea9ea7b1e633888df92fa0531151) @@ -32,6 +32,7 @@ using Core.Common.Gui; using Core.Common.Gui.ContextMenu; using Core.Common.Gui.Forms; +using Core.Common.Gui.Forms.ProgressDialog; using Core.Common.Gui.Plugin; using Core.Common.Util; using Core.Common.Util.Extensions; @@ -1985,7 +1986,7 @@ assessmentSection.GetNorm(AssessmentSectionCategoryType.FactorizedLowerLimitNorm), new DesignWaterLevelCalculationMessageProvider(Resources.Hydraulic_category_boundary_factorizedLowerLimitNorm_name))); - hydraulicBoundaryLocationCalculationGuiService.RunActivities(hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, calculations); + ActivityProgressDialogRunner.Run(Gui.MainWindow, calculations); }); SetHydraulicsMenuItemEnabledStateAndTooltip(assessmentSection, designWaterLevelItem); @@ -2044,7 +2045,7 @@ assessmentSection.GetNorm(AssessmentSectionCategoryType.FactorizedLowerLimitNorm), new WaveHeightCalculationMessageProvider(Resources.Hydraulic_category_boundary_factorizedLowerLimitNorm_name))); - hydraulicBoundaryLocationCalculationGuiService.RunActivities(hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, calculations); + ActivityProgressDialogRunner.Run(Gui.MainWindow, calculations); }); SetHydraulicsMenuItemEnabledStateAndTooltip(assessmentSection, waveHeightItem);