Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeImporterTests.cs =================================================================== diff -u -r6880 -r6892 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeImporterTests.cs (.../DikeImporterTests.cs) (revision 6880) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeImporterTests.cs (.../DikeImporterTests.cs) (revision 6892) @@ -41,7 +41,9 @@ private DataSourceContainer dataSourceContainer; [Test] - public void ImportDikeOnlyCsvFiles1D() + [TestCase(DamProjectType.Design)] + [TestCase(DamProjectType.DamLiveConfiguration)] + public void ImportDikeOnlyCsvFiles1D(DamProjectType damProjectType) { const double cTolerance = 0.0001; const string definitionFilename = @".\TestData\CSVData\Full1DProject\Import.defx"; @@ -50,7 +52,7 @@ string damImportFolder = Path.GetDirectoryName(definitionFilename); using Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, - DamProjectType.DamLiveConfiguration, null, + damProjectType, null, out List _); // Check Dike @@ -159,7 +161,7 @@ List logMessages; using Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, - DamProjectType.DamLiveConfiguration, null, + DamProjectType.Design, null, out logMessages); Assert.That(logMessages, Has.Count.GreaterThan(0)); @@ -184,7 +186,7 @@ List logMessages; using Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, - DamProjectType.DamLiveConfiguration, null, + DamProjectType.Design, null, out logMessages); Assert.That(logMessages, Has.Count.GreaterThan(0)); @@ -210,7 +212,7 @@ List logMessages; using Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, - DamProjectType.DamLiveConfiguration, null, + DamProjectType.Design, null, out logMessages); Assert.That(logMessages, Has.Count.GreaterThan(0)); @@ -236,7 +238,7 @@ using Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, - DamProjectType.DamLiveConfiguration, null, + DamProjectType.Design, null, out logMessages); Assert.That(logMessages, Has.Count.GreaterThan(0)); @@ -253,7 +255,9 @@ } [Test] - public void ImportDikeOnlyCsvFiles2D() + [TestCase(DamProjectType.Design)] + [TestCase(DamProjectType.DamLiveConfiguration)] + public void ImportDikeOnlyCsvFiles2D(DamProjectType damProjectType) { const string definitionFilename = @".\TestData\CSVData\Full2DProject\Import.defx"; const string projectFilename = @".\TestData\TestWithGeometries2D.damx"; @@ -264,7 +268,7 @@ damProject.DamProjectData.Dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, - DamProjectType.DamLiveConfiguration, null, out List _); + damProjectType, null, out List _); damProject.AssignGeometry2DMapnameIfNotAssigned(Path.Combine(damImportFolder, dataSourceContainer.MapSoilProfile2D)); // Save the data @@ -295,7 +299,7 @@ using Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, - DamProjectType.DamLiveConfiguration, null, out List _); + DamProjectType.Design, null, out List _); // Check Dike Assert.That(dike, Is.Not.Null); @@ -313,10 +317,10 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); using (Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, - DamProjectType.DamLiveConfiguration, null, out List _)) + DamProjectType.Design, null, out List _)) using (Dike referenceDike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, - DamProjectType.DamLiveConfiguration, null, out List _)) + DamProjectType.Design, null, out List _)) { // If profiles are defined as relative profiles, new absolute profiles will be generated for each location if (dataSourceContainer.IsImportAsRelativeProfiles) @@ -400,7 +404,7 @@ string damImportFolder = Path.GetDirectoryName(definitionFilename); using (Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, - DamProjectType.DamLiveConfiguration, null, out List _)) + DamProjectType.Design, null, out List _)) { // Check Dike Assert.That(dike, Is.Not.Null);