Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContext.cs
===================================================================
diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -r0ccde1570c16e7c6b7631753b5fb9490cabdc6d9
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContext.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContext.cs) (revision 87bd836d55d336e37e3d80f9a1521feb83ddc475)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContext.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContext.cs) (revision 0ccde1570c16e7c6b7631753b5fb9490cabdc6d9)
@@ -40,34 +40,22 @@
/// The wrapped wave conditions input.
/// The calculation having as input.
/// The the context belongs to.
- /// The
- /// the context belongs to.
+ /// The foreshore profiles of the .
/// Thrown when any parameter is null.
public GrassCoverErosionOutwardsWaveConditionsInputContext(GrassCoverErosionOutwardsWaveConditionsInput wrappedData,
ICalculation calculation,
IAssessmentSection assessmentSection,
- GrassCoverErosionOutwardsFailureMechanism failureMechanism)
+ IEnumerable foreshoreProfiles)
: base(wrappedData, calculation, assessmentSection)
{
- if (failureMechanism == null)
+ if (foreshoreProfiles == null)
{
- throw new ArgumentNullException(nameof(failureMechanism));
+ throw new ArgumentNullException(nameof(foreshoreProfiles));
}
- FailureMechanism = failureMechanism;
+ ForeshoreProfiles = foreshoreProfiles;
}
- public override IEnumerable ForeshoreProfiles
- {
- get
- {
- return FailureMechanism.ForeshoreProfiles;
- }
- }
-
- ///
- /// Gets the failure mechanism.
- ///
- public GrassCoverErosionOutwardsFailureMechanism FailureMechanism { get; }
+ public override IEnumerable ForeshoreProfiles { get; }
}
}
\ No newline at end of file
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r3b1aea305fa3407ef2d830bac9096ea670c86321 -r0ccde1570c16e7c6b7631753b5fb9490cabdc6d9
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 3b1aea305fa3407ef2d830bac9096ea670c86321)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 0ccde1570c16e7c6b7631753b5fb9490cabdc6d9)
@@ -623,7 +623,7 @@
new GrassCoverErosionOutwardsWaveConditionsInputContext(calculation.InputParameters,
calculation,
context.AssessmentSection,
- context.FailureMechanism)
+ context.FailureMechanism.ForeshoreProfiles)
};
if (calculation.HasOutput)
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs
===================================================================
diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -r0ccde1570c16e7c6b7631753b5fb9490cabdc6d9
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs) (revision 87bd836d55d336e37e3d80f9a1521feb83ddc475)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs) (revision 0ccde1570c16e7c6b7631753b5fb9490cabdc6d9)
@@ -38,26 +38,28 @@
{
// Setup
var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation();
- var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
var assessmentSection = new AssessmentSectionStub();
+ var foreshoreProfiles = new[]
+ {
+ new TestForeshoreProfile()
+ };
// Call
var context = new GrassCoverErosionOutwardsWaveConditionsInputContext(calculation.InputParameters,
calculation,
assessmentSection,
- failureMechanism);
+ foreshoreProfiles);
// Assert
Assert.IsInstanceOf>(context);
Assert.AreSame(calculation.InputParameters, context.WrappedData);
Assert.AreSame(calculation, context.Calculation);
Assert.AreSame(assessmentSection, context.AssessmentSection);
- Assert.AreSame(failureMechanism, context.FailureMechanism);
- Assert.AreSame(failureMechanism.ForeshoreProfiles, context.ForeshoreProfiles);
+ Assert.AreSame(foreshoreProfiles, context.ForeshoreProfiles);
}
[Test]
- public void Constructor_FailureMechanismNull_ThrowsArgumentNullException()
+ public void Constructor_ForeshoreProfilesNull_ThrowsArgumentNullException()
{
// Setup
var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation();
@@ -74,7 +76,7 @@
// Assert
var exception = Assert.Throws(test);
- Assert.AreEqual("failureMechanism", exception.ParamName);
+ Assert.AreEqual("foreshoreProfiles", exception.ParamName);
mocks.VerifyAll();
}
}
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs
===================================================================
diff -u -rda6d3525ea7ee7528cab7184c39205d3452440f7 -r0ccde1570c16e7c6b7631753b5fb9490cabdc6d9
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs) (revision da6d3525ea7ee7528cab7184c39205d3452440f7)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs) (revision 0ccde1570c16e7c6b7631753b5fb9490cabdc6d9)
@@ -21,13 +21,15 @@
using System;
using System.ComponentModel;
+using System.Linq;
using Core.Common.Base;
using Core.Common.TestUtil;
using Core.Common.Util;
using Core.Gui.TestUtil;
using NUnit.Framework;
using Rhino.Mocks;
using Riskeer.Common.Data.AssessmentSection;
+using Riskeer.Common.Data.DikeProfiles;
using Riskeer.Common.Data.TestUtil;
using Riskeer.Common.Forms.PropertyClasses;
using Riskeer.Common.Forms.TestUtil;
@@ -55,7 +57,7 @@
calculation.InputParameters,
calculation,
assessmentSection,
- new GrassCoverErosionOutwardsFailureMechanism());
+ Enumerable.Empty());
// Call
var properties = new GrassCoverErosionOutwardsWaveConditionsInputContextProperties(
@@ -85,7 +87,7 @@
calculation.InputParameters,
calculation,
assessmentSection,
- new GrassCoverErosionOutwardsFailureMechanism());
+ Enumerable.Empty());
// Call
var properties = new GrassCoverErosionOutwardsWaveConditionsInputContextProperties(
@@ -126,7 +128,7 @@
calculation.InputParameters,
calculation,
assessmentSection,
- new GrassCoverErosionOutwardsFailureMechanism());
+ Enumerable.Empty());
var properties = new GrassCoverErosionOutwardsWaveConditionsInputContextProperties(
context, AssessmentSectionTestHelper.GetTestAssessmentLevel, customHandler);
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveConditionsInputContextPropertyInfoTest.cs
===================================================================
diff -u -ra39d26aede57670b45cdd5329893674cbb1bcb90 -r0ccde1570c16e7c6b7631753b5fb9490cabdc6d9
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveConditionsInputContextPropertyInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertyInfoTest.cs) (revision a39d26aede57670b45cdd5329893674cbb1bcb90)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveConditionsInputContextPropertyInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertyInfoTest.cs) (revision 0ccde1570c16e7c6b7631753b5fb9490cabdc6d9)
@@ -26,6 +26,7 @@
using Core.Gui.PropertyBag;
using NUnit.Framework;
using Riskeer.Common.Data.AssessmentSection;
+using Riskeer.Common.Data.DikeProfiles;
using Riskeer.GrassCoverErosionOutwards.Data;
using Riskeer.GrassCoverErosionOutwards.Forms.PresentationObjects;
using Riskeer.GrassCoverErosionOutwards.Forms.PropertyClasses;
@@ -68,7 +69,7 @@
var context = new GrassCoverErosionOutwardsWaveConditionsInputContext(calculation.InputParameters,
calculation,
assessmentSection,
- new GrassCoverErosionOutwardsFailureMechanism());
+ Enumerable.Empty());
using (var plugin = new GrassCoverErosionOutwardsPlugin())
{
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs
===================================================================
diff -u -re18321bd281493bf1108fd06db72bd57fd412905 -r0ccde1570c16e7c6b7631753b5fb9490cabdc6d9
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs) (revision e18321bd281493bf1108fd06db72bd57fd412905)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs) (revision 0ccde1570c16e7c6b7631753b5fb9490cabdc6d9)
@@ -30,6 +30,7 @@
using NUnit.Framework;
using Riskeer.Common.Data.AssessmentSection;
using Riskeer.Common.Data.Calculation;
+using Riskeer.Common.Data.DikeProfiles;
using Riskeer.Common.Data.FailureMechanism;
using Riskeer.Common.Data.Hydraulics;
using Riskeer.Common.Data.TestUtil;
@@ -98,7 +99,7 @@
new GrassCoverErosionOutwardsWaveConditionsInput(),
calculation,
new AssessmentSectionStub(),
- new GrassCoverErosionOutwardsFailureMechanism());
+ Enumerable.Empty());
// Call
var view = (WaveConditionsInputView) info.CreateInstance(context);
@@ -136,7 +137,7 @@
calculation.InputParameters,
calculation,
assessmentSection,
- new GrassCoverErosionOutwardsFailureMechanism());
+ Enumerable.Empty());
// Call
var view = (WaveConditionsInputView) info.CreateInstance(context);