Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityTests.cs =================================================================== diff -u -r992 -r995 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityTests.cs (.../MacroStabilityTests.cs) (revision 992) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityTests.cs (.../MacroStabilityTests.cs) (revision 995) @@ -19,16 +19,12 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; using System.Text.RegularExpressions; -using System.Threading.Tasks; +using Deltares.DamEngine.Data.Standard; +using Deltares.DamEngine.Data.Standard.Calculation; using Deltares.DamEngine.Io; using Deltares.DamEngine.Io.XmlInput; -using Deltares.DamEngine.TestHelpers; using NUnit.Framework; namespace Deltares.DamEngine.Interface.Tests @@ -62,6 +58,31 @@ Assert.IsNotNull(outputString); var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); Assert.AreEqual(1.282, output.Results.CalculationResults.DesignResults[0].StabilityDesignResults.SafetyFactor, tolerance); + // Zone1SafetyFactor=1.282 + Assert.AreEqual(1.282, output.Results.CalculationResults.DesignResults[0].StabilityDesignResults.Zone1SafetyFactor, tolerance); + + // ToDo zant: from kernel zone 1: CircleSurfacePointLeftXCoordinate=38.818, EntryPointXCoordinate=0 + // and CircleSurfacePointRightXCoordinate=64.262, ExitPointXCoordinate=0 + + // Zone1EntryPointX Local=38.818 Global=47.238 + // Assert.AreEqual(38.818, output.Results.CalculationResults.DesignResults[0].StabilityDesignResults.Zone1EntryPointX, tolerance); + // Zone1ExitPointX Local=64.262 Global=72.682 + // Assert.AreEqual(64.262, output.Results.CalculationResults.DesignResults[0].StabilityDesignResults.Zone1ExitPointX, tolerance); + + // Zone2SafetyFactor null, is set to default reading from output.xml + Assert.AreEqual(0, output.Results.CalculationResults.DesignResults[0].StabilityDesignResults.Zone2SafetyFactor, tolerance); + // Zone2EntryPointX null, is set to default reading from output.xml + Assert.AreEqual(0, output.Results.CalculationResults.DesignResults[0].StabilityDesignResults.Zone2EntryPointX, tolerance); + // Zone2ExitPointX null, is set to default reading from output.xml + Assert.AreEqual(0, output.Results.CalculationResults.DesignResults[0].StabilityDesignResults.Zone2ExitPointX, tolerance); + + // NumberOfIterations=0 + Assert.AreEqual(0, output.Results.CalculationResults.DesignResults[0].StabilityDesignResults.NumberOfIterations); + // ResultMessage "" + Assert.AreEqual("", output.Results.CalculationResults.DesignResults[0].StabilityDesignResults.ResultMessage); + + // Calculation Result + Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults.DesignResults[0].CalculationResult)); } [Test] @@ -89,6 +110,10 @@ Assert.IsNotNull(outputString); var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); Assert.AreEqual(1.062, output.Results.CalculationResults.DesignResults[0].StabilityDesignResults.SafetyFactor, tolerance); + // ToDo zant: add more test values + + // Calculation Result + Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults.DesignResults[0].CalculationResult)); } [Test] @@ -121,6 +146,10 @@ Assert.AreEqual(1.062, output.Results.CalculationResults.DesignResults[1].StabilityDesignResults.SafetyFactor, tolerance); // Worst of Bishop and Uplift Van Assert.AreEqual(1.062, output.Results.CalculationResults.DesignResults[2].StabilityDesignResults.SafetyFactor, tolerance); + // ToDo zant: add more test values + + // Calculation Result + Assert.AreEqual(CalculationResult.Succeeded, ConversionHelper.ConvertToCalculationResult(output.Results.CalculationResults.DesignResults[2].CalculationResult)); } public string ChangeInputModel(string input, InputStabilityModelType modelType)