Index: Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicLocationConfigurationDatabaseImporter.cs =================================================================== diff -u -r5ce13e3d8b9179872b41a89afe1d07f926996a5d -rf5480982e877e22b553eef7e5cc253d4dc25e4ca --- Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicLocationConfigurationDatabaseImporter.cs (.../HydraulicLocationConfigurationDatabaseImporter.cs) (revision 5ce13e3d8b9179872b41a89afe1d07f926996a5d) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicLocationConfigurationDatabaseImporter.cs (.../HydraulicLocationConfigurationDatabaseImporter.cs) (revision f5480982e877e22b553eef7e5cc253d4dc25e4ca) @@ -42,7 +42,7 @@ /// public class HydraulicLocationConfigurationDatabaseImporter : FileImporterBase { - private const int numberOfSteps = 3; + private const int numberOfSteps = 2; private readonly List changedObservables = new List(); private readonly IHydraulicLocationConfigurationDatabaseUpdateHandler updateHandler; private readonly HydraulicBoundaryData hydraulicBoundaryData; @@ -148,7 +148,7 @@ private ReadResult ReadHydraulicLocationConfigurationDatabase() { - NotifyProgress(Resources.HydraulicBoundaryDataImporter_ProgressText_Reading_Hlcd_file, 2, numberOfSteps); + NotifyProgress(Resources.HydraulicBoundaryDataImporter_ProgressText_Reading_Hlcd_file, 1, numberOfSteps); try { using (var reader = new HydraulicLocationConfigurationDatabaseReader(FilePath)) @@ -179,7 +179,7 @@ private void AddHydraulicLocationConfigurationSettingsToDataModel(ReadHydraulicLocationConfigurationDatabaseSettings readHydraulicLocationConfigurationDatabaseSettings, bool usePrepocessorClosure) { - NotifyProgress(RiskeerCommonIOResources.Importer_ProgressText_Adding_imported_data_to_AssessmentSection, 3, numberOfSteps); + NotifyProgress(RiskeerCommonIOResources.Importer_ProgressText_Adding_imported_data_to_AssessmentSection, 2, numberOfSteps); changedObservables.AddRange(updateHandler.Update(hydraulicBoundaryData, readHydraulicLocationConfigurationDatabaseSettings, usePrepocessorClosure, FilePath)); } Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicLocationConfigurationDatabaseImporterTest.cs =================================================================== diff -u -r49405bb333ea149691f282e4d937ef4caf330394 -rf5480982e877e22b553eef7e5cc253d4dc25e4ca --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicLocationConfigurationDatabaseImporterTest.cs (.../HydraulicLocationConfigurationDatabaseImporterTest.cs) (revision 49405bb333ea149691f282e4d937ef4caf330394) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicLocationConfigurationDatabaseImporterTest.cs (.../HydraulicLocationConfigurationDatabaseImporterTest.cs) (revision f5480982e877e22b553eef7e5cc253d4dc25e4ca) @@ -43,7 +43,7 @@ [TestFixture] public class HydraulicLocationConfigurationDatabaseImporterTest { - private const int totalNumberOfSteps = 3; + private const int totalNumberOfSteps = 2; private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.IO, nameof(HydraulicLocationConfigurationDatabaseImporter)); @@ -284,9 +284,8 @@ Assert.IsTrue(importResult); var expectedProgressNotifications = new[] { - new ProgressNotification("Inlezen van het hydraulische belastingen bestand.", 1, totalNumberOfSteps), - new ProgressNotification("Inlezen van het hydraulische locatie configuratie bestand.", 2, totalNumberOfSteps), - new ProgressNotification("Geïmporteerde data toevoegen aan het traject.", 3, totalNumberOfSteps) + new ProgressNotification("Inlezen van het hydraulische locatie configuratie bestand.", 1, totalNumberOfSteps), + new ProgressNotification("Geïmporteerde data toevoegen aan het traject.", 2, totalNumberOfSteps) }; ProgressNotificationTestHelper.AssertProgressNotificationsAreEqual(expectedProgressNotifications, progressChangeNotifications); mocks.VerifyAll();