Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/TestUtils/FactoryForSurfaceLineTests.cs
===================================================================
diff -u -r4807 -r4865
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/TestUtils/FactoryForSurfaceLineTests.cs	(.../FactoryForSurfaceLineTests.cs)	(revision 4807)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/TestUtils/FactoryForSurfaceLineTests.cs	(.../FactoryForSurfaceLineTests.cs)	(revision 4865)
@@ -25,7 +25,7 @@
 
 namespace Deltares.Dam.TestHelper.TestUtils
 {
-    public class FactoryForSurfaceLineTests
+    public static class FactoryForSurfaceLineTests
     {
         /// <summary>
         /// Create simple soil profile, that is almost the same as Tutorial 1 
@@ -65,33 +65,6 @@
             return surfaceLine;
         }
 
-#pragma warning disable CS0618 // Type or member is obsolete
-        public static SurfaceLine CreateSurfaceLineTutorial2()
-#pragma warning restore CS0618 // Type or member is obsolete
-        {
-            //Surface line tutorial 1
-#pragma warning disable CS0618 // Type or member is obsolete
-            var surfaceLine = new SurfaceLine
-#pragma warning restore CS0618 // Type or member is obsolete
-            {
-                Name = "Tutorial1"
-            };
-
-            // Next point adjusted so create PL line can be tested better
-            surfaceLine.EnsurePointOfType(0.0, 0, CharacteristicPointType.SurfaceLevelOutside);
-            surfaceLine.EnsurePointOfType(10.0, 0, CharacteristicPointType.DikeToeAtRiver);
-            surfaceLine.EnsurePointOfType(34.5, 5, CharacteristicPointType.DikeTopAtRiver);
-            surfaceLine.EnsurePointOfType(40.5, 5, CharacteristicPointType.DikeTopAtPolder);
-            surfaceLine.EnsurePointOfType(50.5, 0, CharacteristicPointType.DikeToeAtPolder);
-            surfaceLine.EnsurePointOfType(58.5, 0, CharacteristicPointType.DitchDikeSide);
-            surfaceLine.EnsurePointOfType(59.5, -2, CharacteristicPointType.BottomDitchDikeSide);
-            surfaceLine.EnsurePointOfType(61.5, -2, CharacteristicPointType.BottomDitchPolderSide);
-            surfaceLine.EnsurePointOfType(61.5, 0, CharacteristicPointType.DitchPolderSide);
-            surfaceLine.EnsurePointOfType(75.0, 0, CharacteristicPointType.SurfaceLevelInside);
-
-            return surfaceLine;
-        }
-
         public static SurfaceLine2 CreateSurfaceLineTutorial1WithOutsideShoulder()
         {
             //Surface line tutorial 1
@@ -438,145 +411,5 @@
             surfaceLine.EnsurePointOfType(220.0, -0.5, CharacteristicPointType.SurfaceLevelInside);
             return surfaceLine;
         }
-
-#pragma warning disable CS0618 // Type or member is obsolete
-        public static SurfaceLine CreateSimpleSurfaceLineForExitPointTest()
-#pragma warning restore CS0618 // Type or member is obsolete
-        {
-#pragma warning disable CS0618 // Type or member is obsolete
-            var surfaceLine = new SurfaceLine
-#pragma warning restore CS0618 // Type or member is obsolete
-            {
-                Name = "SimpleExitPoint"
-            };
-
-            surfaceLine.EnsurePointOfType(0.0, 0, CharacteristicPointType.SurfaceLevelOutside);
-            surfaceLine.EnsurePointOfType(10.0, 0, CharacteristicPointType.DikeToeAtRiver);
-            surfaceLine.EnsurePointOfType(34.5, 5, CharacteristicPointType.DikeTopAtRiver);
-            surfaceLine.EnsurePointOfType(40.5, 5, CharacteristicPointType.DikeTopAtPolder);
-            surfaceLine.EnsurePointOfType(50.5, 0, CharacteristicPointType.DikeToeAtPolder);
-            surfaceLine.EnsurePoint(60.5, -1);
-            surfaceLine.EnsurePointOfType(75.0, 0, CharacteristicPointType.SurfaceLevelInside);
-
-            return surfaceLine;
-        }
-
-#pragma warning disable CS0618 // Type or member is obsolete
-        public static SurfaceLine CreateHorizontalSurfaceLineForBenchmark1()
-#pragma warning restore CS0618 // Type or member is obsolete
-        {
-#pragma warning disable CS0618 // Type or member is obsolete
-            var surfaceLine = new SurfaceLine
-#pragma warning restore CS0618 // Type or member is obsolete
-            {
-                Name = "HorizontalLine"
-            };
-
-            surfaceLine.EnsurePointOfType(30, -0.2, CharacteristicPointType.DikeToeAtPolder);
-            surfaceLine.EnsurePointOfType(70, -0.2, CharacteristicPointType.SurfaceLevelInside);
-
-            return surfaceLine;
-        }
-
-#pragma warning disable CS0618 // Type or member is obsolete
-        public static SurfaceLine CreateDescendingSurfaceLineForBenchmark2()
-#pragma warning restore CS0618 // Type or member is obsolete
-        {
-#pragma warning disable CS0618 // Type or member is obsolete
-            var surfaceLine = new SurfaceLine
-#pragma warning restore CS0618 // Type or member is obsolete
-            {
-                Name = "NonHorizontalLine"
-            };
-
-            surfaceLine.EnsurePointOfType(30, -0.2, CharacteristicPointType.DikeToeAtPolder);
-            surfaceLine.EnsurePointOfType(70, -1.8, CharacteristicPointType.SurfaceLevelInside);
-
-            return surfaceLine;
-        }
-
-#pragma warning disable CS0618 // Type or member is obsolete
-        public static SurfaceLine CreateHorizontalSurfaceLineWithSymmetricalDitchForBenchmark5()
-#pragma warning restore CS0618 // Type or member is obsolete
-        {
-#pragma warning disable CS0618 // Type or member is obsolete
-            var surfaceLine = new SurfaceLine
-#pragma warning restore CS0618 // Type or member is obsolete
-            {
-                Name = "HorizontalLineWithSymmetricalDitch"
-            };
-
-            surfaceLine.EnsurePointOfType(30, 0, CharacteristicPointType.DikeToeAtPolder);
-            surfaceLine.EnsurePointOfType(35, 0, CharacteristicPointType.DitchDikeSide);
-            surfaceLine.EnsurePointOfType(36, -1.2, CharacteristicPointType.BottomDitchDikeSide);
-            surfaceLine.EnsurePointOfType(37, -1.2, CharacteristicPointType.BottomDitchPolderSide);
-            surfaceLine.EnsurePointOfType(38, 0, CharacteristicPointType.DitchPolderSide);
-            surfaceLine.EnsurePointOfType(70, 0, CharacteristicPointType.SurfaceLevelInside);
-
-            return surfaceLine;
-        }
-
-#pragma warning disable CS0618 // Type or member is obsolete
-        public static SurfaceLine CreateNonHorizontalLineWithAsymmetricalDitchForBenchmark6()
-#pragma warning restore CS0618 // Type or member is obsolete
-        {
-#pragma warning disable CS0618 // Type or member is obsolete
-            var surfaceLine = new SurfaceLine
-#pragma warning restore CS0618 // Type or member is obsolete
-            {
-                Name = "NonHorizontalLineWithAsymmetricalDitch"
-            };
-
-            surfaceLine.EnsurePointOfType(30, 0, CharacteristicPointType.DikeToeAtPolder);
-            surfaceLine.EnsurePointOfType(35.2, -0.208, CharacteristicPointType.DitchDikeSide);
-            surfaceLine.EnsurePointOfType(36, -1.2, CharacteristicPointType.BottomDitchDikeSide);
-            surfaceLine.EnsurePointOfType(37, -1.3, CharacteristicPointType.BottomDitchPolderSide);
-            surfaceLine.EnsurePointOfType(38, -0.5, CharacteristicPointType.DitchPolderSide);
-            surfaceLine.EnsurePointOfType(70, -0.8, CharacteristicPointType.SurfaceLevelInside);
-
-            return surfaceLine;
-        }
-
-#pragma warning disable CS0618 // Type or member is obsolete
-        public static SurfaceLine CreateSurfaceLineWithAsymmetricalDitchHighPolderSide()
-#pragma warning restore CS0618 // Type or member is obsolete
-        {
-#pragma warning disable CS0618 // Type or member is obsolete
-            var surfaceLine = new SurfaceLine
-#pragma warning restore CS0618 // Type or member is obsolete
-            {
-                Name = "AsymmetricalDitchHighPolderSide"
-            };
-
-            surfaceLine.EnsurePointOfType(30, 0, CharacteristicPointType.DikeToeAtPolder);
-            surfaceLine.EnsurePointOfType(35, 0, CharacteristicPointType.DitchDikeSide);
-            surfaceLine.EnsurePointOfType(36, -1, CharacteristicPointType.BottomDitchDikeSide);
-            surfaceLine.EnsurePointOfType(37, -1, CharacteristicPointType.BottomDitchPolderSide);
-            surfaceLine.EnsurePointOfType(38, 1, CharacteristicPointType.DitchPolderSide);
-            surfaceLine.EnsurePointOfType(70, 0, CharacteristicPointType.SurfaceLevelInside);
-
-            return surfaceLine;
-        }
-
-#pragma warning disable CS0618 // Type or member is obsolete
-        public static SurfaceLine CreateSurfaceLineWithAsymmetricalDitchHighDikeSide()
-#pragma warning restore CS0618 // Type or member is obsolete
-        {
-#pragma warning disable CS0618 // Type or member is obsolete
-            var surfaceLine = new SurfaceLine
-#pragma warning restore CS0618 // Type or member is obsolete
-            {
-                Name = "AsymmetricalDitchHighPolderSide"
-            };
-
-            surfaceLine.EnsurePointOfType(30, 0, CharacteristicPointType.DikeToeAtPolder);
-            surfaceLine.EnsurePointOfType(35, 3, CharacteristicPointType.DitchDikeSide);
-            surfaceLine.EnsurePointOfType(36, -1, CharacteristicPointType.BottomDitchDikeSide);
-            surfaceLine.EnsurePointOfType(37, -1, CharacteristicPointType.BottomDitchPolderSide);
-            surfaceLine.EnsurePointOfType(38, 0, CharacteristicPointType.DitchPolderSide);
-            surfaceLine.EnsurePointOfType(70, 0, CharacteristicPointType.SurfaceLevelInside);
-
-            return surfaceLine;
-        }
     }
 }
\ No newline at end of file