Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeTest.cs
===================================================================
diff -u -r4618 -r4625
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeTest.cs	(.../DikeTest.cs)	(revision 4618)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeTest.cs	(.../DikeTest.cs)	(revision 4625)
@@ -129,8 +129,8 @@
         using (var newDike = new Dike())
         {
             // assert
-            Assert.AreEqual(0, newDike.SurfaceLines2.Count);
-            Assert.AreEqual(0, newDike.Locations.Count);
+            Assert.That(newDike.SurfaceLines2.Count, Is.EqualTo(0));
+            Assert.That(newDike.Locations.Count, Is.EqualTo(0));
         }
     }
 
@@ -139,7 +139,7 @@
     {
         Assert.IsNotNull(dike);
 
-        Assert.AreEqual("Dike", dike.Name);
+        Assert.That(dike.Name, Is.EqualTo("Dike"));
         //Assert.IsNotNull(this.dike.Segments);
         Assert.IsNotNull(dike.Locations);
         Assert.IsNotNull(dike.SurfaceLines2);
@@ -162,9 +162,9 @@
     {
         Assert.IsNotNull(location1);
 
-        Assert.AreEqual(1, dike.Locations.Count);
-        Assert.AreEqual(location1, dike.Locations[0]);
-        Assert.AreEqual("Location1", location1.Name);
+        Assert.That(dike.Locations.Count, Is.EqualTo(1));
+        Assert.That(dike.Locations[0], Is.EqualTo(location1));
+        Assert.That(location1.Name, Is.EqualTo("Location1"));
     }
 
     [Test]
@@ -173,59 +173,59 @@
         Assert.IsNotNull(surfaceLine1);
         Assert.IsNotNull(surfaceLine1.Geometry.Points);
 
-        Assert.AreEqual(1, dike.SurfaceLines2.Count);
-        Assert.AreEqual(surfaceLine1, dike.SurfaceLines2[0]);
-        Assert.AreEqual("SurfaceLine1", surfaceLine1.Name);
+        Assert.That(dike.SurfaceLines2.Count, Is.EqualTo(1));
+        Assert.That(dike.SurfaceLines2[0], Is.EqualTo(surfaceLine1));
+        Assert.That(surfaceLine1.Name, Is.EqualTo("SurfaceLine1"));
     }
 
     [Test]
     public void TestDikeSoilProfiles()
     {
         Assert.IsNotNull(soilProfile);
 
-        Assert.AreEqual(1, dike.SoilProfiles.Count);
-        Assert.AreEqual(soilProfile, dike.SoilProfiles[0]);
-        Assert.AreEqual("SoilProfile1", soilProfile.Name);
+        Assert.That(dike.SoilProfiles.Count, Is.EqualTo(1));
+        Assert.That(dike.SoilProfiles[0], Is.EqualTo(soilProfile));
+        Assert.That(soilProfile.Name, Is.EqualTo("SoilProfile1"));
     }
 
     [Test]
     public void TestDikeLocationSegments()
     {
         Assert.IsNotNull(location1.Segment);
-        Assert.AreEqual(segment1, location1.Segment);
+        Assert.That(location1.Segment, Is.EqualTo(segment1));
     }
 
     [Test]
     public void TestDikeLocationSurfaceLines()
     {
         Assert.IsNotNull(location1.SurfaceLine2);
-        Assert.AreEqual(surfaceLine1, location1.SurfaceLine2);
+        Assert.That(location1.SurfaceLine2, Is.EqualTo(surfaceLine1));
     }
 
     [Test]
     public void TestDikeSegmentsSoilProfileProbabilities()
     {
-        Assert.AreEqual(100, segment1.GetSoilProfileProbability(soilProfile, FailureMechanismSystemType.StabilityInside));
+        Assert.That(segment1.GetSoilProfileProbability(soilProfile, FailureMechanismSystemType.StabilityInside), Is.EqualTo(100));
     }
 
     [Test]
     public void TestDikeSegmentsSurfaceLinePoints()
     {
         IList<GeometryPoint> points = surfaceLine1.Geometry.Points;
-        Assert.AreEqual(6, points.Count);
+        Assert.That(points.Count, Is.EqualTo(6));
 
-        Assert.AreEqual(15.3, points[0].X);
-        Assert.AreEqual(-3.52, points[0].Z);
-        Assert.AreEqual(19.4, points[1].X);
-        Assert.AreEqual(-1.46, points[1].Z);
+        Assert.That(points[0].X, Is.EqualTo(15.3));
+        Assert.That(points[0].Z, Is.EqualTo(-3.52));
+        Assert.That(points[1].X, Is.EqualTo(19.4));
+        Assert.That(points[1].Z, Is.EqualTo(-1.46));
 
-        Assert.AreEqual(points[1], surfaceLine1.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver));
-        Assert.AreEqual(points[2], surfaceLine1.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver));
-        Assert.AreEqual(points[3], surfaceLine1.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder));
-        Assert.AreEqual(points[4], surfaceLine1.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder));
+        Assert.That(surfaceLine1.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver), Is.EqualTo(points[1]));
+        Assert.That(surfaceLine1.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver), Is.EqualTo(points[2]));
+        Assert.That(surfaceLine1.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder), Is.EqualTo(points[3]));
+        Assert.That(surfaceLine1.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder), Is.EqualTo(points[4]));
 
-        Assert.AreEqual(0, surfaceLine1.GetCharacteristicPoints(points[0]).Count(cpt => cpt != CharacteristicPointType.None));
-        Assert.AreEqual(CharacteristicPointType.DikeToeAtRiver, surfaceLine1.GetCharacteristicPoints(points[1]).First());
+        Assert.That(surfaceLine1.GetCharacteristicPoints(points[0]).Count(cpt => cpt != CharacteristicPointType.None), Is.EqualTo(0));
+        Assert.That(surfaceLine1.GetCharacteristicPoints(points[1]).First(), Is.EqualTo(CharacteristicPointType.DikeToeAtRiver));
 
         Assert.IsTrue(surfaceLine1.HasDike());
     }