Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs =================================================================== diff -u -r5c56ca54e5c2522110c5c9f1d7cf0d02393cb376 -re35ffc492405e22b041aee22033f7ebc4b942036 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision 5c56ca54e5c2522110c5c9f1d7cf0d02393cb376) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision e35ffc492405e22b041aee22033f7ebc4b942036) @@ -102,47 +102,6 @@ } [Test] - public void PerformMerge_SourceAssessmentSectionNull_ThrowsArgumentNullException() - { - // Setup - var mocks = new MockRepository(); - var viewCommands = mocks.StrictMock(); - mocks.ReplayAll(); - - var handler = new AssessmentSectionMergeHandler(viewCommands); - - // Call - TestDelegate call = () => handler.PerformMerge(new AssessmentSection(AssessmentSectionComposition.Dike), - null, Enumerable.Empty()); - - // Assert - var exception = Assert.Throws(call); - Assert.AreEqual("sourceAssessmentSection", exception.ParamName); - mocks.VerifyAll(); - } - - [Test] - public void PerformMerge_FailureMechanismsToMergeNull_ThrowsArgumentNullException() - { - // Setup - var mocks = new MockRepository(); - var viewCommands = mocks.StrictMock(); - mocks.ReplayAll(); - - var handler = new AssessmentSectionMergeHandler(viewCommands); - - // Call - TestDelegate call = () => handler.PerformMerge(new AssessmentSection(AssessmentSectionComposition.Dike), - new AssessmentSection(AssessmentSectionComposition.Dike), - null); - - // Assert - var exception = Assert.Throws(call); - Assert.AreEqual("failureMechanismsToMerge", exception.ParamName); - mocks.VerifyAll(); - } - - [Test] public void PerformMerge_MergeDataNull_ThrowsArgumentNullException() { // Setup @@ -290,29 +249,6 @@ } [Test] - public void PerformMerge_WithFailureMechanismThatCannotBeMerged_ThrowsNotSupportedException() - { - // Setup - var mocks = new MockRepository(); - var viewCommands = mocks.Stub(); - mocks.ReplayAll(); - - var handler = new AssessmentSectionMergeHandler(viewCommands); - var targetAssessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - var sourceAssessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - - // Call - TestDelegate call = () => handler.PerformMerge(targetAssessmentSection, sourceAssessmentSection, new[] - { - new TestFailureMechanism() - }); - - // Assert - var exception = Assert.Throws(call); - Assert.AreEqual("Failure mechanism can't be merged.", exception.Message); - } - - [Test] public void PerformMerge_WithAllFailureMechanismsToMerge_LogMessages() { // Setup @@ -580,7 +516,7 @@ // When - handler.PerformMerge(targetAssessmentSection, + handler.PerformMerge(targetAssessmentSection, new AssessmentSectionMergeData( sourceAssessmentSection, Enumerable.Empty(),