Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs =================================================================== diff -u -r8674929672ddd990493ff9f800b14f3ae8f2ddf8 -r3cefd9c4bd6727e7f34a6f32a55bd7d0e135aecd --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs (.../UpliftVanCalculatorTest.cs) (revision 8674929672ddd990493ff9f800b14f3ae8f2ddf8) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs (.../UpliftVanCalculatorTest.cs) (revision 3cefd9c4bd6727e7f34a6f32a55bd7d0e135aecd) @@ -140,6 +140,7 @@ UpliftVanKernelInputHelper.AssertSoilProfiles(SoilProfileCreator.Create(input.SoilProfile, layersWithSoils), upliftVanKernel.SoilProfile); UpliftVanKernelInputHelper.AssertStabilityLocations(StabilityLocationCreator.Create(input), upliftVanKernel.Location); UpliftVanKernelInputHelper.AssertSurfaceLines(SurfaceLineCreator.Create(input.SurfaceLine), upliftVanKernel.SurfaceLine); + UpliftVanKernelInputHelper.AssertSlipPlanesUpliftVan(SlipPlaneUpliftVanCreator.Create(input), upliftVanKernel.SlipPlaneUpliftVan); Assert.AreEqual(input.GridAutomaticDetermined, upliftVanKernel.GridAutomaticDetermined); Assert.AreEqual(input.CreateZones, upliftVanKernel.CreateZones); @@ -294,12 +295,17 @@ private static MacroStabilityInwardsSurfaceLine CreateValidSurfaceLine() { var surfaceLine = new MacroStabilityInwardsSurfaceLine(string.Empty); + var dikeToeAtRiver = new Point3D(1, 0, 8); + surfaceLine.SetGeometry(new[] { new Point3D(0, 0, 2), - new Point3D(1, 0, 8), + dikeToeAtRiver, new Point3D(2, 0, -1) }); + + surfaceLine.SetDikeToeAtRiverAt(dikeToeAtRiver); + return surfaceLine; } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/UpliftVanKernelInputHelper.cs =================================================================== diff -u -r8674929672ddd990493ff9f800b14f3ae8f2ddf8 -r3cefd9c4bd6727e7f34a6f32a55bd7d0e135aecd --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/UpliftVanKernelInputHelper.cs (.../UpliftVanKernelInputHelper.cs) (revision 8674929672ddd990493ff9f800b14f3ae8f2ddf8) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/UpliftVanKernelInputHelper.cs (.../UpliftVanKernelInputHelper.cs) (revision 3cefd9c4bd6727e7f34a6f32a55bd7d0e135aecd) @@ -114,6 +114,20 @@ /// /// Asserts whether is equal to . /// + /// The expected . + /// The actual . + /// Thrown when + /// is not equal to . + public static void AssertSlipPlanesUpliftVan(SlipPlaneUpliftVan expected, SlipPlaneUpliftVan actual) + { + AssertSlipCircleGrid(expected.SlipPlaneLeftGrid, actual.SlipPlaneLeftGrid); + AssertSlipCircleGrid(expected.SlipPlaneRightGrid, actual.SlipPlaneRightGrid); + AssertSlipCircleTangentLine(expected.SlipCircleTangentLine, actual.SlipCircleTangentLine); + } + + /// + /// Asserts whether is equal to . + /// /// The expected array. /// The actual array. /// Thrown when @@ -285,5 +299,37 @@ Assert.AreEqual(expected.X, actual.X); Assert.AreEqual(expected.Z, actual.Z); } + + /// + /// Asserts whether is equal to . + /// + /// The expected . + /// The actual . + /// Thrown when + /// is not equal to . + private static void AssertSlipCircleGrid(SlipCircleGrid expected, SlipCircleGrid actual) + { + Assert.AreEqual(expected.GridXLeft, actual.GridXLeft); + Assert.AreEqual(expected.GridXRight, actual.GridXRight); + Assert.AreEqual(expected.GridZTop, actual.GridZTop); + Assert.AreEqual(expected.GridZBottom, actual.GridZBottom); + Assert.AreEqual(expected.GridXNumber, actual.GridXNumber); + Assert.AreEqual(expected.GridZNumber, actual.GridZNumber); + } + + /// + /// Asserts whether is equal to . + /// + /// The expected . + /// The actual . + /// Thrown when + /// is not equal to . + private static void AssertSlipCircleTangentLine(SlipCircleTangentLine expected, SlipCircleTangentLine actual) + { + Assert.AreEqual(expected.AutomaticAtBoundaries, actual.AutomaticAtBoundaries); + Assert.AreEqual(expected.TangentLineZTop, actual.TangentLineZTop); + Assert.AreEqual(expected.TangentLineZBottom, actual.TangentLineZBottom); + Assert.AreEqual(expected.TangentLineNumber, actual.TangentLineNumber); + } } } \ No newline at end of file