Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/Exceptions/HydraulicBoundaryDatabaseReadException.cs =================================================================== diff -u -r3ba0c50f3a3548264d60e9f347079d0586c53f28 -r26346cdbee096c58b9a2ca5fb3dad932f5827f3a --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/Exceptions/HydraulicBoundaryDatabaseReadException.cs (.../HydraulicBoundaryDatabaseReadException.cs) (revision 3ba0c50f3a3548264d60e9f347079d0586c53f28) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/Exceptions/HydraulicBoundaryDatabaseReadException.cs (.../HydraulicBoundaryDatabaseReadException.cs) (revision 26346cdbee096c58b9a2ca5fb3dad932f5827f3a) @@ -23,6 +23,9 @@ namespace Ringtoets.HydraRing.IO.Exceptions { + /// + /// Represents errors that occur while reading a hydraulic boundary database. + /// public class HydraulicBoundaryDatabaseReadException : Exception { /// Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabaseColumns.cs =================================================================== diff -u -r3ba0c50f3a3548264d60e9f347079d0586c53f28 -r26346cdbee096c58b9a2ca5fb3dad932f5827f3a --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabaseColumns.cs (.../HydraulicBoundaryDatabaseColumns.cs) (revision 3ba0c50f3a3548264d60e9f347079d0586c53f28) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabaseColumns.cs (.../HydraulicBoundaryDatabaseColumns.cs) (revision 26346cdbee096c58b9a2ca5fb3dad932f5827f3a) @@ -21,6 +21,9 @@ namespace Ringtoets.HydraRing.IO { + /// + /// Represents columns that are set in the queries to the hydraulic boundary database. + /// internal static class HydraulicBoundaryDatabaseColumns { internal const string Version = "Version"; Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabaseReader.cs =================================================================== diff -u -r3ba0c50f3a3548264d60e9f347079d0586c53f28 -r26346cdbee096c58b9a2ca5fb3dad932f5827f3a --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabaseReader.cs (.../HydraulicBoundaryDatabaseReader.cs) (revision 3ba0c50f3a3548264d60e9f347079d0586c53f28) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabaseReader.cs (.../HydraulicBoundaryDatabaseReader.cs) (revision 26346cdbee096c58b9a2ca5fb3dad932f5827f3a) @@ -38,11 +38,11 @@ private SQLiteDataReader dataReader; /// - /// Creates a new instance of which will use the + /// Creates a new instance of , which will use the /// as its source. /// /// The path of the database file to open. - /// Thrown when: + /// Thrown when: /// /// The contains invalid characters. /// No file could be found at . Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Plugin/HydraulicBoundaryLocationsImporter.cs =================================================================== diff -u -r95df0a957637a4722ea6bf24ac371259cec3d3ad -r26346cdbee096c58b9a2ca5fb3dad932f5827f3a --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Plugin/HydraulicBoundaryLocationsImporter.cs (.../HydraulicBoundaryLocationsImporter.cs) (revision 95df0a957637a4722ea6bf24ac371259cec3d3ad) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Plugin/HydraulicBoundaryLocationsImporter.cs (.../HydraulicBoundaryLocationsImporter.cs) (revision 26346cdbee096c58b9a2ca5fb3dad932f5827f3a) @@ -35,6 +35,9 @@ namespace Ringtoets.HydraRing.Plugin { + /// + /// Imports Hydraulic boundary .sqlite files (SqlLite database files). + /// public class HydraulicBoundaryLocationsImporter : IFileImporter { private readonly ILog log = LogManager.GetLogger(typeof(HydraulicBoundaryLocationsImporter)); @@ -140,7 +143,7 @@ if (!shouldCancel) { AddImportedDataToModel(targetItem, importResult); - log.Info("Locaties uit de hydraulische randvoorwaarden ingelezen"); + log.Info(ApplicationResources.HydraulicBoundaryLocationsImporter_Import_Import_successful); return true; } @@ -161,7 +164,7 @@ private ReadResult ReadHydraulicBoundaryLocations(string path) { - NotifyProgress("Inlezen van de de hydraulische randvoorwaarden database", 1, 1); + NotifyProgress(ApplicationResources.HydraulicBoundaryLocationsImporter_ReadHydraulicBoundaryLocations, 1, 1); try { @@ -197,7 +200,7 @@ } try { - NotifyProgress("Inlezen van de locaties uit de hydraulische randvoorwaarden database", currentStep++, totalNumberOfSteps); + NotifyProgress(ApplicationResources.HydraulicBoundaryLocationsImporter_GetHydraulicBoundaryLocationReadResult, currentStep++, totalNumberOfSteps); locations.Add(hydraulicBoundaryDatabaseReader.ReadLocation()); } catch (CriticalFileReadException e) @@ -217,8 +220,8 @@ { var targetCollection = (ICollection) target; - int totalProfileCount = imported.ImportedItems.Count; - NotifyProgress(ApplicationResources.HydraulicBoundaryLocationsImporter_Adding_imported_data_to_model, totalProfileCount, totalProfileCount); + int totalCount = imported.ImportedItems.Count; + NotifyProgress(ApplicationResources.HydraulicBoundaryLocationsImporter_Adding_imported_data_to_model, totalCount, totalCount); foreach (var item in imported.ImportedItems) { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -r98fc85d8cecf9edae9fe7c1f2f47b60ecda5e187 -r26346cdbee096c58b9a2ca5fb3dad932f5827f3a --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 98fc85d8cecf9edae9fe7c1f2f47b60ecda5e187) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 26346cdbee096c58b9a2ca5fb3dad932f5827f3a) @@ -79,12 +79,39 @@ } /// + /// Looks up a localized string similar to Inlezen van de locaties uit de hydraulische randvoorwaarden database. + /// + public static string HydraulicBoundaryLocationsImporter_GetHydraulicBoundaryLocationReadResult { + get { + return ResourceManager.GetString("HydraulicBoundaryLocationsImporter_GetHydraulicBoundaryLocationReadResult", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Locaties van hydraulische randvoorwaarden importeren is afgebroken. Er is geen data ingelezen.. /// public static string HydraulicBoundaryLocationsImporter_Import_cancelled { get { return ResourceManager.GetString("HydraulicBoundaryLocationsImporter_Import_cancelled", resourceCulture); } } + + /// + /// Looks up a localized string similar to Locaties uit de hydraulische randvoorwaarden ingelezen. + /// + public static string HydraulicBoundaryLocationsImporter_Import_Import_successful { + get { + return ResourceManager.GetString("HydraulicBoundaryLocationsImporter_Import_Import_successful", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Inlezen van de de hydraulische randvoorwaarden database. + /// + public static string HydraulicBoundaryLocationsImporter_ReadHydraulicBoundaryLocations { + get { + return ResourceManager.GetString("HydraulicBoundaryLocationsImporter_ReadHydraulicBoundaryLocations", resourceCulture); + } + } } } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Plugin/Properties/Resources.resx =================================================================== diff -u -r98fc85d8cecf9edae9fe7c1f2f47b60ecda5e187 -r26346cdbee096c58b9a2ca5fb3dad932f5827f3a --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 98fc85d8cecf9edae9fe7c1f2f47b60ecda5e187) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 26346cdbee096c58b9a2ca5fb3dad932f5827f3a) @@ -126,4 +126,13 @@ Locaties van hydraulische randvoorwaarden importeren is afgebroken. Er is geen data ingelezen. + + Locaties uit de hydraulische randvoorwaarden ingelezen + + + Inlezen van de de hydraulische randvoorwaarden database + + + Inlezen van de locaties uit de hydraulische randvoorwaarden database + \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Plugin.Test/HydraulicBoundaryLocationsImporterTest.cs =================================================================== diff -u -r95df0a957637a4722ea6bf24ac371259cec3d3ad -r26346cdbee096c58b9a2ca5fb3dad932f5827f3a --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Plugin.Test/HydraulicBoundaryLocationsImporterTest.cs (.../HydraulicBoundaryLocationsImporterTest.cs) (revision 95df0a957637a4722ea6bf24ac371259cec3d3ad) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Plugin.Test/HydraulicBoundaryLocationsImporterTest.cs (.../HydraulicBoundaryLocationsImporterTest.cs) (revision 26346cdbee096c58b9a2ca5fb3dad932f5827f3a) @@ -79,6 +79,7 @@ // Setup string filePath = Path.Combine(testDataPath, filename); var importer = new HydraulicBoundaryLocationsImporter(); + var expectedMessage = string.Format(RingtoetsHydraRingPluginResources.HydraulicBoundaryLocationsImporter_CriticalErrorMessage_0_File_Skipped, String.Empty); // Call Action call = () => importer.ValidateFile(filePath); @@ -87,8 +88,7 @@ TestHelper.AssertLogMessages(call, messages => { string[] messageArray = messages.ToArray(); - var ExpectedMessage = string.Format(RingtoetsHydraRingPluginResources.HydraulicBoundaryLocationsImporter_CriticalErrorMessage_0_File_Skipped, String.Empty); - StringAssert.EndsWith(ExpectedMessage, messageArray[0]); + StringAssert.EndsWith(expectedMessage, messageArray[0]); }); } @@ -156,9 +156,15 @@ Assert.IsTrue(File.Exists(validFilePath), string.Format("Precodition failed. File does not exist: {0}", validFilePath)); // Call - var importResult = importer.Import(importTarget, validFilePath); + var importResult = false; + Action call = () => importResult = importer.Import(importTarget, validFilePath); // Assert + TestHelper.AssertLogMessages(call, messages => + { + string[] messageArray = messages.ToArray(); + StringAssert.EndsWith(RingtoetsHydraRingPluginResources.HydraulicBoundaryLocationsImporter_Import_Import_successful, messageArray[0]); + }); Assert.IsTrue(importResult); Assert.AreEqual(18, importTarget.Count); CollectionAssert.AllItemsAreNotNull(importTarget);