Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporter.cs =================================================================== diff -u -r4549 -r4569 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporter.cs (.../CsvImporter.cs) (revision 4549) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporter.cs (.../CsvImporter.cs) (revision 4569) @@ -72,6 +72,7 @@ { folderName = csvDir; progress?.Invoke(0.03); + ThrowHelper.ThrowIfDirectoryNotExist(csvDir, StringResourceNames.ImportFolderNotExist); ImportLocations(LocationsFileName); if (!isImportOnlyLocations) Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs =================================================================== diff -u -r4549 -r4569 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 4549) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 4569) @@ -116,7 +116,7 @@ TransferLocationsData(dike); TransferSoilProfilesData(dike); TransferSegmentData(dike); - TransferSigmaTauCurveData(dike); // Should be done before TransferSoilData(), because the SigmaTauCurveData is uses there + TransferSigmaTauCurveData(dike); // Should be done before TransferSoilData(), because the SigmaTauCurveData is used there TransferSoilData(dike); // Use InvokeWithoutPublishingEvents for performance reasons after introducing SurfaceLine2 DataEventPublisher.InvokeWithoutPublishingEvents(() => { TransferSurfaceLines(dike); }); @@ -413,7 +413,7 @@ private void TransferSoilData(Dike dike) { dike.FillImportedCsvSoilsFromCsvFile(SoilRecords); - dike.AssignImporteCsvSoilsPropertiesToSoilListSoils(); + dike.AssignImportedCsvSoilsPropertiesToSoilListSoils(); } private void TransferSigmaTauCurveData(Dike dike) Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTestsNew.cs =================================================================== diff -u -r4544 -r4569 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 4544) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 4569) @@ -885,7 +885,7 @@ File.Delete(testFilePath); } - CreateSigmaTauCurvesMissingColumngFile(testFilePath); + CreateSigmaTauCurvesMissingColumnFile(testFilePath); Assert.That(() => new CsvImporterSigmaTauCurves(testFilePath), Throws.InstanceOf().With.Message.Contains("The header misses the field: sigma")); } @@ -1004,7 +1004,7 @@ writer.WriteLine("CurveZand;200.0;129.88"); } - private static void CreateSigmaTauCurvesMissingColumngFile(string filePath) + private static void CreateSigmaTauCurvesMissingColumnFile(string filePath) { using StreamWriter writer = File.CreateText(filePath); writer.WriteLine("sigma_tau_curve_name;tau"); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs =================================================================== diff -u -r4568 -r4569 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs (.../Dike.cs) (revision 4568) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs (.../Dike.cs) (revision 4569) @@ -340,7 +340,7 @@ /// /// Transfer the properties of the imported soils to the existing soils in the soil list. /// - public void AssignImporteCsvSoilsPropertiesToSoilListSoils() + public void AssignImportedCsvSoilsPropertiesToSoilListSoils() { foreach (Soil soil in ImportedCsvSoils) { Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTest.cs =================================================================== diff -u -r4545 -r4569 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTest.cs (.../CsvImporterTest.cs) (revision 4545) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTest.cs (.../CsvImporterTest.cs) (revision 4569) @@ -81,8 +81,9 @@ public void CvsImporter_ImportFromNonExistingDirectory_AddsMessageWithFatalErrorType() { ImportDirector.Construct("C:\\SomeNoneExistingDirectory", null); - Assert.AreEqual(4, LogManager.Messages.Count); - Assert.AreEqual(LogMessageType.FatalError, LogManager.Messages[0].MessageType); + Assert.AreEqual(1, LogManager.Messages.Count); + Assert.That(LogManager.Messages[0].MessageType, Is.EqualTo(LogMessageType.FatalError)); + Assert.That(LogManager.Messages[0].Message, Is.EqualTo("The import folder C:\\SomeNoneExistingDirectory does not exist")); } ///