Index: Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs =================================================================== diff -u -r8905298103eb01ce13dd5c1a2f267f879d4fda3e -rea9aa0d2c261d907476c5684e388b49aafb3fc15 --- Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs (.../FileImporterBase.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) +++ Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs (.../FileImporterBase.cs) (revision ea9aa0d2c261d907476c5684e388b49aafb3fc15) @@ -70,11 +70,6 @@ public virtual void DoPostImportUpdates() { - if (Canceled) - { - return; - } - var observableTarget = ImportTarget as IObservable; if (observableTarget != null) { Index: Core/Common/src/Core.Common.Base/IO/IFileImporter.cs =================================================================== diff -u -r9063c3c60f936760953c52185b72f0cb2dce9bf8 -rea9aa0d2c261d907476c5684e388b49aafb3fc15 --- Core/Common/src/Core.Common.Base/IO/IFileImporter.cs (.../IFileImporter.cs) (revision 9063c3c60f936760953c52185b72f0cb2dce9bf8) +++ Core/Common/src/Core.Common.Base/IO/IFileImporter.cs (.../IFileImporter.cs) (revision ea9aa0d2c261d907476c5684e388b49aafb3fc15) @@ -47,8 +47,7 @@ /// Notifies all observers of instances that have been /// changed during the import. /// - /// This method should be called by caller who calls - /// on this importer. + /// This method should also be called when the import routine was canceled. void DoPostImportUpdates(); } } \ No newline at end of file Index: Core/Common/test/Core.Common.Base.Test/IO/FileImporterBaseTest.cs =================================================================== diff -u -r49c5da81f49a23dd6e66526d264a08bf510e6963 -rea9aa0d2c261d907476c5684e388b49aafb3fc15 --- Core/Common/test/Core.Common.Base.Test/IO/FileImporterBaseTest.cs (.../FileImporterBaseTest.cs) (revision 49c5da81f49a23dd6e66526d264a08bf510e6963) +++ Core/Common/test/Core.Common.Base.Test/IO/FileImporterBaseTest.cs (.../FileImporterBaseTest.cs) (revision ea9aa0d2c261d907476c5684e388b49aafb3fc15) @@ -113,12 +113,14 @@ } [Test] - public void DoPostImportUpdates_ImportCancelled_NoNotifyObserversCalled() + public void DoPostImportUpdates_ImportCancelled_NotifyObservers() { // Setup var mocks = new MockRepository(); var observableInstance = mocks.StrictMock(); var observableTarget = mocks.StrictMock(); + observableInstance.Expect(o => o.NotifyObservers()); + observableTarget.Expect(o => o.NotifyObservers()); mocks.ReplayAll(); var simpleImporter = new SimpleFileImporter(observableTarget) @@ -134,7 +136,7 @@ simpleImporter.DoPostImportUpdates(); // Assert - mocks.VerifyAll(); // Assert no NotifyObservers were called + mocks.VerifyAll(); // Assert NotifyObservers is called } [Test] Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/ReferenceLines/ReferenceLineImporterTest.cs =================================================================== diff -u -rce9e1d476f00cfb42ce2a8ab6c762baf5abfd97b -rea9aa0d2c261d907476c5684e388b49aafb3fc15 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/ReferenceLines/ReferenceLineImporterTest.cs (.../ReferenceLineImporterTest.cs) (revision ce9e1d476f00cfb42ce2a8ab6c762baf5abfd97b) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/ReferenceLines/ReferenceLineImporterTest.cs (.../ReferenceLineImporterTest.cs) (revision ea9aa0d2c261d907476c5684e388b49aafb3fc15) @@ -354,7 +354,7 @@ } [Test] - public void DoPostImportUpdates_CancellingImport_DoNotNotifyObservers() + public void DoPostImportUpdates_CancellingImport_NotifyObservers() { // Setup var path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, "traject_10-2.shp"); @@ -365,6 +365,7 @@ var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = originalReferenceLine; assessmentSection.Expect(section => section.Attach(contextObserver)); + assessmentSection.Expect(section => section.NotifyObservers()); var handler = mocks.StrictMock(); handler.Expect(h => h.DoPostReplacementUpdates()); @@ -389,7 +390,7 @@ importer.DoPostImportUpdates(); // Assert - mocks.VerifyAll(); // Expect no NotifyObserver calls + mocks.VerifyAll(); // Expect NotifyObservers call } [Test] Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs =================================================================== diff -u -rb7b12fd198046b1503194e07a37a7b4525b4c337 -rea9aa0d2c261d907476c5684e388b49aafb3fc15 --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs (.../PipingSurfaceLinesCsvImporter.cs) (revision b7b12fd198046b1503194e07a37a7b4525b4c337) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs (.../PipingSurfaceLinesCsvImporter.cs) (revision ea9aa0d2c261d907476c5684e388b49aafb3fc15) @@ -32,8 +32,6 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Piping.IO.SurfaceLines; using Ringtoets.Piping.Primitives; -using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources; -using PipingDataResources = Ringtoets.Piping.Data.Properties.Resources; using RingtoetsPluginResources = Ringtoets.Piping.Plugin.Properties.Resources; namespace Ringtoets.Piping.Plugin.FileImporter