Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamProjectTest.cs
===================================================================
diff -u -r4047 -r4070
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamProjectTest.cs	(.../DamProjectTest.cs)	(revision 4047)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamProjectTest.cs	(.../DamProjectTest.cs)	(revision 4070)
@@ -19,15 +19,14 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.IO;
+using Deltares.Dam.Data;
 using Deltares.Geotechnics.Soils;
 using Deltares.Soilbase;
+using NUnit.Framework;
 
 namespace Deltares.Dam.Tests
 {
-    using System.IO;
-    using NUnit.Framework;
-    using Data;
-
     [TestFixture]
     public class DamProjectTest
     {
@@ -66,35 +65,35 @@
         [Test]
         public void NewSoilmaterialsFilenameCorrectIfNewLocation()
         {
-            string projectFilename = "Delfland.damx";
-            string soilmaterialsFilename = @"..\..\soilmaterials.mdb";
+            var projectFilename = "Delfland.damx";
+            var soilmaterialsFilename = @"..\..\soilmaterials.mdb";
             string newSoilmaterialsFilename = DamProject.CreateNewSoilMaterialsFilename(projectFilename, soilmaterialsFilename, 2);
             Assert.AreEqual("Delfland2.soilmaterials.mdb", newSoilmaterialsFilename);
         }
 
         [Test]
         public void NewSoilmaterialsFilenameCorrectIfSourceIsTarget()
         {
-            string projectFilename = "Delfland.damx";
-            string soilmaterialsFilename = @"Delfland.soilmaterials.mdb";
+            var projectFilename = "Delfland.damx";
+            var soilmaterialsFilename = @"Delfland.soilmaterials.mdb";
             string newSoilmaterialsFilename = DamProject.CreateNewSoilMaterialsFilename(projectFilename, soilmaterialsFilename, 10);
             Assert.AreEqual("Delfland10.soilmaterials.mdb", newSoilmaterialsFilename);
         }
 
         [Test]
         public void NewGeometry2DMapnameCorrectIfNewLocation()
         {
-            string projectFilename = "Delfland.damx";
-            string mapName = @"..\..\geometries\";
+            var projectFilename = "Delfland.damx";
+            var mapName = @"..\..\geometries\";
             string newMapname = DamProject.CreateNewGeometry2DMapname(projectFilename, mapName, 2);
             Assert.AreEqual(@"Delfland.geometries2D.2\", newMapname);
         }
 
         [Test]
         public void NewGeometry2DMapnameCorrectIfSourceIsTarget()
         {
-            string projectFilename = "Delfland.damx";
-            string mapName = @"Delfland.geometries2D.10\";
+            var projectFilename = "Delfland.damx";
+            var mapName = @"Delfland.geometries2D.10\";
             string newMapname = DamProject.CreateNewGeometry2DMapname(projectFilename, mapName, 10);
             Assert.AreEqual(@"Delfland.geometries2D.10\", newMapname);
         }
@@ -107,14 +106,18 @@
             using (var damProject = new DamProject())
             {
                 damProject.DamProjectData.WaterBoard.Dikes.Add(new Dike());
-                damProject.DamProjectData.WaterBoard.Dikes.Add(new Dike() { MapForSoilGeometries2D = mapName1 });
+                damProject.DamProjectData.WaterBoard.Dikes.Add(new Dike
+                {
+                    MapForSoilGeometries2D = mapName1
+                });
                 damProject.DamProjectData.WaterBoard.Dikes.Add(new Dike());
                 damProject.AssignGeometry2DMapnameIfNotAssigned(mapName2);
                 Assert.AreEqual(mapName2, damProject.DamProjectData.WaterBoard.Dikes[0].MapForSoilGeometries2D);
                 Assert.AreEqual(mapName1, damProject.DamProjectData.WaterBoard.Dikes[1].MapForSoilGeometries2D);
                 Assert.AreEqual(mapName2, damProject.DamProjectData.WaterBoard.Dikes[2].MapForSoilGeometries2D);
             }
         }
+
         [TestCase("Alg-zand (0-30)", 20.0, 22.0, 1.0, 0.7, 0.22)]
         [TestCase("HW-DUN", 15.8, 16.8, 0.0, 0.8, 0.23)]
         [TestCase("HW-OBO", 10.0, 12.0, 1.0, 0.9, 0.24)]
@@ -141,4 +144,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file