Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilSurfaceProfileTests.cs
===================================================================
diff -u -r4540 -r4759
--- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilSurfaceProfileTests.cs	(.../SoilSurfaceProfileTests.cs)	(revision 4540)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilSurfaceProfileTests.cs	(.../SoilSurfaceProfileTests.cs)	(revision 4759)
@@ -19,12 +19,11 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Deltares.DamEngine.Data.Geometry;
 using Deltares.DamEngine.Data.Geotechnics;
-using Deltares.DamEngine.Data.Standard;
+using Deltares.DamEngine.TestHelpers.Factories;
 using NUnit.Framework;
 
 namespace Deltares.DamEngine.Data.Tests.Geotechnics;
@@ -40,8 +39,8 @@
         const string middleLayerName = "MiddleLayer";
         const string topLayerName = "TopLayer";
 
-        SoilLayer1D bottomLayer = CreateSoilLayer(-5, bottomLayerName);
-        SoilLayer1D middleLayer = CreateSoilLayer(-2, middleLayerName);
+        SoilLayer1D bottomLayer = FactoryForSoilProfiles.CreateSoilLayer(-5, bottomLayerName);
+        SoilLayer1D middleLayer = FactoryForSoilProfiles.CreateSoilLayer(-2, middleLayerName);
 
         var profile = new SoilProfile1D
         {
@@ -50,7 +49,7 @@
         profile.Layers.Add(bottomLayer);
         profile.Layers.Add(middleLayer);
 
-        SurfaceLine2 surfaceLine = CreateSurfaceLine(new[]
+        SurfaceLine2 surfaceLine = FactoryForSoilProfiles.CreateSurfaceLine(new[]
         {
             new GeometryPoint(0, 0),
             new GeometryPoint(5, 10),
@@ -119,9 +118,9 @@
         const string middleLayerName = "MiddleLayer";
         const string topLayerName = "TopLayer";
 
-        SoilLayer1D irrelevantLayer = CreateSoilLayer(0, "Does not matter");
-        SoilLayer1D bottomLayer = CreateSoilLayer(-5, bottomLayerName);
-        SoilLayer1D middleLayer = CreateSoilLayer(-2, middleLayerName);
+        SoilLayer1D irrelevantLayer = FactoryForSoilProfiles.CreateSoilLayer(0, "Does not matter");
+        SoilLayer1D bottomLayer = FactoryForSoilProfiles.CreateSoilLayer(-5, bottomLayerName);
+        SoilLayer1D middleLayer = FactoryForSoilProfiles.CreateSoilLayer(-2, middleLayerName);
 
         var profile = new SoilProfile1D
         {
@@ -131,7 +130,7 @@
         profile.Layers.Add(middleLayer);
         profile.Layers.Add(irrelevantLayer);
 
-        SurfaceLine2 surfaceLine = CreateSurfaceLine(new[]
+        SurfaceLine2 surfaceLine = FactoryForSoilProfiles.CreateSurfaceLine(new[]
         {
             new GeometryPoint(0, -5),
             new GeometryPoint(5, -3),
@@ -186,15 +185,15 @@
         const string middleLayerName = "MiddleLayer";
         const string topLayerName = "TopLayer";
 
-        SoilLayer1D bottomLayer = CreateSoilLayer(-5, bottomLayerName);
-        SoilLayer1D middleLayer = CreateSoilLayer(-2, middleLayerName);
+        SoilLayer1D bottomLayer = FactoryForSoilProfiles.CreateSoilLayer(-5, bottomLayerName);
+        SoilLayer1D middleLayer = FactoryForSoilProfiles.CreateSoilLayer(-2, middleLayerName);
 
         var profile = new SoilProfile1D();
         profile.Layers.Add(bottomLayer);
         profile.Layers.Add(middleLayer);
         profile.BottomLevel = -10;
 
-        SurfaceLine2 surfaceLine = CreateSurfaceLine(new[]
+        SurfaceLine2 surfaceLine = FactoryForSoilProfiles.CreateSurfaceLine(new[]
         {
             new GeometryPoint(0, -4),
             new GeometryPoint(5, -2.5),
@@ -251,15 +250,15 @@
         const string middleLayerName = "MiddleLayer";
         const string topLayerName = "TopLayer";
 
-        SoilLayer1D bottomLayer = CreateSoilLayer(-5, bottomLayerName);
-        SoilLayer1D middleLayer = CreateSoilLayer(0, middleLayerName);
+        SoilLayer1D bottomLayer = FactoryForSoilProfiles.CreateSoilLayer(-5, bottomLayerName);
+        SoilLayer1D middleLayer = FactoryForSoilProfiles.CreateSoilLayer(0, middleLayerName);
 
         var profile = new SoilProfile1D();
         profile.Layers.Add(bottomLayer);
         profile.Layers.Add(middleLayer);
         profile.BottomLevel = -10;
 
-        SurfaceLine2 surfaceLine = CreateSurfaceLine(new[]
+        SurfaceLine2 surfaceLine = FactoryForSoilProfiles.CreateSurfaceLine(new[]
         {
             new GeometryPoint(0, -2.5),
             new GeometryPoint(5, 2.5),
@@ -334,15 +333,15 @@
         const string middleLayerName = "MiddleLayer";
         const string topLayerName = "TopLayer";
 
-        SoilLayer1D bottomLayer = CreateSoilLayer(-1.25, bottomLayerName);
-        SoilLayer1D middleLayer = CreateSoilLayer(0, middleLayerName);
+        SoilLayer1D bottomLayer = FactoryForSoilProfiles.CreateSoilLayer(-1.25, bottomLayerName);
+        SoilLayer1D middleLayer = FactoryForSoilProfiles.CreateSoilLayer(0, middleLayerName);
 
         var profile = new SoilProfile1D();
         profile.Layers.Add(bottomLayer);
         profile.Layers.Add(middleLayer);
         profile.BottomLevel = -10;
 
-        SurfaceLine2 surfaceLine = CreateSurfaceLine(new[]
+        SurfaceLine2 surfaceLine = FactoryForSoilProfiles.CreateSurfaceLine(new[]
         {
             new GeometryPoint(0, 2.5),
             new GeometryPoint(5, -2.5),
@@ -439,15 +438,15 @@
         const string middleLayerName = "MiddleLayer";
         const string topLayerName = "TopLayer";
 
-        SoilLayer1D bottomLayer = CreateSoilLayer(-2.5, bottomLayerName);
-        SoilLayer1D middleLayer = CreateSoilLayer(0, middleLayerName);
+        SoilLayer1D bottomLayer = FactoryForSoilProfiles.CreateSoilLayer(-2.5, bottomLayerName);
+        SoilLayer1D middleLayer = FactoryForSoilProfiles.CreateSoilLayer(0, middleLayerName);
 
         var profile = new SoilProfile1D();
         profile.Layers.Add(bottomLayer);
         profile.Layers.Add(middleLayer);
         profile.BottomLevel = -10;
 
-        SurfaceLine2 surfaceLine = CreateSurfaceLine(new[]
+        SurfaceLine2 surfaceLine = FactoryForSoilProfiles.CreateSurfaceLine(new[]
         {
             new GeometryPoint(0, 2.5),
             new GeometryPoint(5, -2.5),
@@ -540,15 +539,15 @@
         const string middleLayerName = "MiddleLayer";
         const string topLayerName = "TopLayer";
 
-        SoilLayer1D bottomLayer = CreateSoilLayer(-2.5, bottomLayerName);
-        SoilLayer1D middleLayer = CreateSoilLayer(0, middleLayerName);
+        SoilLayer1D bottomLayer = FactoryForSoilProfiles.CreateSoilLayer(-2.5, bottomLayerName);
+        SoilLayer1D middleLayer = FactoryForSoilProfiles.CreateSoilLayer(0, middleLayerName);
 
         var profile = new SoilProfile1D();
         profile.Layers.Add(bottomLayer);
         profile.Layers.Add(middleLayer);
         profile.BottomLevel = -10;
 
-        SurfaceLine2 surfaceLine = CreateSurfaceLine(new[]
+        SurfaceLine2 surfaceLine = FactoryForSoilProfiles.CreateSurfaceLine(new[]
         {
             new GeometryPoint(0, 2.5),
             new GeometryPoint(5, -2.5),
@@ -644,15 +643,15 @@
         const string middleLayerName = "MiddleLayer";
         const string topLayerName = "TopLayer";
 
-        SoilLayer1D bottomLayer = CreateSoilLayer(-2.5, bottomLayerName);
-        SoilLayer1D middleLayer = CreateSoilLayer(0, middleLayerName);
+        SoilLayer1D bottomLayer = FactoryForSoilProfiles.CreateSoilLayer(-2.5, bottomLayerName);
+        SoilLayer1D middleLayer = FactoryForSoilProfiles.CreateSoilLayer(0, middleLayerName);
 
         var profile = new SoilProfile1D();
         profile.Layers.Add(bottomLayer);
         profile.Layers.Add(middleLayer);
         profile.BottomLevel = -10;
 
-        SurfaceLine2 surfaceLine = CreateSurfaceLine(new[]
+        SurfaceLine2 surfaceLine = FactoryForSoilProfiles.CreateSurfaceLine(new[]
         {
             new GeometryPoint(0, -2.5),
             new GeometryPoint(5, -2.5),
@@ -751,29 +750,4 @@
         Assert.That(actualSoilLayer.WaterpressureInterpolationModel, Is.EqualTo(WaterpressureInterpolationModel.Hydrostatic));
         Assert.That(actualSoilLayer.Soil, Is.SameAs(expectedProfile.DikeEmbankmentMaterial));
     }
-
-    private static SoilLayer1D CreateSoilLayer(double topLevel, string soilName)
-    {
-        var random = new Random(soilName.GetHashCode());
-
-        Array values = Enum.GetValues(typeof(WaterpressureInterpolationModel));
-        var model = (WaterpressureInterpolationModel) values.GetValue(random.Next(values.Length));
-
-        return new SoilLayer1D
-        {
-            TopLevel = topLevel,
-            Soil = new Soil(soilName),
-            IsAquifer = Convert.ToBoolean(random.Next(0, 2)),
-            WaterpressureInterpolationModel = model
-        };
-    }
-
-    private static SurfaceLine2 CreateSurfaceLine(IEnumerable<GeometryPoint> coordinates)
-    {
-        var surfaceLine = new SurfaceLine2();
-        surfaceLine.Geometry.Points.AddRange(coordinates);
-        surfaceLine.Geometry.SyncCalcPoints();
-
-        return surfaceLine;
-    }
 }
\ No newline at end of file