Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs =================================================================== diff -u -r5448 -r5450 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 5448) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 5450) @@ -486,12 +486,9 @@ Assert.That(output.Results.CalculationResults.First().StabilityDesignResults.SafetyFactor, Is.EqualTo(1.366).Within(tolerance)); } - [TestCase("SlopeAdaptionBeforeShoulderAdaption", 1.0, 1.309, 1)] - [TestCase("SlopeAdaptionBeforeShoulderAdaption", 1.4, 1.513, 1)] - [TestCase("OptimizedSlopeAndShoulderAdaption", 1.0, 1.309, 1)] - [TestCase("OptimizedSlopeAndShoulderAdaption", 1.4, 1.513, 1)] - [Ignore("Work in progress")] - public void GivenTutorialDesignDwp1_WhenRunSlopeAdaptionBeforeShoulderAdaptionTheSucceeds(string designMethod, + [TestCase("SlopeAdaptionBeforeShoulderAdaption", 1.4, 1.513, 5)] + [TestCase("OptimizedSlopeAndShoulderAdaption", 1.4, 1.426, 3)] + public void GivenTutorialDesignDwp1_WhenRunWithGeometryAdaption_ThenGivesExpectedResults(string designMethod, double requiredSafetyFactor, double actualSafetyFactor, int iterationCount) { // Create xml with Tutorial project @@ -515,15 +512,15 @@ inputString = XmlAdapter.ChangeValueInXml(inputString, "SegmentFailureMechanismType", ConversionHelper.InputSegmentFailureMechanismStability.ToString()); inputString = XmlAdapter.ChangeValueInXml(inputString, "AnalysisType", "AdaptGeometry"); - inputString = XmlAdapter.ChangeValueInXml(inputString, "StabilityDesignMethod", "SlopeAdaptionBeforeShoulderAdaption"); + inputString = XmlAdapter.ChangeValueInXml(inputString, "StabilityDesignMethod", designMethod); inputString = XmlAdapter.ChangeValueInXml(inputString, "RequiredSafetyFactorStabilityInnerSlope", requiredSafetyFactor.ToString(CultureInfo.InvariantCulture)); File.WriteAllText(@"D:\tmp\TestStabInwardsBishop_SlopeAdaptionBeforeShoulderAdaption.xml", inputString); Output output = GeneralHelper.RunAfterInputValidation(inputString, true); Assert.Multiple(() => { Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.GreaterThanOrEqualTo(requiredSafetyFactor)); - Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.GreaterThanOrEqualTo(requiredSafetyFactor)); + Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(actualSafetyFactor).Within(tolerance)); Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.NumberOfIterations, Is.EqualTo(iterationCount)); }); }