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