Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs
===================================================================
diff -u -r6823 -r6843
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs	(.../WaterBoardImporterTests.cs)	(revision 6823)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs	(.../WaterBoardImporterTests.cs)	(revision 6843)
@@ -40,18 +40,20 @@
     private DataSourceContainer dataSourceContainer;
 
     [Test]
-    public void ImportWaterBoardOnlyCsvFiles1D()
+    [TestCase(DamProjectType.Design)]
+    [TestCase(DamProjectType.DamLiveConfiguration)]
+    public void ImportWaterBoardOnlyCsvFiles1D(DamProjectType damProjectType)
     {
         const double cTolerance = 0.0001;
         const string definitionFilename = @".\TestData\CSVData\Full1DProject\Import.defx";
 
         dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename);
         string damImportFolder = Path.GetDirectoryName(definitionFilename);
         string dikeId = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer,
-                                                             DamProjectType.DamLiveConfiguration, out _);
+                                                             damProjectType, out _);
         using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder,
                                                                                 dataSourceContainer, dikeId,
-                                                                                DamProjectType.DamLiveConfiguration, null,
+                                                                                damProjectType, null,
                                                                                 out List<LogMessage> _);
 
         // Check Dike
@@ -154,10 +156,10 @@
         string damImportFolder = Path.GetDirectoryName(definitionFilename);
         List<LogMessage> logMessages;
         string dikeId = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer,
-                                                             DamProjectType.DamLiveConfiguration, out _);
+                                                             DamProjectType.Design, out _);
         using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder,
                                                                                 dataSourceContainer, dikeId,
-                                                                                DamProjectType.DamLiveConfiguration, null,
+                                                                                DamProjectType.Design, null,
                                                                                 out logMessages);
 
         Assert.That(logMessages, Has.Count.GreaterThan(0));
@@ -181,10 +183,10 @@
         string damImportFolder = Path.GetDirectoryName(definitionFilename);
         List<LogMessage> logMessages;
         string dikeId = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer,
-                                                             DamProjectType.DamLiveConfiguration, out _);
+                                                             DamProjectType.Design, out _);
         using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder,
                                                                                 dataSourceContainer, dikeId,
-                                                                                DamProjectType.DamLiveConfiguration, null,
+                                                                                DamProjectType.Design, null,
                                                                                 out logMessages);
 
         Assert.That(logMessages, Has.Count.GreaterThan(0));
@@ -209,10 +211,10 @@
         string damImportFolder = Path.GetDirectoryName(definitionFilename);
         List<LogMessage> logMessages;
         string dikeId = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer,
-                                                             DamProjectType.DamLiveConfiguration, out _);
+                                                             DamProjectType.Design, out _);
         using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder,
                                                                                 dataSourceContainer, dikeId,
-                                                                                DamProjectType.DamLiveConfiguration, null,
+                                                                                DamProjectType.Design, null,
                                                                                 out logMessages);
 
         Assert.That(logMessages, Has.Count.GreaterThan(0));
@@ -236,10 +238,10 @@
         string damImportFolder = Path.GetDirectoryName(definitionFilename);
         List<LogMessage> logMessages;
         string dikeId = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer,
-                                                             DamProjectType.DamLiveConfiguration, out _);
+                                                             DamProjectType.Design, out _);
         using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder,
                                                                                 dataSourceContainer, dikeId,
-                                                                                DamProjectType.DamLiveConfiguration, null,
+                                                                                DamProjectType.Design, null,
                                                                                 out logMessages);
 
         Assert.That(logMessages, Has.Count.GreaterThan(0));
@@ -256,7 +258,9 @@
     }
 
     [Test]
-    public void ImportWaterBoardOnlyCsvFiles2D()
+    [TestCase(DamProjectType.Design)]
+    [TestCase(DamProjectType.DamLiveConfiguration)]
+    public void ImportWaterBoardOnlyCsvFiles2D(DamProjectType damProjectType)
     {
         const string definitionFilename = @".\TestData\CSVData\Full2DProject\Import.defx";
         const string projectFilename = @".\TestData\TestWithGeometries2D.damx";
@@ -265,10 +269,10 @@
             dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename);
             string damImportFolder = Path.GetDirectoryName(definitionFilename);
             string dikeId = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer,
-                                                                 DamProjectType.DamLiveConfiguration, out _);
+                                                                 damProjectType, out _);
             damProject.DamProjectData.WaterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder,
                                                                                              dataSourceContainer,
-                                                                                             dikeId, DamProjectType.DamLiveConfiguration, null, out List<LogMessage> _);
+                                                                                             dikeId, damProjectType, null, out List<LogMessage> _);
             damProject.AssignGeometry2DMapnameIfNotAssigned(Path.Combine(damImportFolder, dataSourceContainer.MapSoilProfile2D));
 
             // Save the data
@@ -297,10 +301,10 @@
         dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename);
         string damImportFolder = Path.GetDirectoryName(definitionFilename);
         string dikeId = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer,
-                                                             DamProjectType.DamLiveConfiguration, out _);
+                                                             DamProjectType.Design, out _);
         using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder,
                                                                                 dataSourceContainer, dikeId,
-                                                                                DamProjectType.DamLiveConfiguration, null, out List<LogMessage> _);
+                                                                                DamProjectType.Design, null, out List<LogMessage> _);
 
         // Check Dike
         Assert.That(waterBoard.Dike, Is.Not.Null);
@@ -318,12 +322,12 @@
 
         dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename);
         string damImportFolder = Path.GetDirectoryName(definitionFilename);
-        string dikeId = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.DamLiveConfiguration, out _);
+        string dikeId = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.Design, out _);
         using (WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer,
-                                                                                 dikeId, DamProjectType.DamLiveConfiguration, null, out List<LogMessage> _))
+                                                                                 dikeId, DamProjectType.Design, null, out List<LogMessage> _))
         using (WaterBoard referenceWaterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder,
                                                                                           dataSourceContainer,
-                                                                                          dikeId, DamProjectType.DamLiveConfiguration, null, out List<LogMessage> _))
+                                                                                          dikeId, DamProjectType.Design, null, out List<LogMessage> _))
         {
             // If profiles are defined as relative profiles, new absolute profiles will be generated for each location
             if (dataSourceContainer.IsImportAsRelativeProfiles)
@@ -403,7 +407,7 @@
         try
         {
             LocalizationManager.CurrentLanguage = LanguageType.English;
-            Assert.That(() => WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.DamLiveConfiguration, out _),
+            Assert.That(() => WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.Design, out _),
                         Throws.InstanceOf<DataPluginImporterException>().With.Message.EqualTo("DataLocation is empty. Perhaps the data source type is not supported."));
         }
         finally
@@ -421,10 +425,10 @@
         dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename);
         string damImportFolder = Path.GetDirectoryName(definitionFilename);
         string dikeList =
-            WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.DamLiveConfiguration,
+            WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.Design,
                                                  out _);
         using (WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer,
-                                                                                 dikeList, DamProjectType.DamLiveConfiguration, null, out List<LogMessage> _))
+                                                                                 dikeList, DamProjectType.Design, null, out List<LogMessage> _))
         {
             // Check Dike
             Assert.That(waterBoard.Dike, Is.Not.Null);