Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs =================================================================== diff -u -r6728 -r6750 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 6728) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 6750) @@ -48,10 +48,10 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); IList dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, - DamProjectType.Calamity, out _).ToList(); + DamProjectType.DamLiveConfiguration, out _).ToList(); using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer, dikeList, - DamProjectType.Calamity, null, + DamProjectType.DamLiveConfiguration, null, out List _); // Check Dike @@ -154,10 +154,10 @@ string damImportFolder = Path.GetDirectoryName(definitionFilename); List logMessages; IList dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, - DamProjectType.Calamity, out _).ToList(); + DamProjectType.DamLiveConfiguration, out _).ToList(); using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer, dikeList, - DamProjectType.Calamity, null, + DamProjectType.DamLiveConfiguration, null, out logMessages); Assert.That(logMessages, Has.Count.GreaterThan(0)); @@ -181,10 +181,10 @@ string damImportFolder = Path.GetDirectoryName(definitionFilename); List logMessages; IList dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, - DamProjectType.Calamity, out _).ToList(); + DamProjectType.DamLiveConfiguration, out _).ToList(); using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer, dikeList, - DamProjectType.Calamity, null, + DamProjectType.DamLiveConfiguration, null, out logMessages); Assert.That(logMessages, Has.Count.GreaterThan(0)); @@ -209,10 +209,10 @@ string damImportFolder = Path.GetDirectoryName(definitionFilename); List logMessages; IList dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, - DamProjectType.Calamity, out _).ToList(); + DamProjectType.DamLiveConfiguration, out _).ToList(); using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer, dikeList, - DamProjectType.Calamity, null, + DamProjectType.DamLiveConfiguration, null, out logMessages); Assert.That(logMessages, Has.Count.GreaterThan(0)); @@ -236,10 +236,10 @@ string damImportFolder = Path.GetDirectoryName(definitionFilename); List logMessages; IList dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, - DamProjectType.Calamity, out _).ToList(); + DamProjectType.DamLiveConfiguration, out _).ToList(); using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer, dikeList, - DamProjectType.Calamity, null, + DamProjectType.DamLiveConfiguration, null, out logMessages); Assert.That(logMessages, Has.Count.GreaterThan(0)); @@ -265,10 +265,10 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); IList dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, - DamProjectType.Calamity, out _).ToList(); + DamProjectType.DamLiveConfiguration, out _).ToList(); damProject.DamProjectData.WaterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer, - dikeList, DamProjectType.Calamity, null, out List _); + dikeList, DamProjectType.DamLiveConfiguration, null, out List _); damProject.AssignGeometry2DMapnameIfNotAssigned(Path.Combine(damImportFolder, dataSourceContainer.MapSoilProfile2D)); // Save the data @@ -297,10 +297,10 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); IList dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, - DamProjectType.Calamity, out _).ToList(); + DamProjectType.DamLiveConfiguration, out _).ToList(); using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer, dikeList, - DamProjectType.Calamity, null, out List _); + DamProjectType.DamLiveConfiguration, null, out List _); // Check Dike Assert.That(waterBoard.Dikes.Count, Is.EqualTo(1)); @@ -318,13 +318,13 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); - IList dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.Calamity, + IList dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.DamLiveConfiguration, out _).ToList(); using (WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer, - dikeList, DamProjectType.Calamity, null, out List _)) + dikeList, DamProjectType.DamLiveConfiguration, null, out List _)) using (WaterBoard referenceWaterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer, - dikeList, DamProjectType.Calamity, null, out List _)) + dikeList, DamProjectType.DamLiveConfiguration, null, out List _)) { // If profiles are defined as relative profiles, new absolute profiles will be generated for each location if (dataSourceContainer.IsImportAsRelativeProfiles) @@ -404,7 +404,7 @@ try { LocalizationManager.CurrentLanguage = LanguageType.English; - Assert.That(() => WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.Calamity, 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 @@ -422,10 +422,10 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); IList dikeList = - WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.Calamity, + WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.DamLiveConfiguration, out _).ToList(); using (WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer, - dikeList, DamProjectType.Calamity, null, out List _)) + dikeList, DamProjectType.DamLiveConfiguration, null, out List _)) { // Check Dike Assert.That(waterBoard.Dikes.Count, Is.EqualTo(1));