Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanPreconsolidationStressTest.cs
===================================================================
diff -u -r4467f4638b032da08f19ea6a22103e816cdd565d -r0972b795d89686b6ae07a1b256fc2db51f524c9f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanPreconsolidationStressTest.cs	(.../UpliftVanPreconsolidationStressTest.cs)	(revision 4467f4638b032da08f19ea6a22103e816cdd565d)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanPreconsolidationStressTest.cs	(.../UpliftVanPreconsolidationStressTest.cs)	(revision 0972b795d89686b6ae07a1b256fc2db51f524c9f)
@@ -45,7 +45,7 @@
         {
             // Setup
             var random = new Random(11);
-            var coordinate = new Point2D(random.Next(), random.NextDouble());
+            var coordinate = new Point2D(random.NextDouble(), random.NextDouble());
             double stress = random.NextDouble();
 
             // Call
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanSoilProfileConverterTest.cs
===================================================================
diff -u -r31f59cfc48a6839453e372572d03ecc6ae6f0d00 -r0972b795d89686b6ae07a1b256fc2db51f524c9f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanSoilProfileConverterTest.cs	(.../UpliftVanSoilProfileConverterTest.cs)	(revision 31f59cfc48a6839453e372572d03ecc6ae6f0d00)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanSoilProfileConverterTest.cs	(.../UpliftVanSoilProfileConverterTest.cs)	(revision 0972b795d89686b6ae07a1b256fc2db51f524c9f)
@@ -119,7 +119,7 @@
             UpliftVanSoilProfile upliftVanSoilProfile = UpliftVanSoilProfileConverter.Convert(profile);
 
             // Assert
-            UpliftVanSoilProfileHelper.AssertSoilProfile(profile, upliftVanSoilProfile);
+            UpliftVanCalculatorInputAssert.AssertSoilProfile(profile, upliftVanSoilProfile);
         }
 
         [Test]
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs
===================================================================
diff -u -r8178a27b7fa97e2d70728d8735ae76b59c4ce697 -r0972b795d89686b6ae07a1b256fc2db51f524c9f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision 8178a27b7fa97e2d70728d8735ae76b59c4ce697)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision 0972b795d89686b6ae07a1b256fc2db51f524c9f)
@@ -546,7 +546,7 @@
         private static void AssertInput(MacroStabilityInwardsInput originalInput, TestMacroStabilityInwardsCalculatorFactory factory)
         {
             UpliftVanCalculatorInput actualInput = factory.LastCreatedUpliftVanCalculator.Input;
-            UpliftVanSoilProfileHelper.AssertSoilProfile(originalInput.SoilProfileUnderSurfaceLine, actualInput.SoilProfile);
+            UpliftVanCalculatorInputAssert.AssertSoilProfile(originalInput.SoilProfileUnderSurfaceLine, actualInput.SoilProfile);
             AssertDrainageConstruction(originalInput, actualInput.DrainageConstruction);
             AssertPhreaticLineOffsets(originalInput, actualInput.PhreaticLineOffsets);
             AssertSlipPlaneInput(originalInput, actualInput.SlipPlane);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/Ringtoets.MacroStabilityInwards.Service.TestUtil.csproj
===================================================================
diff -u -rde60841b8ffece957b147fc7a35a93d2c1918f5f -r0972b795d89686b6ae07a1b256fc2db51f524c9f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/Ringtoets.MacroStabilityInwards.Service.TestUtil.csproj	(.../Ringtoets.MacroStabilityInwards.Service.TestUtil.csproj)	(revision de60841b8ffece957b147fc7a35a93d2c1918f5f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/Ringtoets.MacroStabilityInwards.Service.TestUtil.csproj	(.../Ringtoets.MacroStabilityInwards.Service.TestUtil.csproj)	(revision 0972b795d89686b6ae07a1b256fc2db51f524c9f)
@@ -51,7 +51,7 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UpliftVanSoilProfileHelper.cs" />
+    <Compile Include="UpliftVanCalculatorInputAssert.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
@@ -76,10 +76,6 @@
       <Project>{3c0d3b38-a9f7-4b22-9705-513da26ae2cc}</Project>
       <Name>Ringtoets.MacroStabilityInwards.KernelWrapper</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\Ringtoets.MacroStabilityInwards.Primitives\Ringtoets.MacroStabilityInwards.Primitives.csproj">
-      <Project>{E9B39743-2DC9-4922-9E0F-6BA3E0E54189}</Project>
-      <Name>Ringtoets.MacroStabilityInwards.Primitives</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/UpliftVanCalculatorInputAssert.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/UpliftVanCalculatorInputAssert.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/UpliftVanCalculatorInputAssert.cs	(revision 0972b795d89686b6ae07a1b256fc2db51f524c9f)
@@ -0,0 +1,105 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Linq;
+using NUnit.Framework;
+using Ringtoets.MacroStabilityInwards.Data;
+using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
+using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Input;
+
+namespace Ringtoets.MacroStabilityInwards.Service.TestUtil
+{
+    /// <summary>
+    /// Class for asserting Uplift Van calculator input.
+    /// </summary>
+    public static class UpliftVanCalculatorInputAssert
+    {
+        /// <summary>
+        /// Asserts whether <paramref name="actual"/> corresponds to <paramref name="original"/>.
+        /// </summary>
+        /// <param name="original">The original <see cref="MacroStabilityInwardsSoilProfileUnderSurfaceLine"/>.</param>
+        /// <param name="actual">The actual <see cref="UpliftVanSoilProfile"/>.</param>
+        /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
+        /// does not correspond to <paramref name="original"/>.</exception>
+        public static void AssertSoilProfile(MacroStabilityInwardsSoilProfileUnderSurfaceLine original, UpliftVanSoilProfile actual)
+        {
+            MacroStabilityInwardsSoilLayerUnderSurfaceLine[] expectedLayers = original.Layers.ToArray();
+            UpliftVanSoilLayer[] actualLayers = actual.Layers.ToArray();
+
+            MacroStabilityInwardsPreconsolidationStress[] expectedPreconsolidationStresses = original.PreconsolidationStresses.ToArray();
+            UpliftVanPreconsolidationStress[] actualPreconsolidationStresses = actual.PreconsolidationStresses.ToArray();
+
+            AssertLayers(expectedLayers, actualLayers);
+            AssertPreconsolidationStresses(expectedPreconsolidationStresses, actualPreconsolidationStresses);
+        }
+
+        /// <summary>
+        /// Asserts whether <paramref name="actual"/> corresponds to <paramref name="original"/>.
+        /// </summary>
+        /// <param name="original">The original <see cref="MacroStabilityInwardsPreconsolidationStress"/> array.</param>
+        /// <param name="actual">The actual <see cref="UpliftVanPreconsolidationStress"/> array.</param>
+        /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
+        /// does not correspond to <paramref name="original"/>.</exception>
+        private static void AssertPreconsolidationStresses(MacroStabilityInwardsPreconsolidationStress[] original,
+                                                           UpliftVanPreconsolidationStress[] actual)
+        {
+            Assert.AreEqual(original.Length, actual.Length);
+            for (var i = 0; i < original.Length; i++)
+            {
+                Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetPreconsolidationStress(original[i]).GetDesignValue(), actual[i].Stress);
+                Assert.AreEqual(original[i].Location, actual[i].Coordinate);
+            }
+        }
+
+        /// <summary>
+        /// Asserts whether <paramref name="actual"/> corresponds to <paramref name="original"/>.
+        /// </summary>
+        /// <param name="original">The original <see cref="MacroStabilityInwardsSoilLayerUnderSurfaceLine"/> array.</param>
+        /// <param name="actual">The actual <see cref="UpliftVanSoilLayer"/> array.</param>
+        /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
+        /// does not correspond to <paramref name="original"/>.</exception>
+        private static void AssertLayers(MacroStabilityInwardsSoilLayerUnderSurfaceLine[] original, UpliftVanSoilLayer[] actual)
+        {
+            Assert.AreEqual(original.Length, actual.Length);
+
+            for (var i = 0; i < original.Length; i++)
+            {
+                Assert.AreSame(original[i].OuterRing, actual[i].OuterRing);
+                Assert.AreSame(original[i].Holes, actual[i].Holes);
+
+                MacroStabilityInwardsSoilLayerData expectedData = original[i].Data;
+                Assert.AreEqual(expectedData.MaterialName, actual[i].MaterialName);
+                Assert.AreEqual(expectedData.UsePop, actual[i].UsePop);
+                Assert.AreEqual(expectedData.IsAquifer, actual[i].IsAquifer);
+                Assert.AreEqual(UpliftVanDilatancyType.Zero, actual[i].DilatancyType);
+                Assert.AreEqual(UpliftVanWaterPressureInterpolationModel.Automatic, actual[i].WaterPressureInterpolationModel);
+
+                Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetAbovePhreaticLevel(expectedData).GetDesignValue(), actual[i].AbovePhreaticLevel);
+                Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetBelowPhreaticLevel(expectedData).GetDesignValue(), actual[i].BelowPhreaticLevel);
+                Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetCohesion(expectedData).GetDesignValue(), actual[i].Cohesion);
+                Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetFrictionAngle(expectedData).GetDesignValue(), actual[i].FrictionAngle);
+                Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetStrengthIncreaseExponent(expectedData).GetDesignValue(), actual[i].StrengthIncreaseExponent);
+                Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetShearStrengthRatio(expectedData).GetDesignValue(), actual[i].ShearStrengthRatio);
+                Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetPop(expectedData).GetDesignValue(), actual[i].Pop);
+            }
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 0972b795d89686b6ae07a1b256fc2db51f524c9f refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/UpliftVanSoilProfileHelper.cs'.
Fisheye: No comparison available.  Pass `N' to diff?