Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Handlers/IHydraulicBoundaryDatabaseUpdateHandler.cs =================================================================== diff -u -r9a3bc5fa510d6e744f8edec4825daf0e0f40f865 -r60449dd57afa878b9deca929461da09da77ab107 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Handlers/IHydraulicBoundaryDatabaseUpdateHandler.cs (.../IHydraulicBoundaryDatabaseUpdateHandler.cs) (revision 9a3bc5fa510d6e744f8edec4825daf0e0f40f865) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Handlers/IHydraulicBoundaryDatabaseUpdateHandler.cs (.../IHydraulicBoundaryDatabaseUpdateHandler.cs) (revision 60449dd57afa878b9deca929461da09da77ab107) @@ -35,9 +35,10 @@ /// /// Checks whether confirmation is required before updating the . /// + /// The hydraulic boundary database. /// The read hydraulic boundary database. /// true when confirmation is required; false otherwise. - bool IsConfirmationRequired(ReadHydraulicBoundaryDatabase readHydraulicBoundaryDatabase); + bool IsConfirmationRequired(HydraulicBoundaryDatabase hydraulicBoundaryDatabase, ReadHydraulicBoundaryDatabase readHydraulicBoundaryDatabase); /// /// Gets confirmation for updating the . Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs =================================================================== diff -u -rceaf0239a1fabbde77c9c53d26abd1aaee11f30e -r60449dd57afa878b9deca929461da09da77ab107 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs (.../HydraulicBoundaryDatabaseImporter.cs) (revision ceaf0239a1fabbde77c9c53d26abd1aaee11f30e) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs (.../HydraulicBoundaryDatabaseImporter.cs) (revision 60449dd57afa878b9deca929461da09da77ab107) @@ -120,7 +120,7 @@ { var clearDependentData = false; - if (updateHandler.IsConfirmationRequired(readHydraulicBoundaryDatabase)) + if (updateHandler.IsConfirmationRequired(ImportTarget, readHydraulicBoundaryDatabase)) { if (!updateHandler.InquireConfirmation()) { Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs =================================================================== diff -u -r32d96bc10b1f0871512205da08fab72b77c36901 -r60449dd57afa878b9deca929461da09da77ab107 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs (.../HydraulicBoundaryDatabaseUpdateHandler.cs) (revision 32d96bc10b1f0871512205da08fab72b77c36901) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs (.../HydraulicBoundaryDatabaseUpdateHandler.cs) (revision 60449dd57afa878b9deca929461da09da77ab107) @@ -53,7 +53,7 @@ this.assessmentSection = assessmentSection; } - public bool IsConfirmationRequired(ReadHydraulicBoundaryDatabase readHydraulicBoundaryDatabase) + public bool IsConfirmationRequired(HydraulicBoundaryDatabase hydraulicBoundaryDatabase, ReadHydraulicBoundaryDatabase readHydraulicBoundaryDatabase) { throw new NotImplementedException(); } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs =================================================================== diff -u -rceaf0239a1fabbde77c9c53d26abd1aaee11f30e -r60449dd57afa878b9deca929461da09da77ab107 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs (.../HydraulicBoundaryDatabaseImporterTest.cs) (revision ceaf0239a1fabbde77c9c53d26abd1aaee11f30e) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs (.../HydraulicBoundaryDatabaseImporterTest.cs) (revision 60449dd57afa878b9deca929461da09da77ab107) @@ -171,7 +171,7 @@ // Setup var mocks = new MockRepository(); var handler = mocks.StrictMock(); - handler.Stub(h => h.IsConfirmationRequired(null)).IgnoreArguments().Return(false); + handler.Stub(h => h.IsConfirmationRequired(null, null)).IgnoreArguments().Return(false); mocks.ReplayAll(); string path = Path.Combine(testDataPath, "withoutHLCD", "complete.sqlite"); @@ -196,7 +196,7 @@ // Setup var mocks = new MockRepository(); var handler = mocks.StrictMock(); - handler.Stub(h => h.IsConfirmationRequired(null)).IgnoreArguments().Return(false); + handler.Stub(h => h.IsConfirmationRequired(null, null)).IgnoreArguments().Return(false); mocks.ReplayAll(); string path = Path.Combine(testDataPath, "EmptyHLCDSchema", "complete.sqlite"); @@ -222,7 +222,7 @@ // Setup var mocks = new MockRepository(); var handler = mocks.StrictMock(); - handler.Stub(h => h.IsConfirmationRequired(null)).IgnoreArguments().Return(false); + handler.Stub(h => h.IsConfirmationRequired(null, null)).IgnoreArguments().Return(false); mocks.ReplayAll(); string path = Path.Combine(testDataPath, "InvalidHLCDSchema", "complete.sqlite"); @@ -248,7 +248,7 @@ // Setup var mocks = new MockRepository(); var handler = mocks.StrictMock(); - handler.Stub(h => h.IsConfirmationRequired(null)).IgnoreArguments().Return(false); + handler.Stub(h => h.IsConfirmationRequired(null, null)).IgnoreArguments().Return(false); mocks.ReplayAll(); string path = Path.Combine(testDataPath, "withoutSettings", "complete.sqlite"); @@ -276,16 +276,15 @@ var mocks = new MockRepository(); var handler = mocks.StrictMock(); - handler.Stub(h => h.IsConfirmationRequired(Arg.Is.NotNull)) - .WhenCalled(invocation => { AssertReadHydraulicBoundaryDatabase((ReadHydraulicBoundaryDatabase) invocation.Arguments[0]); }) + handler.Stub(h => h.IsConfirmationRequired(Arg.Is.Same(hydraulicBoundaryDatabase), + Arg.Is.NotNull)) + .WhenCalled(invocation => { AssertReadHydraulicBoundaryDatabase((ReadHydraulicBoundaryDatabase) invocation.Arguments[1]); }) .Return(false); - handler.Expect(h => h.Update(Arg.Is.NotNull, + handler.Expect(h => h.Update(Arg.Is.Same(hydraulicBoundaryDatabase), Arg.Is.NotNull, Arg.Is.NotNull)) .WhenCalled(invocation => { - Assert.AreSame(hydraulicBoundaryDatabase, invocation.Arguments[0]); - AssertReadHydraulicBoundaryDatabase((ReadHydraulicBoundaryDatabase) invocation.Arguments[1]); var readHydraulicLocationConfigurationDatabase = (ReadHydraulicLocationConfigurationDatabase) invocation.Arguments[2]; @@ -311,7 +310,7 @@ // Setup var mocks = new MockRepository(); var handler = mocks.Stub(); - handler.Stub(h => h.IsConfirmationRequired(null)).IgnoreArguments().Return(false); + handler.Stub(h => h.IsConfirmationRequired(null, null)).IgnoreArguments().Return(false); handler.Stub(h => h.Update(null, null, null)).IgnoreArguments().Return(Enumerable.Empty()); mocks.ReplayAll(); @@ -370,8 +369,9 @@ // Setup var mocks = new MockRepository(); var handler = mocks.StrictMock(); - handler.Expect(h => h.IsConfirmationRequired(Arg.Is.NotNull)) - .WhenCalled(invocation => { AssertReadHydraulicBoundaryDatabase((ReadHydraulicBoundaryDatabase) invocation.Arguments[0]); }) + handler.Expect(h => h.IsConfirmationRequired(Arg.Is.NotNull, + Arg.Is.NotNull)) + .WhenCalled(invocation => { AssertReadHydraulicBoundaryDatabase((ReadHydraulicBoundaryDatabase) invocation.Arguments[1]); }) .Return(true); handler.Expect(h => h.InquireConfirmation()).Return(false); mocks.ReplayAll(); @@ -401,7 +401,7 @@ // Setup var mocks = new MockRepository(); var handler = mocks.StrictMock(); - handler.Stub(h => h.IsConfirmationRequired(null)).IgnoreArguments().Return(false); + handler.Stub(h => h.IsConfirmationRequired(null, null)).IgnoreArguments().Return(false); mocks.ReplayAll(); string filePath = Path.Combine(testDataPath, "complete.sqlite"); @@ -435,7 +435,7 @@ // Setup var mocks = new MockRepository(); var handler = mocks.Stub(); - handler.Stub(h => h.IsConfirmationRequired(null)).IgnoreArguments().Return(false); + handler.Stub(h => h.IsConfirmationRequired(null, null)).IgnoreArguments().Return(false); handler.Stub(h => h.Update(null, null, null)).IgnoreArguments().Return(Enumerable.Empty()); mocks.ReplayAll(); @@ -479,7 +479,7 @@ observable2.Expect(o => o.NotifyObservers()); var handler = mocks.StrictMock(); - handler.Expect(h => h.IsConfirmationRequired(null)).IgnoreArguments().Return(true); + handler.Expect(h => h.IsConfirmationRequired(null, null)).IgnoreArguments().Return(true); handler.Expect(h => h.InquireConfirmation()).Return(true); handler.Expect(h => h.Update(Arg.Is.Same(hydraulicBoundaryDatabase), Arg.Is.NotNull, @@ -516,7 +516,7 @@ var observer = mocks.StrictMock(); var handler = mocks.StrictMock(); var importer = new HydraulicBoundaryDatabaseImporter(hydraulicBoundaryDatabase, handler, filePath); - handler.Expect(h => h.IsConfirmationRequired(null)).IgnoreArguments() + handler.Expect(h => h.IsConfirmationRequired(null, null)).IgnoreArguments() .WhenCalled(invocation => importer.Cancel()) .Return(false);