Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs =================================================================== diff -u -rad5a4af7ff620379bbb94c0ab2b1d68d9bd01e8e -re869b26e2d865d66c953ba401da9030f059b237c --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs (.../HydraulicBoundaryDatabaseImporter.cs) (revision ad5a4af7ff620379bbb94c0ab2b1d68d9bd01e8e) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs (.../HydraulicBoundaryDatabaseImporter.cs) (revision e869b26e2d865d66c953ba401da9030f059b237c) @@ -83,7 +83,7 @@ private ReadResult ReadHydraulicBoundaryDatabase() { - NotifyProgress(Resources.HydraulicBoundaryDatabaseImporter_ProgressText_Reading_HRD_file, 1, 1); + NotifyProgress(Resources.HydraulicBoundaryDatabaseImporter_ProgressText_Reading_HRD_file, 1, 2); try { using (var reader = new HydraulicBoundaryDatabaseReader(FilePath)) @@ -100,6 +100,7 @@ private ReadResult ReadHydraulicLocationConfigurationDatabase() { + NotifyProgress(Resources.HydraulicBoundaryDatabaseImporter_ProgressText_Reading_HLCD_file, 2, 2); string hlcdFilePath = Path.Combine(Path.GetDirectoryName(FilePath), "hlcd.sqlite"); try { Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.Designer.cs =================================================================== diff -u -ra71d1307f70a72b3a90347390a0df20d642d183c -re869b26e2d865d66c953ba401da9030f059b237c --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a71d1307f70a72b3a90347390a0df20d642d183c) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e869b26e2d865d66c953ba401da9030f059b237c) @@ -131,6 +131,15 @@ } /// + /// Looks up a localized string similar to Inlezen van het hydraulische locatie configuratie bestand.. + /// + internal static string HydraulicBoundaryDatabaseImporter_ProgressText_Reading_HLCD_file { + get { + return ResourceManager.GetString("HydraulicBoundaryDatabaseImporter_ProgressText_Reading_HLCD_file", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Inlezen van het hydraulische belastingen bestand.. /// internal static string HydraulicBoundaryDatabaseImporter_ProgressText_Reading_HRD_file { Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.resx =================================================================== diff -u -ra71d1307f70a72b3a90347390a0df20d642d183c -re869b26e2d865d66c953ba401da9030f059b237c --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.resx (.../Resources.resx) (revision a71d1307f70a72b3a90347390a0df20d642d183c) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.resx (.../Resources.resx) (revision e869b26e2d865d66c953ba401da9030f059b237c) @@ -163,4 +163,7 @@ Hydraulische belastingen database koppelen afgebroken. Geen gegevens gewijzigd. + + Inlezen van het hydraulische locatie configuratie bestand. + \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs =================================================================== diff -u -rad5a4af7ff620379bbb94c0ab2b1d68d9bd01e8e -re869b26e2d865d66c953ba401da9030f059b237c --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs (.../HydraulicBoundaryDatabaseImporterTest.cs) (revision ad5a4af7ff620379bbb94c0ab2b1d68d9bd01e8e) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs (.../HydraulicBoundaryDatabaseImporterTest.cs) (revision e869b26e2d865d66c953ba401da9030f059b237c) @@ -142,21 +142,30 @@ var handler = mocks.StrictMock(); mocks.ReplayAll(); + var totalSteps = 0; + string filePath = Path.Combine(testDataPath, "complete.sqlite"); var importer = new HydraulicBoundaryDatabaseImporter(new HydraulicBoundaryDatabase(), handler, filePath); importer.SetProgressChanged((currentStepName, currentStep, totalNumberOfSteps) => { - if (currentStep == 0) + totalSteps = totalNumberOfSteps; + if (currentStep == 1) { Assert.AreEqual("Inlezen van het hydraulische belastingen bestand.", currentStepName); } + + if (currentStep == 2) + { + Assert.AreEqual("Inlezen van het hydraulische locatie configuratie bestand.", currentStepName); + } }); // Call bool importResult = importer.Import(); // Assert Assert.IsTrue(importResult); + Assert.AreEqual(2, totalSteps); } [Test]