Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/AssessmentSectionMerger.cs =================================================================== diff -u -r5b7ef79633668d91363a37f5451dfaa25df60e07 -r15c1d2fdc2e70b1d921cfb607ee2f650e69e42a2 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/AssessmentSectionMerger.cs (.../AssessmentSectionMerger.cs) (revision 5b7ef79633668d91363a37f5451dfaa25df60e07) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/AssessmentSectionMerger.cs (.../AssessmentSectionMerger.cs) (revision 15c1d2fdc2e70b1d921cfb607ee2f650e69e42a2) @@ -22,7 +22,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Core.Common.Gui; using log4net; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Integration.Data; @@ -32,7 +31,6 @@ using Ringtoets.Integration.Plugin.Properties; using Ringtoets.Integration.Service.Comparers; using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources; -using RingtoetsStorageResources = Ringtoets.Storage.Core.Properties.Resources; namespace Ringtoets.Integration.Plugin { @@ -43,7 +41,7 @@ { private static readonly ILog log = LogManager.GetLogger(typeof(AssessmentSectionMerger)); - private readonly IInquiryHelper inquiryHandler; + private readonly IAssessmentSectionMergeFilePathProvider filePathProvider; private readonly Action getAssessmentSectionsAction; private readonly IAssessmentSectionMergeComparer comparer; private readonly IMergeDataProvider mergeDataProvider; @@ -52,19 +50,19 @@ /// /// Creates a new instance of , /// - /// Object responsible for inquiring the required data. + /// The provider to get the file path of the file to merge. /// The action for getting the assessment sections /// to merge. /// The comparer to compare the assessment sections with. /// The provider to get the data to merge from. /// The handler to perform the merge. /// Thrown when any parameter is null. - public AssessmentSectionMerger(IInquiryHelper inquiryHandler, Action getAssessmentSectionsAction, + public AssessmentSectionMerger(IAssessmentSectionMergeFilePathProvider filePathProvider, Action getAssessmentSectionsAction, IAssessmentSectionMergeComparer comparer, IMergeDataProvider mergeDataProvider, IAssessmentSectionMergeHandler mergeHandler) { - if (inquiryHandler == null) + if (filePathProvider == null) { - throw new ArgumentNullException(nameof(inquiryHandler)); + throw new ArgumentNullException(nameof(filePathProvider)); } if (getAssessmentSectionsAction == null) @@ -87,7 +85,7 @@ throw new ArgumentNullException(nameof(mergeHandler)); } - this.inquiryHandler = inquiryHandler; + this.filePathProvider = filePathProvider; this.getAssessmentSectionsAction = getAssessmentSectionsAction; this.comparer = comparer; this.mergeDataProvider = mergeDataProvider; @@ -107,7 +105,7 @@ throw new ArgumentNullException(nameof(assessmentSection)); } - string filePath = SelectProject(); + string filePath = filePathProvider.GetFilePath(); if (filePath == null) { @@ -154,11 +152,6 @@ PerformMerge(assessmentSection, assessmentSectionToMerge, failureMechanismToMerge); } - private string SelectProject() - { - return inquiryHandler.GetSourceFileLocation(RingtoetsStorageResources.Ringtoets_project_file_filter); - } - private IEnumerable GetAssessmentSections(string filePath) { var assessmentSectionsOwner = new AssessmentSectionsOwner(); @@ -169,7 +162,7 @@ private void PerformMerge(AssessmentSection assessmentSection, AssessmentSection assessmentSectionToMerge, IEnumerable failureMechanismToMerge) { log.InfoFormat(Resources.AssessmentSectionMerger_PerformMerge_Merging_AssessmentSection_0_with_AssessmentSection_1_started, - assessmentSectionToMerge.Name, assessmentSection.Name); + assessmentSectionToMerge.Name, assessmentSection.Name); try { @@ -183,7 +176,6 @@ } } - private static void LogCancelMessage() { log.Info(CoreCommonGuiResources.GuiImportHandler_ImportItemsUsingDialog_Importing_cancelled); Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -r6a408a0c806e8f01025d719542993ce75c3c3211 -r15c1d2fdc2e70b1d921cfb607ee2f650e69e42a2 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 6a408a0c806e8f01025d719542993ce75c3c3211) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 15c1d2fdc2e70b1d921cfb607ee2f650e69e42a2) @@ -278,7 +278,7 @@ assessmentSectionFromFileCommandHandler = new AssessmentSectionFromFileCommandHandler(Gui.MainWindow, Gui, Gui.DocumentViewController); hydraulicBoundaryLocationCalculationGuiService = new HydraulicBoundaryLocationCalculationGuiService(Gui.MainWindow); - assessmentSectionMerger = new AssessmentSectionMerger(new DialogBasedInquiryHelper(Gui.MainWindow), + assessmentSectionMerger = new AssessmentSectionMerger(new AssessmentSectionMergeFilePathProvider(new DialogBasedInquiryHelper(Gui.MainWindow)), (filePath, assessmentSectionOwner) => { ActivityProgressDialogRunner.Run(Gui.MainWindow, Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/AssessmentSectionMergerTest.cs =================================================================== diff -u -r5b7ef79633668d91363a37f5451dfaa25df60e07 -r15c1d2fdc2e70b1d921cfb607ee2f650e69e42a2 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/AssessmentSectionMergerTest.cs (.../AssessmentSectionMergerTest.cs) (revision 5b7ef79633668d91363a37f5451dfaa25df60e07) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/AssessmentSectionMergerTest.cs (.../AssessmentSectionMergerTest.cs) (revision 15c1d2fdc2e70b1d921cfb607ee2f650e69e42a2) @@ -21,7 +21,6 @@ using System; using System.Linq; -using Core.Common.Gui; using Core.Common.TestUtil; using log4net.Core; using NUnit.Framework; @@ -40,7 +39,7 @@ public class AssessmentSectionMergerTest { [Test] - public void Constructor_InquiryHandlerNull_ThrowsArgumentNullException() + public void Constructor_FilePathProviderNull_ThrowsArgumentNullException() { // Setup var mocks = new MockRepository(); @@ -54,7 +53,7 @@ // Assert var exception = Assert.Throws(call); - Assert.AreEqual("inquiryHandler", exception.ParamName); + Assert.AreEqual("filePathProvider", exception.ParamName); mocks.VerifyAll(); } @@ -63,14 +62,14 @@ { // Setup var mocks = new MockRepository(); - var inquiryHelper = mocks.StrictMock(); + var filePathProvider = mocks.StrictMock(); var comparer = mocks.StrictMock(); var mergeDataProvider = mocks.StrictMock(); var mergeHandler = mocks.StrictMock(); mocks.ReplayAll(); // Call - TestDelegate call = () => new AssessmentSectionMerger(inquiryHelper, null, comparer, mergeDataProvider, mergeHandler); + TestDelegate call = () => new AssessmentSectionMerger(filePathProvider, null, comparer, mergeDataProvider, mergeHandler); // Assert var exception = Assert.Throws(call); @@ -83,13 +82,13 @@ { // Setup var mocks = new MockRepository(); - var inquiryHelper = mocks.StrictMock(); + var filePathProvider = mocks.StrictMock(); var mergeDataProvider = mocks.StrictMock(); var mergeHandler = mocks.StrictMock(); mocks.ReplayAll(); // Call - TestDelegate call = () => new AssessmentSectionMerger(inquiryHelper, (path, owner) => {}, null, mergeDataProvider, mergeHandler); + TestDelegate call = () => new AssessmentSectionMerger(filePathProvider, (path, owner) => {}, null, mergeDataProvider, mergeHandler); // Assert var exception = Assert.Throws(call); @@ -102,13 +101,13 @@ { // Setup var mocks = new MockRepository(); - var inquiryHelper = mocks.StrictMock(); + var filePathProvider = mocks.StrictMock(); var comparer = mocks.StrictMock(); var mergeHandler = mocks.StrictMock(); mocks.ReplayAll(); // Call - TestDelegate call = () => new AssessmentSectionMerger(inquiryHelper, (path, owner) => {}, comparer, null, mergeHandler); + TestDelegate call = () => new AssessmentSectionMerger(filePathProvider, (path, owner) => {}, comparer, null, mergeHandler); // Assert var exception = Assert.Throws(call); @@ -121,13 +120,13 @@ { // Setup var mocks = new MockRepository(); - var inquiryHelper = mocks.StrictMock(); + var filePathProvider = mocks.StrictMock(); var comparer = mocks.StrictMock(); var mergeDataProvider = mocks.StrictMock(); mocks.ReplayAll(); // Call - TestDelegate call = () => new AssessmentSectionMerger(inquiryHelper, (path, owner) => {}, comparer, mergeDataProvider, null); + TestDelegate call = () => new AssessmentSectionMerger(filePathProvider, (path, owner) => {}, comparer, mergeDataProvider, null); // Assert var exception = Assert.Throws(call); @@ -140,13 +139,13 @@ { // Setup var mocks = new MockRepository(); - var inquiryHelper = mocks.StrictMock(); + var filePathProvider = mocks.StrictMock(); var comparer = mocks.StrictMock(); var mergeDataProvider = mocks.StrictMock(); var mergeHandler = mocks.StrictMock(); mocks.ReplayAll(); - var merger = new AssessmentSectionMerger(inquiryHelper, (path, owner) => {}, comparer, mergeDataProvider, mergeHandler); + var merger = new AssessmentSectionMerger(filePathProvider, (path, owner) => {}, comparer, mergeDataProvider, mergeHandler); // Call TestDelegate call = () => merger.StartMerge(null); @@ -162,14 +161,14 @@ { // Setup var mocks = new MockRepository(); - var inquiryHelper = mocks.StrictMock(); - inquiryHelper.Expect(helper => helper.GetSourceFileLocation(null)).IgnoreArguments().Return(null); + var filePathProvider = mocks.StrictMock(); + filePathProvider.Expect(helper => helper.GetFilePath()).Return(null); var comparer = mocks.StrictMock(); var mergeDataProvider = mocks.StrictMock(); var mergeHandler = mocks.StrictMock(); mocks.ReplayAll(); - var merger = new AssessmentSectionMerger(inquiryHelper, (path, owner) => {}, comparer, mergeDataProvider, mergeHandler); + var merger = new AssessmentSectionMerger(filePathProvider, (path, owner) => {}, comparer, mergeDataProvider, mergeHandler); // Call Action call = () => merger.StartMerge(new AssessmentSection(AssessmentSectionComposition.Dike)); @@ -184,14 +183,14 @@ { // Given var mocks = new MockRepository(); - var inquiryHelper = mocks.StrictMock(); - inquiryHelper.Expect(helper => helper.GetSourceFileLocation(null)).IgnoreArguments().Return(string.Empty); + var filePathProvider = mocks.StrictMock(); + filePathProvider.Expect(helper => helper.GetFilePath()).Return(string.Empty); var comparer = mocks.StrictMock(); var mergeDataProvider = mocks.StrictMock(); var mergeHandler = mocks.StrictMock(); mocks.ReplayAll(); - var merger = new AssessmentSectionMerger(inquiryHelper, (path, owner) => {}, comparer, mergeDataProvider, mergeHandler); + var merger = new AssessmentSectionMerger(filePathProvider, (path, owner) => {}, comparer, mergeDataProvider, mergeHandler); // When Action call = () => merger.StartMerge(new AssessmentSection(AssessmentSectionComposition.Dike)); @@ -206,16 +205,16 @@ { // Given var mocks = new MockRepository(); - var inquiryHelper = mocks.StrictMock(); - inquiryHelper.Expect(helper => helper.GetSourceFileLocation(null)).IgnoreArguments().Return(string.Empty); + var filePathProvider = mocks.StrictMock(); + filePathProvider.Expect(helper => helper.GetFilePath()).Return(string.Empty); var comparer = mocks.StrictMock(); var mergeDataProvider = mocks.StrictMock(); var mergeHandler = mocks.StrictMock(); mocks.ReplayAll(); Action getAssessmentSectionsAction = (path, owner) => { owner.AssessmentSections = Enumerable.Empty(); }; - var merger = new AssessmentSectionMerger(inquiryHelper, getAssessmentSectionsAction, comparer, mergeDataProvider, mergeHandler); + var merger = new AssessmentSectionMerger(filePathProvider, getAssessmentSectionsAction, comparer, mergeDataProvider, mergeHandler); // When Action call = () => merger.StartMerge(new AssessmentSection(AssessmentSectionComposition.Dike)); @@ -230,8 +229,8 @@ { // Given var mocks = new MockRepository(); - var inquiryHelper = mocks.StrictMock(); - inquiryHelper.Expect(helper => helper.GetSourceFileLocation(null)).IgnoreArguments().Return(string.Empty); + var filePathProvider = mocks.StrictMock(); + filePathProvider.Expect(helper => helper.GetFilePath()).Return(string.Empty); var comparer = mocks.StrictMock(); comparer.Expect(c => c.Compare(null, null)).IgnoreArguments().Return(false); var mergeDataProvider = mocks.StrictMock(); @@ -246,7 +245,7 @@ }; }; - var merger = new AssessmentSectionMerger(inquiryHelper, getAssessmentSectionsAction, comparer, mergeDataProvider, mergeHandler); + var merger = new AssessmentSectionMerger(filePathProvider, getAssessmentSectionsAction, comparer, mergeDataProvider, mergeHandler); // When Action call = () => merger.StartMerge(new AssessmentSection(AssessmentSectionComposition.Dike)); @@ -261,8 +260,8 @@ { // Given var mocks = new MockRepository(); - var inquiryHelper = mocks.StrictMock(); - inquiryHelper.Expect(helper => helper.GetSourceFileLocation(null)).IgnoreArguments().Return(string.Empty); + var filePathProvider = mocks.StrictMock(); + filePathProvider.Expect(helper => helper.GetFilePath()).Return(string.Empty); var comparer = mocks.StrictMock(); comparer.Expect(c => c.Compare(null, null)).IgnoreArguments().Return(true); var mergeDataProvider = mocks.StrictMock(); @@ -278,7 +277,7 @@ }; }; - var merger = new AssessmentSectionMerger(inquiryHelper, getAssessmentSectionsAction, comparer, mergeDataProvider, mergeHandler); + var merger = new AssessmentSectionMerger(filePathProvider, getAssessmentSectionsAction, comparer, mergeDataProvider, mergeHandler); // When Action call = () => merger.StartMerge(new AssessmentSection(AssessmentSectionComposition.Dike)); @@ -293,8 +292,8 @@ { // Given var mocks = new MockRepository(); - var inquiryHelper = mocks.StrictMock(); - inquiryHelper.Expect(helper => helper.GetSourceFileLocation(null)).IgnoreArguments().Return(string.Empty); + var filePathProvider = mocks.StrictMock(); + filePathProvider.Expect(helper => helper.GetFilePath()).Return(string.Empty); var comparer = mocks.StrictMock(); comparer.Expect(c => c.Compare(null, null)).IgnoreArguments().Return(true); var mergeDataProvider = mocks.StrictMock(); @@ -312,7 +311,7 @@ }; }; - var merger = new AssessmentSectionMerger(inquiryHelper, getAssessmentSectionsAction, comparer, mergeDataProvider, mergeHandler); + var merger = new AssessmentSectionMerger(filePathProvider, getAssessmentSectionsAction, comparer, mergeDataProvider, mergeHandler); // When Action call = () => merger.StartMerge(new AssessmentSection(AssessmentSectionComposition.Dike)); @@ -327,8 +326,8 @@ { // Given var mocks = new MockRepository(); - var inquiryHelper = mocks.StrictMock(); - inquiryHelper.Expect(helper => helper.GetSourceFileLocation(null)).IgnoreArguments().Return(string.Empty); + var filePathProvider = mocks.StrictMock(); + filePathProvider.Expect(helper => helper.GetFilePath()).Return(string.Empty); var comparer = mocks.StrictMock(); comparer.Expect(c => c.Compare(null, null)).IgnoreArguments().Return(true); var mergeDataProvider = mocks.StrictMock(); @@ -346,7 +345,7 @@ }; }; - var merger = new AssessmentSectionMerger(inquiryHelper, getAssessmentSectionsAction, comparer, mergeDataProvider, mergeHandler); + var merger = new AssessmentSectionMerger(filePathProvider, getAssessmentSectionsAction, comparer, mergeDataProvider, mergeHandler); // When Action call = () => merger.StartMerge(new AssessmentSection(AssessmentSectionComposition.Dike)); @@ -368,8 +367,8 @@ }; var mocks = new MockRepository(); - var inquiryHelper = mocks.StrictMock(); - inquiryHelper.Expect(helper => helper.GetSourceFileLocation(null)).IgnoreArguments().Return(string.Empty); + var filePathProvider = mocks.StrictMock(); + filePathProvider.Expect(helper => helper.GetFilePath()).Return(string.Empty); var comparer = mocks.StrictMock(); comparer.Expect(c => c.Compare(originalAssessmentSection, assessmentSectionToMerge)).Return(true); var mergeDataProvider = mocks.StrictMock(); @@ -388,7 +387,7 @@ }; }; - var merger = new AssessmentSectionMerger(inquiryHelper, getAssessmentSectionsAction, comparer, mergeDataProvider, mergeHandler); + var merger = new AssessmentSectionMerger(filePathProvider, getAssessmentSectionsAction, comparer, mergeDataProvider, mergeHandler); // When Action call = () => merger.StartMerge(originalAssessmentSection); @@ -416,8 +415,8 @@ }; var mocks = new MockRepository(); - var inquiryHelper = mocks.StrictMock(); - inquiryHelper.Expect(helper => helper.GetSourceFileLocation(null)).IgnoreArguments().Return(string.Empty); + var filePathProvider = mocks.StrictMock(); + filePathProvider.Expect(helper => helper.GetFilePath()).Return(string.Empty); var comparer = mocks.StrictMock(); comparer.Expect(c => c.Compare(originalAssessmentSection, assessmentSectionToMerge)).Return(true); var mergeDataProvider = mocks.StrictMock(); @@ -436,7 +435,7 @@ }; }; - var merger = new AssessmentSectionMerger(inquiryHelper, getAssessmentSectionsAction, comparer, mergeDataProvider, mergeHandler); + var merger = new AssessmentSectionMerger(filePathProvider, getAssessmentSectionsAction, comparer, mergeDataProvider, mergeHandler); // When Action call = () => merger.StartMerge(originalAssessmentSection);