Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/CSVData/Full1DProject/ImportMSoilBase.defx =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/CSVData/Full1DProject/ImportMSoilBase.defx (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/CSVData/Full1DProject/ImportMSoilBase.defx (revision 4217) @@ -0,0 +1,9 @@ + + + + + "); + + + + \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs =================================================================== diff -u -r4178 -r4217 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 4178) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 4217) @@ -124,11 +124,11 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); - IList dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, + IList dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.Calamity, out _).ToList(); - using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, - dataSourceContainer, dikeList, - DamProjectType.Calamity, null, + using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, + dataSourceContainer, dikeList, + DamProjectType.Calamity, null, out List _); // Check Dike @@ -194,10 +194,10 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); - IList dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, + IList dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.Calamity, out _).ToList(); - using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, - dataSourceContainer, dikeList, + using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, + dataSourceContainer, dikeList, DamProjectType.Calamity, null, out List _); // Check Dike @@ -293,6 +293,17 @@ } [Test] + public void ThrowsExceptionWhenOpeningDatasourceFileWithSoilBaseDefinition() + { + const string definitionFilename = @".\TestData\CSVData\Full1DProject\ImportMSoilBase.defx"; + dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); + string damImportFolder = Path.GetDirectoryName(definitionFilename); + Assert.That(() => WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.Calamity, + out _), + Throws.InstanceOf().With.Message.EqualTo("DataLocation is empty. Perhaps the DataSourceType is not supported.")); + } + + [Test] [Category("Slow")] public void IsZoneDataReadCorrectlyFromCsvFiles() { @@ -321,7 +332,7 @@ } private void SetupForCsvFilesImport() - { + { var srcDataSources = new List { new() Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Deltares.Dam.Tests.csproj =================================================================== diff -u -r4216 -r4217 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 4216) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 4217) @@ -273,6 +273,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs =================================================================== diff -u -r4214 -r4217 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs (.../DataPluginImporterTests.cs) (revision 4214) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs (.../DataPluginImporterTests.cs) (revision 4217) @@ -1118,5 +1118,18 @@ writer.WriteLine("RK210-570;1;3.14"); } } + + private static void CreateDatasourceFile(string filePath) + { + using StreamWriter writer = File.CreateText(filePath); + + writer.WriteLine(""); + writer.WriteLine(""); + writer.WriteLine(" "); + writer.WriteLine(" "); + writer.WriteLine(" "); + writer.WriteLine(" "); + writer.WriteLine(""); + } } } \ No newline at end of file