Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Merge/AssessmentSectionMergeData.cs
===================================================================
diff -u -r8f36c222f60f63f1aefe0a7c4ef44be6738a3bb5 -re5dda4058c572ba943002d130b8591a90ee19ce9
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Merge/AssessmentSectionMergeData.cs (.../AssessmentSectionMergeData.cs) (revision 8f36c222f60f63f1aefe0a7c4ef44be6738a3bb5)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Merge/AssessmentSectionMergeData.cs (.../AssessmentSectionMergeData.cs) (revision e5dda4058c572ba943002d130b8591a90ee19ce9)
@@ -20,8 +20,6 @@
// All rights reserved.
using System;
-using System.Collections.Generic;
-using Ringtoets.Common.Data.FailureMechanism;
namespace Ringtoets.Integration.Data.Merge
{
@@ -34,30 +32,23 @@
/// Creates a new instance of .
///
/// The assessment section to merge.
- /// The failure mechanisms to merge.
/// The container of the properties for the
- /// .
+ /// .
/// Thrown when any parameter is null.
- public AssessmentSectionMergeData(AssessmentSection assessmentSection, IEnumerable failureMechanisms,
+ public AssessmentSectionMergeData(AssessmentSection assessmentSection,
ConstructionProperties properties)
{
if (assessmentSection == null)
{
throw new ArgumentNullException(nameof(assessmentSection));
}
- if (failureMechanisms == null)
- {
- throw new ArgumentNullException(nameof(failureMechanisms));
- }
-
if (properties == null)
{
throw new ArgumentNullException(nameof(properties));
}
AssessmentSection = assessmentSection;
- FailureMechanisms = failureMechanisms;
MergePiping = properties.MergePiping;
MergeGrassCoverErosionInwards = properties.MergeGrassCoverErosionInwards;
@@ -85,11 +76,6 @@
public AssessmentSection AssessmentSection { get; }
///
- /// Gets the failure mechanisms to merge.
- ///
- public IEnumerable FailureMechanisms { get; }
-
- ///
/// Gets the indicator whether piping should be merged.
///
public bool MergePiping { get; }
@@ -172,7 +158,7 @@
///
/// Gets the indicator whether dune erosion should be merged.
///
- public bool MergeDuneErosion{ get; }
+ public bool MergeDuneErosion { get; }
///
/// Gets the indicator whether technical innovation should be merged.
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs
===================================================================
diff -u -r582432119b4c0192b488bdaa49179637fe6e5d2b -re5dda4058c572ba943002d130b8591a90ee19ce9
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs (.../AssessmentSectionMergeDataProviderDialog.cs) (revision 582432119b4c0192b488bdaa49179637fe6e5d2b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs (.../AssessmentSectionMergeDataProviderDialog.cs) (revision e5dda4058c572ba943002d130b8591a90ee19ce9)
@@ -102,23 +102,15 @@
MergeStrengthStabilityLengthwiseConstruction = FailureMechanismIsSelectedToMerge(),
MergeDuneErosion = FailureMechanismIsSelectedToMerge(),
MergeTechnicalInnovation = FailureMechanismIsSelectedToMerge()
- };
+ };
return new AssessmentSectionMergeData((AssessmentSection) assessmentSectionComboBox.SelectedItem,
- failureMechanismMergeDataRows.Where(row => row.IsSelected)
- .Select(row => row.FailureMechanism)
- .ToArray(),
constructionProperties);
}
+
return null;
}
- private bool FailureMechanismIsSelectedToMerge()
- where TFailureMechanism : IFailureMechanism
- {
- return failureMechanismMergeDataRows.Any(row => row.FailureMechanism is TFailureMechanism && row.IsSelected);
- }
-
protected override Button GetCancelButton()
{
return cancelButton;
@@ -153,6 +145,12 @@
toolTip.SetToolTip(infoIcon, Resources.AssessmentSectionMergeDataProviderDialog_InfoToolTip);
}
+ private bool FailureMechanismIsSelectedToMerge()
+ where TFailureMechanism : IFailureMechanism
+ {
+ return failureMechanismMergeDataRows.Any(row => row.FailureMechanism is TFailureMechanism && row.IsSelected);
+ }
+
#region Event Handling
private void AssessmentSectionComboBox_OnSelectedIndexChanged(object sender, EventArgs eventArgs)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Merge/AssessmentSectionMergeDataTest.cs
===================================================================
diff -u -r21d784efbcfe4ce1a8a9242b219695ebaf0eb3e3 -re5dda4058c572ba943002d130b8591a90ee19ce9
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Merge/AssessmentSectionMergeDataTest.cs (.../AssessmentSectionMergeDataTest.cs) (revision 21d784efbcfe4ce1a8a9242b219695ebaf0eb3e3)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Merge/AssessmentSectionMergeDataTest.cs (.../AssessmentSectionMergeDataTest.cs) (revision e5dda4058c572ba943002d130b8591a90ee19ce9)
@@ -37,32 +37,18 @@
public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
{
// Call
- TestDelegate call = () => new AssessmentSectionMergeData(null, Enumerable.Empty(),
- new AssessmentSectionMergeData.ConstructionProperties());
+ TestDelegate call = () => new AssessmentSectionMergeData(null, new AssessmentSectionMergeData.ConstructionProperties());
// Assert
var exception = Assert.Throws(call);
Assert.AreEqual("assessmentSection", exception.ParamName);
}
[Test]
- public void Constructor_FailureMechanismsNull_ThrowsArgumentNullException()
- {
- // Call
- TestDelegate call = () => new AssessmentSectionMergeData(new AssessmentSection(AssessmentSectionComposition.Dike),
- null, new AssessmentSectionMergeData.ConstructionProperties());
-
- // Assert
- var exception = Assert.Throws(call);
- Assert.AreEqual("failureMechanisms", exception.ParamName);
- }
-
- [Test]
public void Constructor_PropertiesNull_ThrowsArgumentNullException()
{
// Call
- TestDelegate call = () => new AssessmentSectionMergeData(new AssessmentSection(AssessmentSectionComposition.Dike),
- Enumerable.Empty(), null);
+ TestDelegate call = () => new AssessmentSectionMergeData(new AssessmentSection(AssessmentSectionComposition.Dike), null);
// Assert
var exception = Assert.Throws(call);
@@ -74,15 +60,12 @@
{
// Setup
var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
- IEnumerable failureMechanisms = Enumerable.Empty();
// Call
- var mergeData = new AssessmentSectionMergeData(assessmentSection, failureMechanisms,
- new AssessmentSectionMergeData.ConstructionProperties());
+ var mergeData = new AssessmentSectionMergeData(assessmentSection, new AssessmentSectionMergeData.ConstructionProperties());
// Assert
Assert.AreSame(assessmentSection, mergeData.AssessmentSection);
- Assert.AreSame(failureMechanisms, mergeData.FailureMechanisms);
Assert.IsFalse(mergeData.MergePiping);
Assert.IsFalse(mergeData.MergeGrassCoverErosionInwards);
Assert.IsFalse(mergeData.MergeMacroStabilityInwards);
@@ -109,7 +92,6 @@
// Setup
var random = new Random(21);
var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
- IEnumerable failureMechanisms = Enumerable.Empty();
var constructionProperties = new AssessmentSectionMergeData.ConstructionProperties
{
@@ -134,12 +116,10 @@
};
// Call
- var mergeData = new AssessmentSectionMergeData(assessmentSection, failureMechanisms,
- constructionProperties);
+ var mergeData = new AssessmentSectionMergeData(assessmentSection, constructionProperties);
// Assert
Assert.AreSame(assessmentSection, mergeData.AssessmentSection);
- Assert.AreSame(failureMechanisms, mergeData.FailureMechanisms);
Assert.AreEqual(constructionProperties.MergePiping, mergeData.MergePiping);
Assert.AreEqual(constructionProperties.MergeGrassCoverErosionInwards, mergeData.MergeGrassCoverErosionInwards);
Assert.AreEqual(constructionProperties.MergeMacroStabilityInwards, mergeData.MergeMacroStabilityInwards);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs
===================================================================
diff -u -r582432119b4c0192b488bdaa49179637fe6e5d2b -re5dda4058c572ba943002d130b8591a90ee19ce9
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs (.../AssessmentSectionMergeDataProviderDialogTest.cs) (revision 582432119b4c0192b488bdaa49179637fe6e5d2b)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Merge/AssessmentSectionMergeDataProviderDialogTest.cs (.../AssessmentSectionMergeDataProviderDialogTest.cs) (revision e5dda4058c572ba943002d130b8591a90ee19ce9)
@@ -20,7 +20,6 @@
// All rights reserved.
using System;
-using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Windows.Forms;
@@ -340,9 +339,6 @@
Assert.IsFalse(result.MergeStrengthStabilityLengthwiseConstruction);
Assert.IsFalse(result.MergeDuneErosion);
Assert.IsFalse(result.MergeTechnicalInnovation);
-
- IEnumerable selectedFailureMechanisms = result.FailureMechanisms;
- Assert.AreEqual(0, selectedFailureMechanisms.Count());
}
}
@@ -406,9 +402,6 @@
Assert.IsTrue(result.MergeStrengthStabilityLengthwiseConstruction);
Assert.IsTrue(result.MergeDuneErosion);
Assert.IsTrue(result.MergeTechnicalInnovation);
-
- IEnumerable selectedFailureMechanisms = result.FailureMechanisms;
- Assert.AreEqual(18, selectedFailureMechanisms.Count());
}
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs
===================================================================
diff -u -rc08ebb644861c250c6cbff98edfcb438528cb73f -re5dda4058c572ba943002d130b8591a90ee19ce9
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision c08ebb644861c250c6cbff98edfcb438528cb73f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision e5dda4058c572ba943002d130b8591a90ee19ce9)
@@ -30,7 +30,6 @@
using Rhino.Mocks;
using Ringtoets.ClosingStructures.Data;
using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.FailureMechanism;
using Ringtoets.Common.Data.Hydraulics;
using Ringtoets.Common.Data.Structures;
using Ringtoets.Common.Data.TestUtil;
@@ -93,7 +92,7 @@
// Call
TestDelegate call = () => handler.PerformMerge(null, new AssessmentSectionMergeData(
new AssessmentSection(AssessmentSectionComposition.Dike),
- Enumerable.Empty(), new AssessmentSectionMergeData.ConstructionProperties()));
+ new AssessmentSectionMergeData.ConstructionProperties()));
// Assert
var exception = Assert.Throws(call);
@@ -136,7 +135,6 @@
handler.PerformMerge(targetAssessmentSection,
new AssessmentSectionMergeData(
new AssessmentSection(AssessmentSectionComposition.Dike),
- Enumerable.Empty(),
new AssessmentSectionMergeData.ConstructionProperties()));
// Assert
@@ -161,7 +159,6 @@
Action call = () => handler.PerformMerge(targetAssessmentSection,
new AssessmentSectionMergeData(
new AssessmentSection(AssessmentSectionComposition.Dike),
- Enumerable.Empty(),
new AssessmentSectionMergeData.ConstructionProperties()));
// Assert
@@ -184,7 +181,6 @@
// Call
handler.PerformMerge(targetAssessmentSection, new AssessmentSectionMergeData(
sourceAssessmentSection,
- sourceAssessmentSection.GetFailureMechanisms(),
new AssessmentSectionMergeData.ConstructionProperties
{
MergePiping = true,
@@ -244,7 +240,6 @@
handler.PerformMerge(targetAssessmentSection,
new AssessmentSectionMergeData(
sourceAssessmentSection,
- Enumerable.Empty(),
new AssessmentSectionMergeData.ConstructionProperties()));
// Assert
@@ -283,7 +278,6 @@
// Call
Action call = () => handler.PerformMerge(targetAssessmentSection, new AssessmentSectionMergeData(
sourceAssessmentSection,
- sourceAssessmentSection.GetFailureMechanisms(),
new AssessmentSectionMergeData.ConstructionProperties
{
MergePiping = true,
@@ -431,18 +425,6 @@
// When
handler.PerformMerge(targetAssessmentSection, new AssessmentSectionMergeData(
sourceAssessmentSection,
- new IFailureMechanism[]
- {
- sourceAssessmentSection.Piping,
- sourceAssessmentSection.GrassCoverErosionInwards,
- sourceAssessmentSection.MacroStabilityInwards,
- sourceAssessmentSection.HeightStructures,
- sourceAssessmentSection.ClosingStructures,
- sourceAssessmentSection.StabilityPointStructures,
- sourceAssessmentSection.StabilityStoneCover,
- sourceAssessmentSection.WaveImpactAsphaltCover,
- sourceAssessmentSection.GrassCoverErosionOutwards
- },
new AssessmentSectionMergeData.ConstructionProperties
{
MergePiping = true,
@@ -570,7 +552,6 @@
handler.PerformMerge(targetAssessmentSection,
new AssessmentSectionMergeData(
sourceAssessmentSection,
- Enumerable.Empty(),
new AssessmentSectionMergeData.ConstructionProperties()));
// Then
@@ -617,7 +598,6 @@
handler.PerformMerge(targetAssessmentSection,
new AssessmentSectionMergeData(
sourceAssessmentSection,
- Enumerable.Empty(),
new AssessmentSectionMergeData.ConstructionProperties()));
// Then
@@ -664,7 +644,6 @@
handler.PerformMerge(targetAssessmentSection,
new AssessmentSectionMergeData(
sourceAssessmentSection,
- Enumerable.Empty(),
new AssessmentSectionMergeData.ConstructionProperties()));
// Then
@@ -710,7 +689,6 @@
handler.PerformMerge(targetAssessmentSection,
new AssessmentSectionMergeData(
sourceAssessmentSection,
- Enumerable.Empty(),
new AssessmentSectionMergeData.ConstructionProperties()));
// Then
@@ -758,7 +736,6 @@
handler.PerformMerge(targetAssessmentSection,
new AssessmentSectionMergeData(
sourceAssessmentSection,
- Enumerable.Empty(),
new AssessmentSectionMergeData.ConstructionProperties()));
// Then
@@ -804,7 +781,6 @@
handler.PerformMerge(targetAssessmentSection,
new AssessmentSectionMergeData(
sourceAssessmentSection,
- Enumerable.Empty(),
new AssessmentSectionMergeData.ConstructionProperties()));
// Then
@@ -849,7 +825,6 @@
handler.PerformMerge(targetAssessmentSection,
new AssessmentSectionMergeData(
sourceAssessmentSection,
- Enumerable.Empty(),
new AssessmentSectionMergeData.ConstructionProperties()));
// Assert
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergerTest.cs
===================================================================
diff -u -raa69c30a42cc90d74f4f219134a5af877dc4e857 -re5dda4058c572ba943002d130b8591a90ee19ce9
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergerTest.cs (.../AssessmentSectionMergerTest.cs) (revision aa69c30a42cc90d74f4f219134a5af877dc4e857)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergerTest.cs (.../AssessmentSectionMergerTest.cs) (revision e5dda4058c572ba943002d130b8591a90ee19ce9)
@@ -300,11 +300,7 @@
var filePath = "Filepath";
var originalAssessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
var assessmentSectionToMerge = new AssessmentSection(AssessmentSectionComposition.Dike);
- var failureMechanismsToMerge = new IFailureMechanism[]
- {
- assessmentSectionToMerge.Piping
- };
- var mergeData = new AssessmentSectionMergeData(assessmentSectionToMerge, failureMechanismsToMerge, new AssessmentSectionMergeData.ConstructionProperties());
+ var mergeData = new AssessmentSectionMergeData(assessmentSectionToMerge, new AssessmentSectionMergeData.ConstructionProperties());
var mocks = new MockRepository();
var filePathProvider = mocks.StrictMock();
@@ -343,11 +339,7 @@
// Given
var originalAssessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
var assessmentSectionToMerge = new AssessmentSection(AssessmentSectionComposition.Dike);
- var failureMechanismsToMerge = new IFailureMechanism[]
- {
- assessmentSectionToMerge.Piping
- };
- var mergeData = new AssessmentSectionMergeData(assessmentSectionToMerge, failureMechanismsToMerge, new AssessmentSectionMergeData.ConstructionProperties());
+ var mergeData = new AssessmentSectionMergeData(assessmentSectionToMerge, new AssessmentSectionMergeData.ConstructionProperties());
var mocks = new MockRepository();
var filePathProvider = mocks.StrictMock();