Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Handlers/IHydraulicBoundaryDatabaseUpdateHandler.cs =================================================================== diff -u -ra57f1c738b4cbc61c6e35c2d9cf2b341f1c398c1 -r769e0d54af84712c5e827d932d9a5e9f36a22542 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Handlers/IHydraulicBoundaryDatabaseUpdateHandler.cs (.../IHydraulicBoundaryDatabaseUpdateHandler.cs) (revision a57f1c738b4cbc61c6e35c2d9cf2b341f1c398c1) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Handlers/IHydraulicBoundaryDatabaseUpdateHandler.cs (.../IHydraulicBoundaryDatabaseUpdateHandler.cs) (revision 769e0d54af84712c5e827d932d9a5e9f36a22542) @@ -55,10 +55,12 @@ /// The hydraulic boundary database to update. /// The read hydraulic boundary database to update with. /// The read hydraulic location configuration database to update with. + /// The file path of the read hydraulic boundary database. /// All objects that have been affected by the update. /// Thrown when any parameter is null. IEnumerable Update(HydraulicBoundaryDatabase hydraulicBoundaryDatabase, ReadHydraulicBoundaryDatabase readHydraulicBoundaryDatabase, - ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase); + ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase, + string filePath); } } \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs =================================================================== diff -u -r60449dd57afa878b9deca929461da09da77ab107 -r769e0d54af84712c5e827d932d9a5e9f36a22542 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs (.../HydraulicBoundaryDatabaseImporter.cs) (revision 60449dd57afa878b9deca929461da09da77ab107) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs (.../HydraulicBoundaryDatabaseImporter.cs) (revision 769e0d54af84712c5e827d932d9a5e9f36a22542) @@ -213,7 +213,7 @@ ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase) { NotifyProgress(RingtoetsCommonIOResources.Importer_ProgressText_Adding_imported_data_to_AssessmentSection, 4, numberOfSteps); - changedObservables.AddRange(updateHandler.Update(ImportTarget, readHydraulicBoundaryDatabase, readHydraulicLocationConfigurationDatabase)); + changedObservables.AddRange(updateHandler.Update(ImportTarget, readHydraulicBoundaryDatabase, readHydraulicLocationConfigurationDatabase, FilePath)); } private ReadResult HandleCriticalFileReadError(Exception e) Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs =================================================================== diff -u -ra57f1c738b4cbc61c6e35c2d9cf2b341f1c398c1 -r769e0d54af84712c5e827d932d9a5e9f36a22542 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs (.../HydraulicBoundaryDatabaseUpdateHandler.cs) (revision a57f1c738b4cbc61c6e35c2d9cf2b341f1c398c1) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs (.../HydraulicBoundaryDatabaseUpdateHandler.cs) (revision 769e0d54af84712c5e827d932d9a5e9f36a22542) @@ -79,7 +79,8 @@ return result == DialogResult.OK; } - public IEnumerable Update(HydraulicBoundaryDatabase hydraulicBoundaryDatabase, ReadHydraulicBoundaryDatabase readHydraulicBoundaryDatabase, ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase) + public IEnumerable Update(HydraulicBoundaryDatabase hydraulicBoundaryDatabase, ReadHydraulicBoundaryDatabase readHydraulicBoundaryDatabase, + ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase, string filePath) { if (hydraulicBoundaryDatabase == null) { Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs =================================================================== diff -u -r60449dd57afa878b9deca929461da09da77ab107 -r769e0d54af84712c5e827d932d9a5e9f36a22542 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs (.../HydraulicBoundaryDatabaseImporterTest.cs) (revision 60449dd57afa878b9deca929461da09da77ab107) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs (.../HydraulicBoundaryDatabaseImporterTest.cs) (revision 769e0d54af84712c5e827d932d9a5e9f36a22542) @@ -272,6 +272,7 @@ public void Import_WhenSuccessful_UpdatesHydraulicBoundaryDatabaseWithImportedData() { // Setup + string filePath = Path.Combine(testDataPath, "complete.sqlite"); var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); var mocks = new MockRepository(); @@ -282,7 +283,8 @@ .Return(false); handler.Expect(h => h.Update(Arg.Is.Same(hydraulicBoundaryDatabase), Arg.Is.NotNull, - Arg.Is.NotNull)) + Arg.Is.NotNull, + Arg.Is.Same(filePath))) .WhenCalled(invocation => { AssertReadHydraulicBoundaryDatabase((ReadHydraulicBoundaryDatabase) invocation.Arguments[1]); @@ -293,7 +295,6 @@ .Return(Enumerable.Empty()); mocks.ReplayAll(); - string filePath = Path.Combine(testDataPath, "complete.sqlite"); var importer = new HydraulicBoundaryDatabaseImporter(hydraulicBoundaryDatabase, handler, filePath); // Call @@ -311,7 +312,7 @@ var mocks = new MockRepository(); var handler = mocks.Stub(); handler.Stub(h => h.IsConfirmationRequired(null, null)).IgnoreArguments().Return(false); - handler.Stub(h => h.Update(null, null, null)).IgnoreArguments().Return(Enumerable.Empty()); + handler.Stub(h => h.Update(null, null, null, null)).IgnoreArguments().Return(Enumerable.Empty()); mocks.ReplayAll(); string filePath = Path.Combine(testDataPath, "complete.sqlite"); @@ -436,7 +437,7 @@ var mocks = new MockRepository(); var handler = mocks.Stub(); handler.Stub(h => h.IsConfirmationRequired(null, null)).IgnoreArguments().Return(false); - handler.Stub(h => h.Update(null, null, null)).IgnoreArguments().Return(Enumerable.Empty()); + handler.Stub(h => h.Update(null, null, null, null)).IgnoreArguments().Return(Enumerable.Empty()); mocks.ReplayAll(); string filePath = Path.Combine(testDataPath, "complete.sqlite"); @@ -483,7 +484,8 @@ handler.Expect(h => h.InquireConfirmation()).Return(true); handler.Expect(h => h.Update(Arg.Is.Same(hydraulicBoundaryDatabase), Arg.Is.NotNull, - Arg.Is.NotNull)) + Arg.Is.NotNull, + Arg.Is.Same(filePath))) .Return(new[] { observable1, Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs =================================================================== diff -u -ra57f1c738b4cbc61c6e35c2d9cf2b341f1c398c1 -r769e0d54af84712c5e827d932d9a5e9f36a22542 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs (.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs) (revision a57f1c738b4cbc61c6e35c2d9cf2b341f1c398c1) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs (.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs) (revision 769e0d54af84712c5e827d932d9a5e9f36a22542) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2018. All rights reserved. +// Copyright (C) Stichting Deltares 2018. All rights reserved. // // This file is part of Ringtoets. // @@ -24,6 +24,7 @@ using NUnit.Framework; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.HydraRing.IO.HydraulicBoundaryDatabase; using Ringtoets.HydraRing.IO.TestUtil; using Ringtoets.Integration.Data; using Ringtoets.Integration.IO.Handlers; @@ -177,7 +178,7 @@ var handler = new HydraulicBoundaryDatabaseUpdateHandler(new AssessmentSection(AssessmentSectionComposition.Dike)); // Call - TestDelegate call = () => handler.Update(null, ReadHydraulicBoundaryDatabaseTestFactory.Create(), ReadHydraulicLocationConfigurationDatabaseTestFactory.Create()); + TestDelegate call = () => handler.Update(null, ReadHydraulicBoundaryDatabaseTestFactory.Create(), ReadHydraulicLocationConfigurationDatabaseTestFactory.Create(), ""); // Assert var exception = Assert.Throws(call); @@ -191,7 +192,7 @@ var handler = new HydraulicBoundaryDatabaseUpdateHandler(new AssessmentSection(AssessmentSectionComposition.Dike)); // Call - TestDelegate call = () => handler.Update(new HydraulicBoundaryDatabase(), null, ReadHydraulicLocationConfigurationDatabaseTestFactory.Create()); + TestDelegate call = () => handler.Update(new HydraulicBoundaryDatabase(), null, ReadHydraulicLocationConfigurationDatabaseTestFactory.Create(), ""); // Assert var exception = Assert.Throws(call); @@ -205,7 +206,7 @@ var handler = new HydraulicBoundaryDatabaseUpdateHandler(new AssessmentSection(AssessmentSectionComposition.Dike)); // Call - TestDelegate call = () => handler.Update(new HydraulicBoundaryDatabase(), ReadHydraulicBoundaryDatabaseTestFactory.Create(), null); + TestDelegate call = () => handler.Update(new HydraulicBoundaryDatabase(), ReadHydraulicBoundaryDatabaseTestFactory.Create(), null, ""); // Assert var exception = Assert.Throws(call);