Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs =================================================================== diff -u -rbbe05cc3ea48be765fc7cf54a6ed750d4af5c319 -r8f1aa8966d866743c259bb14fb4bff7a9e76a703 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs (.../AssessmentSectionMergeDataProviderDialog.cs) (revision bbe05cc3ea48be765fc7cf54a6ed750d4af5c319) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs (.../AssessmentSectionMergeDataProviderDialog.cs) (revision 8f1aa8966d866743c259bb14fb4bff7a9e76a703) @@ -37,7 +37,7 @@ /// and its to use for merging the data. The selections /// can be obtained upon closing the dialog. /// - public partial class AssessmentSectionMergeDataProviderDialog : DialogBase, IMergeDataProvider + public partial class AssessmentSectionMergeDataProviderDialog : DialogBase, IAssessmentSectionMergeDataProvider { private FailureMechanismMergeDataRow[] failureMechanismMergeDataRows; private bool assessmentSectionComboBoxUpdating; Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/IAssessmentSectionMergeDataProvider.cs =================================================================== diff -u -r469c1810a2cc836791b78d185c7c1b0d414ec472 -r8f1aa8966d866743c259bb14fb4bff7a9e76a703 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/IAssessmentSectionMergeDataProvider.cs (.../IAssessmentSectionMergeDataProvider.cs) (revision 469c1810a2cc836791b78d185c7c1b0d414ec472) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/IAssessmentSectionMergeDataProvider.cs (.../IAssessmentSectionMergeDataProvider.cs) (revision 8f1aa8966d866743c259bb14fb4bff7a9e76a703) @@ -21,8 +21,8 @@ using System; using System.Collections.Generic; +using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Integration.Data; -using Ringtoets.Integration.Data.Merge; namespace Ringtoets.Integration.Forms.Merge { @@ -32,13 +32,22 @@ public interface IAssessmentSectionMergeDataProvider { /// - /// Gets the data to merge. + /// Gets the selected . /// - /// The collection of assessment sections to get the merge - /// data from. - /// The selected merge data. + AssessmentSection SelectedAssessmentSection { get; } + + /// + /// Gets the collection of selected . + /// + IEnumerable SelectedFailureMechanisms { get; } + + /// + /// Select the data to merge. + /// + /// The collection of assessment sections to select from. + /// Indicator whether selection succeeded. /// Thrown when /// is null. - AssessmentSectionMergeData GetMergeData(IEnumerable assessmentSections); + bool SelectData(IEnumerable assessmentSections); } } \ No newline at end of file Fisheye: Tag 8f1aa8966d866743c259bb14fb4bff7a9e76a703 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/IMergeDataProvider.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj =================================================================== diff -u -r5ee30eaa00a9dd80cd118a2d1c41da13bb9cf67f -r8f1aa8966d866743c259bb14fb4bff7a9e76a703 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj (.../Ringtoets.Integration.Forms.csproj) (revision 5ee30eaa00a9dd80cd118a2d1c41da13bb9cf67f) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj (.../Ringtoets.Integration.Forms.csproj) (revision 8f1aa8966d866743c259bb14fb4bff7a9e76a703) @@ -44,7 +44,7 @@ - + Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMerger.cs =================================================================== diff -u -rec4f74f82ab2f95e1ea20313b1bba8404f3222c9 -r8f1aa8966d866743c259bb14fb4bff7a9e76a703 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMerger.cs (.../AssessmentSectionMerger.cs) (revision ec4f74f82ab2f95e1ea20313b1bba8404f3222c9) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMerger.cs (.../AssessmentSectionMerger.cs) (revision 8f1aa8966d866743c259bb14fb4bff7a9e76a703) @@ -43,7 +43,7 @@ private readonly IAssessmentSectionMergeFilePathProvider filePathProvider; private readonly IAssessmentSectionProvider assessmentSectionProvider; private readonly IAssessmentSectionMergeComparer comparer; - private readonly IMergeDataProvider mergeDataProvider; + private readonly IAssessmentSectionMergeDataProvider mergeDataProvider; private readonly IAssessmentSectionMergeHandler mergeHandler; /// @@ -56,7 +56,7 @@ /// The handler to perform the merge. /// Thrown when any parameter is null. public AssessmentSectionMerger(IAssessmentSectionMergeFilePathProvider filePathProvider, IAssessmentSectionProvider assessmentSectionProvider, - IAssessmentSectionMergeComparer comparer, IMergeDataProvider mergeDataProvider, IAssessmentSectionMergeHandler mergeHandler) + IAssessmentSectionMergeComparer comparer, IAssessmentSectionMergeDataProvider mergeDataProvider, IAssessmentSectionMergeHandler mergeHandler) { if (filePathProvider == null) { Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs =================================================================== diff -u -rbcaa77cec41e488c4715b68a8487db377310acac -r8f1aa8966d866743c259bb14fb4bff7a9e76a703 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs (.../AssessmentSectionMergeDataProviderDialogTest.cs) (revision bcaa77cec41e488c4715b68a8487db377310acac) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs (.../AssessmentSectionMergeDataProviderDialogTest.cs) (revision 8f1aa8966d866743c259bb14fb4bff7a9e76a703) @@ -76,7 +76,7 @@ { // Assert Assert.IsInstanceOf(dialog); - Assert.IsInstanceOf(dialog); + Assert.IsInstanceOf(dialog); Assert.AreEqual("Selecteer trajectinformatie", dialog.Text); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergerTest.cs =================================================================== diff -u -rec4f74f82ab2f95e1ea20313b1bba8404f3222c9 -r8f1aa8966d866743c259bb14fb4bff7a9e76a703 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergerTest.cs (.../AssessmentSectionMergerTest.cs) (revision ec4f74f82ab2f95e1ea20313b1bba8404f3222c9) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergerTest.cs (.../AssessmentSectionMergerTest.cs) (revision 8f1aa8966d866743c259bb14fb4bff7a9e76a703) @@ -45,7 +45,7 @@ var mocks = new MockRepository(); var assessmentSectionProvider = mocks.StrictMock(); var comparer = mocks.StrictMock(); - var mergeDataProvider = mocks.StrictMock(); + var mergeDataProvider = mocks.StrictMock(); var mergeHandler = mocks.StrictMock(); mocks.ReplayAll(); @@ -65,7 +65,7 @@ var mocks = new MockRepository(); var filePathProvider = mocks.StrictMock(); var comparer = mocks.StrictMock(); - var mergeDataProvider = mocks.StrictMock(); + var mergeDataProvider = mocks.StrictMock(); var mergeHandler = mocks.StrictMock(); mocks.ReplayAll(); @@ -85,7 +85,7 @@ var mocks = new MockRepository(); var filePathProvider = mocks.StrictMock(); var assessmentSectionProvider = mocks.StrictMock(); - var mergeDataProvider = mocks.StrictMock(); + var mergeDataProvider = mocks.StrictMock(); var mergeHandler = mocks.StrictMock(); mocks.ReplayAll(); @@ -114,7 +114,7 @@ // Assert var exception = Assert.Throws(call); - Assert.AreEqual("mergeDataProvider", exception.ParamName); + Assert.AreEqual("assessmentSectionMergeDataProvider", exception.ParamName); mocks.VerifyAll(); } @@ -126,7 +126,7 @@ var filePathProvider = mocks.StrictMock(); var assessmentSectionProvider = mocks.StrictMock(); var comparer = mocks.StrictMock(); - var mergeDataProvider = mocks.StrictMock(); + var mergeDataProvider = mocks.StrictMock(); mocks.ReplayAll(); // Call @@ -146,7 +146,7 @@ var filePathProvider = mocks.StrictMock(); var assessmentSectionProvider = mocks.StrictMock(); var comparer = mocks.StrictMock(); - var mergeDataProvider = mocks.StrictMock(); + var mergeDataProvider = mocks.StrictMock(); var mergeHandler = mocks.StrictMock(); mocks.ReplayAll(); @@ -170,7 +170,7 @@ filePathProvider.Expect(helper => helper.GetFilePath()).Return(null); var assessmentSectionProvider = mocks.StrictMock(); var comparer = mocks.StrictMock(); - var mergeDataProvider = mocks.StrictMock(); + var mergeDataProvider = mocks.StrictMock(); var mergeHandler = mocks.StrictMock(); mocks.ReplayAll(); @@ -195,7 +195,7 @@ assessmentSectionProvider.Expect(asp => asp.GetAssessmentSections(null)).IgnoreArguments() .Throw(new AssessmentSectionProviderException()); var comparer = mocks.StrictMock(); - var mergeDataProvider = mocks.StrictMock(); + var mergeDataProvider = mocks.StrictMock(); var mergeHandler = mocks.StrictMock(); mocks.ReplayAll(); @@ -220,7 +220,7 @@ assessmentSectionProvider.Expect(asp => asp.GetAssessmentSections(null)).IgnoreArguments() .Return(Enumerable.Empty()); var comparer = mocks.StrictMock(); - var mergeDataProvider = mocks.StrictMock(); + var mergeDataProvider = mocks.StrictMock(); var mergeHandler = mocks.StrictMock(); mocks.ReplayAll(); @@ -249,7 +249,7 @@ }); var comparer = mocks.StrictMock(); comparer.Expect(c => c.Compare(null, null)).IgnoreArguments().Return(false); - var mergeDataProvider = mocks.StrictMock(); + var mergeDataProvider = mocks.StrictMock(); var mergeHandler = mocks.StrictMock(); mocks.ReplayAll(); @@ -278,7 +278,7 @@ }); var comparer = mocks.StrictMock(); comparer.Expect(c => c.Compare(null, null)).IgnoreArguments().Return(true); - var mergeDataProvider = mocks.StrictMock(); + var mergeDataProvider = mocks.StrictMock(); mergeDataProvider.Expect(mdp => mdp.SelectData(null)).IgnoreArguments().Return(false); var mergeHandler = mocks.StrictMock(); mocks.ReplayAll(); @@ -308,7 +308,7 @@ }); var comparer = mocks.StrictMock(); comparer.Expect(c => c.Compare(null, null)).IgnoreArguments().Return(true); - var mergeDataProvider = mocks.StrictMock(); + var mergeDataProvider = mocks.StrictMock(); mergeDataProvider.Expect(mdp => mdp.SelectData(null)).IgnoreArguments().Return(true); mergeDataProvider.Expect(mdp => mdp.SelectedAssessmentSection).Return(null); mergeDataProvider.Expect(mdp => mdp.SelectedFailureMechanisms).Return(Enumerable.Empty()); @@ -340,7 +340,7 @@ }); var comparer = mocks.StrictMock(); comparer.Expect(c => c.Compare(null, null)).IgnoreArguments().Return(true); - var mergeDataProvider = mocks.StrictMock(); + var mergeDataProvider = mocks.StrictMock(); mergeDataProvider.Expect(mdp => mdp.SelectData(null)).IgnoreArguments().Return(true); mergeDataProvider.Expect(mdp => mdp.SelectedAssessmentSection).Return(new AssessmentSection(AssessmentSectionComposition.Dike)); mergeDataProvider.Expect(mdp => mdp.SelectedFailureMechanisms).Return(null); @@ -380,7 +380,7 @@ }); var comparer = mocks.StrictMock(); comparer.Expect(c => c.Compare(originalAssessmentSection, assessmentSectionToMerge)).Return(true); - var mergeDataProvider = mocks.StrictMock(); + var mergeDataProvider = mocks.StrictMock(); mergeDataProvider.Expect(mdp => mdp.SelectData(null)).IgnoreArguments().Return(true); mergeDataProvider.Expect(mdp => mdp.SelectedAssessmentSection).Return(assessmentSectionToMerge); mergeDataProvider.Expect(mdp => mdp.SelectedFailureMechanisms).Return(failureMechanismsToMerge); @@ -426,7 +426,7 @@ }); var comparer = mocks.StrictMock(); comparer.Expect(c => c.Compare(originalAssessmentSection, assessmentSectionToMerge)).Return(true); - var mergeDataProvider = mocks.StrictMock(); + var mergeDataProvider = mocks.StrictMock(); mergeDataProvider.Expect(mdp => mdp.SelectData(null)).IgnoreArguments().Return(true); mergeDataProvider.Expect(mdp => mdp.SelectedAssessmentSection).Return(assessmentSectionToMerge); mergeDataProvider.Expect(mdp => mdp.SelectedFailureMechanisms).Return(failureMechanismsToMerge);