Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/GeometryFileTest.cs
===================================================================
diff -u -r4539 -r4625
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/GeometryFileTest.cs	(.../GeometryFileTest.cs)	(revision 4539)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/GeometryFileTest.cs	(.../GeometryFileTest.cs)	(revision 4625)
@@ -37,41 +37,41 @@
             const string fileName = "test.tst";
             var file = new MockFile("", fileName);
             string expected = Path.Combine(Directory.GetCurrentDirectory(), fileName);
-            Assert.AreEqual(expected, file.FullPath);
+            Assert.That(file.FullPath, Is.EqualTo(expected));
 
             file = new MockFile(fileName);
-            Assert.AreEqual(expected, file.FullPath);
+            Assert.That(file.FullPath, Is.EqualTo(expected));
         }
 
         [Test]
         public void FileReturnsTheFileNameWithoutExtension()
         {
             var file = new MockFile(string.Empty, "test.tst");
-            Assert.AreEqual("test", file.NameWithoutExtension);
+            Assert.That(file.NameWithoutExtension, Is.EqualTo("test"));
         }
 
         [Test]
         public void FileReturnsOnlyTheLocation()
         {
             var file = new MockFile("", "test.tst");
-            Assert.AreEqual(Directory.GetCurrentDirectory(), file.DirectoryName);
+            Assert.That(file.DirectoryName, Is.EqualTo(Directory.GetCurrentDirectory()));
         }
 
         [Test]
         public void FileReturnsOnlyTheExtension()
         {
             var file = new MockFile(string.Empty, "test.tst");
-            Assert.AreEqual(".tst", file.FileExtension);
+            Assert.That(file.FileExtension, Is.EqualTo(".tst"));
         }
 
         [Test]
         public void FileReturnsOnlyTheName()
         {
             var file = new MockFile("", "test.tst");
-            Assert.AreEqual("test.tst", file.FileName);
+            Assert.That(file.FileName, Is.EqualTo("test.tst"));
 
             file = new MockFile("test.tst");
-            Assert.AreEqual("test.tst", file.FileName);
+            Assert.That(file.FileName, Is.EqualTo("test.tst"));
         }
 
         [Test]
@@ -96,15 +96,15 @@
         {
             string location = Directory.GetCurrentDirectory();
             var file = new MockFile(location, existingFile);
-            Assert.AreEqual(location + "\\" + existingFile, file.FullPath);
+            Assert.That(file.FullPath, Is.EqualTo(location + "\\" + existingFile));
         }
 
         [Test]
         public void FileReturnsCorrectFullPathOnExistingFileUsingToString()
         {
             string location = Directory.GetCurrentDirectory();
             var file = new MockFile(location, existingFile);
-            Assert.AreEqual(location + "\\" + existingFile, file.ToString());
+            Assert.That(file.ToString(), Is.EqualTo(location + "\\" + existingFile));
         }
 
         [Test]