Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityOutwardsTests.cs =================================================================== diff -u -r2172 -r2193 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityOutwardsTests.cs (.../MacroStabilityOutwardsTests.cs) (revision 2172) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityOutwardsTests.cs (.../MacroStabilityOutwardsTests.cs) (revision 2193) @@ -37,8 +37,12 @@ private const double tolerance = 0.0005; + /// Test for different segmentFailureMechanismType + /// The soilprobabilities are set tot the specified segmentFailureMechanismType [Test] - public void TestRunMacroStabilityTutorialDesignBishop() + [TestCase(ConversionHelper.InputSegmentFailureMechanismStability)] + [TestCase(ConversionHelper.InputSegmentFailureMechanismAll)] + public void TestRunMacroStabilityTutorialDesignBishop(int segmentFailureMechanismType) { // Based on ".data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx" // Set Analysis type to "No adaption" @@ -61,6 +65,8 @@ inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used inputString = XmlAdapter.ChangeValueInXml(inputString, "MapForSoilgeometries2D", @"TestFiles\DAM Tutorial Design.geometries2D.0\"); inputString = XmlAdapter.ChangeValueInXml(inputString, "SoilDatabaseName", @"TestFiles\DAM Tutorial Design0.soilmaterials.mdb"); + inputString = XmlAdapter.ChangeValueInXml(inputString, "SegmentFailureMechanismType", segmentFailureMechanismType.ToString()); + File.WriteAllText(fileName + ".txt", inputString); EngineInterface engineInterface = new EngineInterface(inputString); Assert.IsNotNull(engineInterface.DamProjectData); engineInterface.DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityModelType = MStabModelType.Bishop; @@ -70,6 +76,7 @@ Assert.IsNotNull(outputString); var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); + Assert.IsNotNull(output.Results.CalculationResults, "No results available"); Assert.AreEqual(0.698, output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, tolerance); // Zone1SafetyFactor=1.282 Assert.AreEqual(0.698, output.Results.CalculationResults[0].StabilityDesignResults.Zone1SafetyFactor, tolerance);