Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioFactory.cs
===================================================================
diff -u -r576fbbe099aca7d8d22168cafcdd4d8af86131a5 -racc348dd668eb46c98bd72a23c0cd3ba8812c8f0
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioFactory.cs (.../MacroStabilityInwardsCalculationScenarioFactory.cs) (revision 576fbbe099aca7d8d22168cafcdd4d8af86131a5)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioFactory.cs (.../MacroStabilityInwardsCalculationScenarioFactory.cs) (revision acc348dd668eb46c98bd72a23c0cd3ba8812c8f0)
@@ -92,6 +92,7 @@
{
throw new ArgumentNullException(nameof(section));
}
+
var surfaceLine = new MacroStabilityInwardsSurfaceLine(string.Empty);
Point2D p = section.Points.First();
surfaceLine.SetGeometry(new[]
@@ -222,7 +223,18 @@
surfaceLine.SetDikeToeAtPolderAt(fifthCharacteristicPointLocation);
surfaceLine.SetSurfaceLevelInsideAt(sixthCharacteristicPointLocation);
- HydraulicBoundaryLocation hydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateDesignWaterLevelCalculated(1.0);
+ HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation
+ {
+ DesignWaterLevelCalculation2 =
+ {
+ Output = new TestHydraulicBoundaryLocationOutput(1.1)
+ },
+ DesignWaterLevelCalculation3 =
+ {
+ Output = new TestHydraulicBoundaryLocationOutput(2.2)
+ }
+ };
+
return new MacroStabilityInwardsCalculationScenario
{
InputParameters =
@@ -295,7 +307,7 @@
}
};
}
-
+
///
/// Creates a scenario with valid input and output.
///
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs
===================================================================
diff -u -rd57b5fdfd92270ac6eff490b438bbe90f0296a4d -racc348dd668eb46c98bd72a23c0cd3ba8812c8f0
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision d57b5fdfd92270ac6eff490b438bbe90f0296a4d)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision acc348dd668eb46c98bd72a23c0cd3ba8812c8f0)
@@ -69,6 +69,8 @@
public static MacroStabilityInwardsCalculationScenario GetMacroStabilityInwardsCalculationScenarioWithAssessmentLevel()
{
MacroStabilityInwardsCalculationScenario calculation = GetMacroStabilityInwardsCalculationScenario();
+
+ calculation.InputParameters.HydraulicBoundaryLocation = null;
calculation.InputParameters.UseAssessmentLevelManualInput = true;
calculation.InputParameters.AssessmentLevel = (RoundedDouble) 3.0;
@@ -535,7 +537,7 @@
input.StochasticSoilModel = stochasticSoilModel;
input.StochasticSoilProfile = stochasticSoilProfile;
input.SurfaceLine = surfaceLine;
- input.UseAssessmentLevelManualInput = true;
+ input.UseAssessmentLevelManualInput = random.NextBoolean();
input.AssessmentLevel = random.NextRoundedDouble();
input.SlipPlaneMinimumDepth = random.NextRoundedDouble();
input.SlipPlaneMinimumLength = random.NextRoundedDouble();
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs
===================================================================
diff -u -rd57b5fdfd92270ac6eff490b438bbe90f0296a4d -racc348dd668eb46c98bd72a23c0cd3ba8812c8f0
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs (.../MacroStabilityInwardsCalculationActivityTest.cs) (revision d57b5fdfd92270ac6eff490b438bbe90f0296a4d)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs (.../MacroStabilityInwardsCalculationActivityTest.cs) (revision acc348dd668eb46c98bd72a23c0cd3ba8812c8f0)
@@ -22,6 +22,7 @@
using System;
using System.Linq;
using Core.Common.Base;
+using Core.Common.Base.Data;
using Core.Common.Base.Service;
using Core.Common.TestUtil;
using log4net.Core;
@@ -44,7 +45,7 @@
var calculation = new MacroStabilityInwardsCalculation();
// Call
- var activity = new MacroStabilityInwardsCalculationActivity(calculation);
+ var activity = new MacroStabilityInwardsCalculationActivity(calculation, RoundedDouble.NaN);
// Assert
Assert.IsInstanceOf(activity);
@@ -57,14 +58,14 @@
public void Constructor_CalculationNull_ThrowsArgumentNullException()
{
// Call
- TestDelegate call = () => new MacroStabilityInwardsCalculationActivity(null);
+ TestDelegate call = () => new MacroStabilityInwardsCalculationActivity(null, RoundedDouble.NaN);
// Assert
var exception = Assert.Throws(call);
Assert.AreEqual("calculation", exception.ParamName);
}
- [Test]
+ [Test]
public void Run_InvalidMacroStabilityInwardsCalculationWithOutput_LogValidationStartAndEndWithErrors()
{
// Setup
@@ -73,7 +74,7 @@
MacroStabilityInwardsCalculationScenario invalidMacroStabilityInwardsCalculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput();
invalidMacroStabilityInwardsCalculation.Output = originalOutput;
- var activity = new MacroStabilityInwardsCalculationActivity(invalidMacroStabilityInwardsCalculation);
+ var activity = new MacroStabilityInwardsCalculationActivity(invalidMacroStabilityInwardsCalculation, GetCalculatedTestAssessmentLevel());
// Call
Action call = () => activity.Run();
@@ -105,7 +106,7 @@
using (new MacroStabilityInwardsCalculatorFactoryConfig())
{
- var activity = new MacroStabilityInwardsCalculationActivity(validMacroStabilityInwardsCalculation);
+ var activity = new MacroStabilityInwardsCalculationActivity(validMacroStabilityInwardsCalculation, GetCalculatedTestAssessmentLevel());
activity.Run();
// Call
@@ -140,7 +141,7 @@
validMacroStabilityInwardsCalculation.Output = null;
validMacroStabilityInwardsCalculation.Attach(observer);
- var activity = new MacroStabilityInwardsCalculationActivity(validMacroStabilityInwardsCalculation);
+ var activity = new MacroStabilityInwardsCalculationActivity(validMacroStabilityInwardsCalculation, GetCalculatedTestAssessmentLevel());
activity.Run();
@@ -150,5 +151,10 @@
// Assert
mocks.VerifyAll();
}
+
+ private static RoundedDouble GetCalculatedTestAssessmentLevel()
+ {
+ return (RoundedDouble) 1.1;
+ }
}
}
\ No newline at end of file