Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs =================================================================== diff -u -r3026 -r3031 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 3026) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 3031) @@ -37,6 +37,7 @@ using Deltares.MacroStability.CSharpWrapper.Input; using NUnit.Framework; using NUnit.Framework.Constraints; +using CharacteristicPointType = Deltares.DamEngine.Data.Geotechnics.CharacteristicPointType; using LogMessage = Deltares.DamEngine.Data.Standard.Logging.LogMessage; using MacroStabilityOutput = Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityInwards.MacroStabilityOutput; @@ -85,7 +86,6 @@ } [Test] - [Category(Categories.WorkInProgress)] // check input and result public void TestValidate() { var kernelWrapper = new MacroStabilityInwardsKernelWrapper(); @@ -190,7 +190,7 @@ MacroStabilityOutput macroStabilityOutput = (MacroStabilityOutput)kernelDataOutput; // ToDo MWDAM-1356: Input must be set first in Prepare // start of temporary test code - Assert.AreEqual(0, messages.Count); + Assert.AreEqual(0, messages.Count); // #Bka: grid ligt niet goed voor een berekening, dus faalt de berekening. OP zich prima test, dus verbouwen en uitbreiden Assert.AreEqual(CalculationResult.Succeeded, macroStabilityOutput.CalculationResult); Assert.AreEqual(1, macroStabilityOutput.StabilityOutputItems.Count); Assert.AreEqual(1.357, macroStabilityOutput.StabilityOutputItems[0].SafetyFactor, diff); // ToDo replace by actual value when calculation is done and output is parsed @@ -311,7 +311,14 @@ private static DamKernelInput CreateDamKernelInputForTest() { var location = DamEngineDataTestFactory.CreateLocation(FactoryForSurfaceLines.CreateSurfaceLineTutorial1()); - + // Correction needed in order to make surface line as lengthy as the geometry is wide (100 meter wide). + location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).X = + 100; + // Correction needed in order to make surface line points strictly increasing increasing (ditch was vertical at polderside, + // now this not allowed by the kernel validator!) So that needs to be fixed in the kernel. + location.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide).X = + 62.5; + location.SurfaceLine.Geometry.SyncCalcPoints(); var subSoilScenario = new SoilGeometryProbability(); subSoilScenario.SoilProfileType = SoilProfileType.ProfileType2D; subSoilScenario.StiFileName = "";