Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/UpliftVanKernelInputAssert.cs
===================================================================
diff -u -r6df1ecea3d12b0f99e240a6d71be19f5ea29bf69 -r5b9f582b5c7815a95c306d624a11c2d771840f91
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/UpliftVanKernelInputAssert.cs	(.../UpliftVanKernelInputAssert.cs)	(revision 6df1ecea3d12b0f99e240a6d71be19f5ea29bf69)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/UpliftVanKernelInputAssert.cs	(.../UpliftVanKernelInputAssert.cs)	(revision 5b9f582b5c7815a95c306d624a11c2d771840f91)
@@ -34,88 +34,6 @@
         /// <summary>
         /// Asserts whether <paramref name="actual"/> is equal to <paramref name="expected"/>.
         /// </summary>
-        /// <param name="expected">The expected <see cref="SoilModel"/>.</param>
-        /// <param name="actual">The actual <see cref="SoilModel"/>.</param>
-        /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
-        /// is not equal to <paramref name="expected"/>.</exception>
-        public static void AssertSoilModels(SoilModel expected, SoilModel actual)
-        {
-            Assert.AreEqual(expected.Soils.Count, actual.Soils.Count);
-
-            for (var i = 0; i < expected.Soils.Count; i++)
-            {
-                AssertSoils(expected.Soils[i], actual.Soils[i]);
-            }
-        }
-
-        /// <summary>
-        /// Asserts whether <paramref name="actual"/> is equal to <paramref name="expected"/>.
-        /// </summary>
-        /// <param name="expected">The expected <see cref="SoilProfile2D"/>.</param>
-        /// <param name="actual">The actual <see cref="SoilProfile2D"/>.</param>
-        /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
-        /// is not equal to <paramref name="expected"/>.</exception>
-        public static void AssertSoilProfiles(SoilProfile2D expected, SoilProfile2D actual)
-        {
-            AssertSoilLayers(expected.Surfaces.ToArray(), actual.Surfaces.ToArray());
-            AssertPreconsolidationStresses(expected.PreconsolidationStresses.ToArray(), actual.PreconsolidationStresses.ToArray());
-            AssertGeometryDatas(expected.Geometry, actual.Geometry);
-        }
-
-        /// <summary>
-        /// Asserts whether <paramref name="actual"/> is equal to <paramref name="expected"/>.
-        /// </summary>
-        /// <param name="expected">The expected <see cref="StabilityLocation"/>.</param>
-        /// <param name="actual">The actual <see cref="StabilityLocation"/>.</param>
-        /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
-        /// is not equal to <paramref name="expected"/>.</exception>
-        public static void AssertStabilityLocations(StabilityLocation expected, StabilityLocation actual)
-        {
-            Assert.AreEqual(expected.DikeSoilScenario, actual.DikeSoilScenario);
-            Assert.AreEqual(expected.WaternetCreationMode, actual.WaternetCreationMode);
-            Assert.AreEqual(expected.PlLineCreationMethod, actual.PlLineCreationMethod);
-            Assert.AreEqual(expected.WaterLevelRiver, actual.WaterLevelRiver);
-            Assert.AreEqual(expected.WaterLevelRiverAverage, actual.WaterLevelRiverAverage);
-            Assert.AreEqual(expected.WaterLevelPolder, actual.WaterLevelPolder);
-            Assert.AreEqual(expected.WaterLevelRiverLow, actual.WaterLevelRiverLow);
-            Assert.AreEqual(expected.DrainageConstructionPresent, actual.DrainageConstructionPresent);
-            Assert.AreEqual(expected.XCoordMiddleDrainageConstruction, actual.XCoordMiddleDrainageConstruction);
-            Assert.AreEqual(expected.ZCoordMiddleDrainageConstruction, actual.ZCoordMiddleDrainageConstruction);
-            Assert.AreEqual(expected.MinimumLevelPhreaticLineAtDikeTopRiver, actual.MinimumLevelPhreaticLineAtDikeTopRiver);
-            Assert.AreEqual(expected.MinimumLevelPhreaticLineAtDikeTopPolder, actual.MinimumLevelPhreaticLineAtDikeTopPolder);
-            Assert.AreEqual(expected.UseDefaultOffsets, actual.UseDefaultOffsets);
-            Assert.AreEqual(expected.PlLineOffsetBelowPointBRingtoetsWti2017, actual.PlLineOffsetBelowPointBRingtoetsWti2017);
-            Assert.AreEqual(expected.PlLineOffsetBelowDikeTopAtPolder, actual.PlLineOffsetBelowDikeTopAtPolder);
-            Assert.AreEqual(expected.PlLineOffsetBelowShoulderBaseInside, actual.PlLineOffsetBelowShoulderBaseInside);
-            Assert.AreEqual(expected.PlLineOffsetBelowDikeToeAtPolder, actual.PlLineOffsetBelowDikeToeAtPolder);
-            Assert.AreEqual(expected.HeadInPlLine2Outwards, actual.HeadInPlLine2Outwards);
-            Assert.AreEqual(expected.HeadInPlLine2Inwards, actual.HeadInPlLine2Inwards);
-            Assert.AreEqual(expected.AdjustPl3And4ForUplift, actual.AdjustPl3And4ForUplift);
-            Assert.AreEqual(expected.PenetrationLength, actual.PenetrationLength);
-            Assert.AreEqual(expected.LeakageLengthOutwardsPl3, actual.LeakageLengthOutwardsPl3);
-            Assert.AreEqual(expected.LeakageLengthInwardsPl3, actual.LeakageLengthInwardsPl3);
-            Assert.AreEqual(expected.LeakageLengthOutwardsPl4, actual.LeakageLengthOutwardsPl4);
-            Assert.AreEqual(expected.LeakageLengthInwardsPl4, actual.LeakageLengthInwardsPl4);
-        }
-
-        /// <summary>
-        /// Asserts whether <paramref name="actual"/> is equal to <paramref name="expected"/>.
-        /// </summary>
-        /// <param name="expected">The expected <see cref="SurfaceLine2"/>.</param>
-        /// <param name="actual">The actual <see cref="SurfaceLine2"/>.</param>
-        /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
-        /// is not equal to <paramref name="expected"/>.</exception>
-        public static void AssertSurfaceLines(SurfaceLine2 expected, SurfaceLine2 actual)
-        {
-            Assert.AreEqual(expected.Name, actual.Name);
-            Assert.AreEqual(expected.LandwardDirection, actual.LandwardDirection);
-            AssertGeometryPointStrings(expected.Geometry, actual.Geometry);
-            AssertCharacteristicPointSets(expected.CharacteristicPoints, actual.CharacteristicPoints);
-        }
-
-        /// <summary>
-        /// Asserts whether <paramref name="actual"/> is equal to <paramref name="expected"/>.
-        /// </summary>
         /// <param name="expected">The expected <see cref="SlipPlaneUpliftVan"/>.</param>
         /// <param name="actual">The actual <see cref="SlipPlaneUpliftVan"/>.</param>
         /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
