Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineHeightAdapterTest.cs
===================================================================
diff -u -r4540 -r4624
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineHeightAdapterTest.cs	(.../SurfaceLineHeightAdapterTest.cs)	(revision 4540)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineHeightAdapterTest.cs	(.../SurfaceLineHeightAdapterTest.cs)	(revision 4624)
@@ -148,7 +148,7 @@
         SurfaceLine2 newSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(newDikeHeight);
         double oldSlope = TanSlopeInside(surfaceLine);
         double newSlope = TanSlopeInside(newSurfaceLine);
-        Assert.AreEqual(oldSlope, newSlope, cToleranceSlope);
+        Assert.That(newSlope, Is.EqualTo(oldSlope).Within(cToleranceSlope));
     }
 
     [Test]
@@ -384,7 +384,7 @@
         Assert.IsTrue(expectedPoint.LocationEquals(actualPoint));
         double oldSlope = TanSlopeInside(surfaceLine);
         double newSlope = TanSlopeInside(newSurfaceLine);
-        Assert.AreEqual(oldSlope, newSlope, 0.001);
+        Assert.That(newSlope, Is.EqualTo(oldSlope).Within(0.001));
     }
 
     [Test]
@@ -480,8 +480,8 @@
         Assert.IsFalse(newSurfaceLine.Geometry.Points.Any(p => p.LocationEquals(pointAtShoulderInsteek)));
         Assert.IsFalse(newSurfaceLine.Geometry.Points.Any(p => p.LocationEquals(pointAtShoulderTop)));
         GeometryPoint newPointAtToePolder = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder);
-        Assert.AreEqual(3, newSurfaceLine.GetPointSegmentIncluding(pointAtTopRiver.X, newPointAtToePolder.X).Count());
-        Assert.AreEqual(5, newSurfaceLine.Geometry.Points.Count);
+        Assert.That(newSurfaceLine.GetPointSegmentIncluding(pointAtTopRiver.X, newPointAtToePolder.X).Count(), Is.EqualTo(3));
+        Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(5));
     }
 
     [Test]
@@ -703,8 +703,8 @@
         const double newDikeHeight = 19.2;
         var surfaceLineAdapter = new SurfaceLineHeightAdapter(surfaceLine, location, 0);
         SurfaceLine2 newSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(newDikeHeight);
-        Assert.AreEqual(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z, newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).Z, cTolerance);
-        Assert.AreEqual(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z, newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).Z, cTolerance);
+        Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).Z, Is.EqualTo(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z).Within(cTolerance));
+        Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).Z, Is.EqualTo(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z).Within(cTolerance));
     }
 
     /// <summary>
@@ -762,8 +762,8 @@
         surfaceLine.EnsurePointOfType(100, 0, CharacteristicPointType.SurfaceLevelInside);
         var surfaceLineAdapter = new SurfaceLineHeightAdapter(surfaceLine, location, 0);
         SurfaceLine2 newSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(newDikeHeight);
-        Assert.AreEqual(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z, newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).Z);
-        Assert.AreEqual(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z, newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).Z);
+        Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside).Z, Is.EqualTo(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z));
+        Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside).Z, Is.EqualTo(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z));
     }
 
     /// <summary>
@@ -776,18 +776,18 @@
         var location = new Location();
         const double cTolerance = 0.001;
         const double newDikeHeight = 4.0;
-        Assert.AreEqual(10, surfaceLine.Geometry.Points.Count);
+        Assert.That(surfaceLine.Geometry.Points.Count, Is.EqualTo(10));
         var surfaceLineAdapter = new SurfaceLineHeightAdapter(surfaceLine, location, 0);
         SurfaceLine2 newSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(newDikeHeight);
-        Assert.AreEqual(6, newSurfaceLine.Geometry.Points.Count);
-        Assert.AreEqual(7.3333, newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).X, cTolerance);
-        Assert.AreEqual(4.0000, newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).Z, cTolerance);
-        Assert.AreEqual(9.3333, newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).X, cTolerance);
-        Assert.AreEqual(4.0000, newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z, cTolerance);
-        Assert.AreEqual(14.6666, newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).X, cTolerance);
-        Assert.AreEqual(0.0000, newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z, cTolerance);
-        Assert.AreEqual(100.000, newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).X, cTolerance);
-        Assert.AreEqual(0.0000, newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).Z, cTolerance);
+        Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(6));
+        Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).X, Is.EqualTo(7.3333).Within(cTolerance));
+        Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).Z, Is.EqualTo(4.0000).Within(cTolerance));
+        Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).X, Is.EqualTo(9.3333).Within(cTolerance));
+        Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z, Is.EqualTo(4.0000).Within(cTolerance));
+        Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).X, Is.EqualTo(14.6666).Within(cTolerance));
+        Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z, Is.EqualTo(0.0000).Within(cTolerance));
+        Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).X, Is.EqualTo(100.000).Within(cTolerance));
+        Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside).Z, Is.EqualTo(0.0000).Within(cTolerance));
     }
 
     [Test]
@@ -835,7 +835,7 @@
         };
         GeometryPoint actualShoulderBaseInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside);
         Assert.IsTrue(expectedShoulderBaseInside.LocationEquals(actualShoulderBaseInside));
-        Assert.AreEqual(9, newSurfaceLine.Geometry.Points.Count);
+        Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(9));
     }
 
     [Test]
@@ -890,7 +890,7 @@
         };
         GeometryPoint actualShoulderBaseInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside);
         Assert.IsTrue(expectedShoulderBaseInside.LocationEquals(actualShoulderBaseInside));
-        Assert.AreEqual(10, newSurfaceLine.Geometry.Points.Count);
+        Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(10));
     }
 
     [Test]
@@ -938,7 +938,7 @@
         };
         GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder);
         Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside));
-        Assert.AreEqual(5, newSurfaceLine.Geometry.Points.Count);
+        Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(5));
     }
 
     [Test]
@@ -986,7 +986,7 @@
         };
         GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder);
         Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside));
-        Assert.AreEqual(6, newSurfaceLine.Geometry.Points.Count);
+        Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(6));
     }
 
     [Test]
@@ -1048,7 +1048,7 @@
         };
         GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder);
         Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside));
-        Assert.AreEqual(7, newSurfaceLine.Geometry.Points.Count);
+        Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(7));
     }
 
     [Test]
@@ -1096,7 +1096,7 @@
         };
         GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder);
         Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside));
-        Assert.AreEqual(5, newSurfaceLine.Geometry.Points.Count);
+        Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(5));
     }
 
     [Test]
@@ -1151,7 +1151,7 @@
         };
         GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder);
         Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside));
-        Assert.AreEqual(6, newSurfaceLine.Geometry.Points.Count);
+        Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(6));
     }
 
     [Test]
@@ -1199,7 +1199,7 @@
         };
         GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder);
         Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside));
-        Assert.AreEqual(6, newSurfaceLine.Geometry.Points.Count);
+        Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(6));
     }
 
     [Test]
@@ -1247,7 +1247,7 @@
         };
         GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder);
         Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside));
-        Assert.AreEqual(6, newSurfaceLine.Geometry.Points.Count);
+        Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(6));
     }
 
     [Test]
@@ -1320,7 +1320,7 @@
         };
         GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder);
         Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside));
-        Assert.AreEqual(10, newSurfaceLine.Geometry.Points.Count);
+        Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(10));
     }
 
     [Test]
@@ -1372,7 +1372,7 @@
         };
         GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder);
         Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside));
-        Assert.AreEqual(6, newSurfaceLine.Geometry.Points.Count);
+        Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(6));
     }
 
     [Test]