@@ -130,181 +48,6 @@
         /// <summary>
         /// Asserts whether <paramref name="actual"/> is equal to <paramref name="expected"/>.
         /// </summary>
-        /// <param name="expected">The expected <see cref="SoilLayer2D"/> array.</param>
-        /// <param name="actual">The actual <see cref="SoilLayer2D"/> array.</param>
-        /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
-        /// is not equal to <paramref name="expected"/>.</exception>
-        private static void AssertSoilLayers(SoilLayer2D[] expected, SoilLayer2D[] actual)
-        {
-            Assert.AreEqual(expected.Length, actual.Length);
-
-            for (var i = 0; i < expected.Length; i++)
-            {
-                SoilLayer2D expectedSurface = expected[i];
-                SoilLayer2D actualSurface = actual[i];
-
-                Assert.AreEqual(expectedSurface.IsAquifer, actualSurface.IsAquifer);
-                AssertGeometrySurfaces(expectedSurface.GeometrySurface, actualSurface.GeometrySurface);
-                AssertSoils(expectedSurface.Soil, actualSurface.Soil);
-                Assert.AreEqual(expectedSurface.WaterpressureInterpolationModel, actualSurface.WaterpressureInterpolationModel);
-            }
-        }
-
-        /// <summary>
-        /// Asserts whether <paramref name="actual"/> is equal to <paramref name="expected"/>.
-        /// </summary>
-        /// <param name="expected">The expected <see cref="PreConsolidationStress"/> array.</param>
-        /// <param name="actual">The actual <see cref="PreConsolidationStress"/> array.</param>
-        /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
-        /// is not equal to <paramref name="expected"/>.</exception>
-        private static void AssertPreconsolidationStresses(PreConsolidationStress[] expected, PreConsolidationStress[] actual)
-        {
-            Assert.AreEqual(expected.Length, actual.Length);
-
-            for (var i = 0; i < expected.Length; i++)
-            {
-                PreConsolidationStress expectedPreconsolidationStress = expected[i];
-                PreConsolidationStress actualPreconsolidationStress = actual[i];
-
-                Assert.AreEqual(expectedPreconsolidationStress.StressValue, actualPreconsolidationStress.StressValue);
-                Assert.AreEqual(expectedPreconsolidationStress.X, actualPreconsolidationStress.X);
-                Assert.AreEqual(expectedPreconsolidationStress.Z, actualPreconsolidationStress.Z);
-            }
-        }
-
-        /// <summary>
-        /// Asserts whether <paramref name="actual"/> is equal to <paramref name="expected"/>.
-        /// </summary>
-        /// <param name="expected">The expected <see cref="GeometrySurface"/>.</param>
-        /// <param name="actual">The actual <see cref="GeometrySurface"/>.</param>
-        /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
-        /// is not equal to <paramref name="expected"/>.</exception>
-        private static void AssertGeometrySurfaces(GeometrySurface expected, GeometrySurface actual)
-        {
-            CollectionAssert.AreEqual(new[]
-                                      {
-                                          expected.OuterLoop
-                                      }.Concat(expected.InnerLoops),
-                                      new[]
-                                      {
-                                          actual.OuterLoop
-                                      }.Concat(actual.InnerLoops),
-                                      new GeometryLoopComparer());
-        }
-
-        /// <summary>
-        /// Asserts whether <paramref name="actual"/> is equal to <paramref name="expected"/>.
-        /// </summary>
-        /// <param name="expected">The expected <see cref="Soil"/>.</param>
-        /// <param name="actual">The actual <see cref="Soil"/>.</param>
-        /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
-        /// is not equal to <paramref name="expected"/>.</exception>
-        private static void AssertSoils(Soil expected, Soil actual)
-        {
-            Assert.AreEqual(expected.Name, actual.Name);
-            Assert.AreEqual(expected.UsePop, actual.UsePop);
-            Assert.AreEqual(expected.ShearStrengthModel, actual.ShearStrengthModel);
-            Assert.AreEqual(expected.AbovePhreaticLevel, actual.AbovePhreaticLevel);
-            Assert.AreEqual(expected.BelowPhreaticLevel, actual.BelowPhreaticLevel);
-            Assert.AreEqual(expected.Cohesion, actual.Cohesion);
-            Assert.AreEqual(expected.FrictionAngle, actual.FrictionAngle);
-            Assert.AreEqual(expected.RatioCuPc, actual.RatioCuPc);
-            Assert.AreEqual(expected.StrengthIncreaseExponent, actual.StrengthIncreaseExponent);
-            Assert.AreEqual(expected.PoP, actual.PoP);
-            Assert.AreEqual(expected.DilatancyType, actual.DilatancyType);
-        }
-
-        /// <summary>
-        /// Asserts whether <paramref name="actual"/> is equal to <paramref name="expected"/>.
-        /// </summary>
-        /// <param name="expected">The expected <see cref="GeometryData"/>.</param>
-        /// <param name="actual">The actual <see cref="GeometryData"/>.</param>
-        /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
-        /// is not equal to <paramref name="expected"/>.</exception>
-        private static void AssertGeometryDatas(GeometryData expected, GeometryData actual)
-        {
-            AssertGeometrySurfaces(expected.Surfaces.ToArray(), actual.Surfaces.ToArray());
-
-            CollectionAssert.AreEqual(expected.Loops, actual.Loops, new GeometryLoopComparer());
-            CollectionAssert.AreEqual(expected.Curves, actual.Curves, new GeometryCurveComparer());
-            CollectionAssert.AreEqual(expected.Points, actual.Points, new StabilityPointComparer());
-
-            Assert.AreEqual(expected.Bottom, actual.Bottom);
-            Assert.AreEqual(expected.Left, actual.Left);
-            Assert.AreEqual(expected.Right, actual.Right);
-        }
-
-        /// <summary>
-        /// Asserts whether <paramref name="actual"/> is equal to <paramref name="expected"/>.
-        /// </summary>
-        /// <param name="expected">The expected <see cref="GeometrySurface"/> array.</param>
-        /// <param name="actual">The actual <see cref="GeometrySurface"/> array.</param>
-        /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
-        /// is not equal to <paramref name="expected"/>.</exception>
-        private static void AssertGeometrySurfaces(GeometrySurface[] expected, GeometrySurface[] actual)
-        {
-            Assert.AreEqual(expected.Length, actual.Length);
-
-            for (var i = 0; i < expected.Length; i++)
-            {
-                AssertGeometrySurfaces(expected[i], actual[i]);
-            }
-        }
-
-        /// <summary>
-        /// Asserts whether <paramref name="actual"/> is equal to <paramref name="expected"/>.
-        /// </summary>
-        /// <param name="expected">The expected <see cref="CharacteristicPointSet"/>.</param>
-        /// <param name="actual">The actual <see cref="CharacteristicPointSet"/>.</param>
-        /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
-        /// is not equal to <paramref name="expected"/>.</exception>
-        private static void AssertCharacteristicPointSets(CharacteristicPointSet expected, CharacteristicPointSet actual)
-        {
-            Assert.AreEqual(expected.Count, actual.Count);
-
-            for (var i = 0; i < expected.Count; i++)
-            {
-                CharacteristicPoint expectedCharacteristicPoint = expected[i];
-                CharacteristicPoint actualCharacteristicPoint = actual[i];
-
-                AssertGeometryPoints(expectedCharacteristicPoint.GeometryPoint, actualCharacteristicPoint.GeometryPoint);
-                Assert.AreEqual(expectedCharacteristicPoint.CharacteristicPointType, actualCharacteristicPoint.CharacteristicPointType);
-            }
-        }
-
-        /// <summary>
-        /// Asserts whether <paramref name="actual"/> is equal to <paramref name="expected"/>.
-        /// </summary>
-        /// <param name="expected">The expected <see cref="GeometryPointString"/>.</param>
-        /// <param name="actual">The actual <see cref="GeometryPointString"/>.</param>
-        /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
-        /// is not equal to <paramref name="expected"/>.</exception>
-        private static void AssertGeometryPointStrings(GeometryPointString expected, GeometryPointString actual)
-        {
-            Assert.AreEqual(expected.Points.Count, actual.Points.Count);
-
-            for (var i = 0; i < expected.Points.Count; i++)
-            {
-                AssertGeometryPoints(expected.Points[i], actual.Points[i]);
-            }
-        }
-
-        /// <summary>
-        /// Asserts whether <paramref name="actual"/> is equal to <paramref name="expected"/>.
-        /// </summary>
-        /// <param name="expected">The expected <see cref="GeometryPoint"/>.</param>
-        /// <param name="actual">The actual <see cref="GeometryPoint"/>.</param>
-        /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
-        /// is not equal to <paramref name="expected"/>.</exception>
-        private static void AssertGeometryPoints(GeometryPoint expected, GeometryPoint actual)
-        {
-            Assert.AreEqual(expected.X, actual.X);
-            Assert.AreEqual(expected.Z, actual.Z);
-        }
-
-        /// <summary>
-        /// Asserts whether <paramref name="actual"/> is equal to <paramref name="expected"/>.
-        /// </summary>
         /// <param name="expected">The expected <see cref="SlipCircleGrid"/>.</param>
         /// <param name="actual">The actual <see cref="SlipCircleGrid"/>.</param>
         /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>