Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Plugin/HydraulicBoundaryLocationsImporter.cs =================================================================== diff -u -rd1b1324ebf4c2ea0aa5df649d451b1e7565ad1dd -r49a31d829b415ba8be3da0364b495d75488024ed --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Plugin/HydraulicBoundaryLocationsImporter.cs (.../HydraulicBoundaryLocationsImporter.cs) (revision d1b1324ebf4c2ea0aa5df649d451b1e7565ad1dd) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Plugin/HydraulicBoundaryLocationsImporter.cs (.../HydraulicBoundaryLocationsImporter.cs) (revision 49a31d829b415ba8be3da0364b495d75488024ed) @@ -118,10 +118,6 @@ var importResult = ReadHydraulicBoundaryLocations(filePath); - if (importResult == null) - { - return false; - } if (ImportIsCancelled) { log.Info(ApplicationResources.HydraulicBoundaryLocationsImporter_Import_cancelled); @@ -130,6 +126,11 @@ return false; } + if (importResult == null) + { + return false; + } + AddImportedDataToModel(importTarget.Parent, importResult); log.Info(ApplicationResources.HydraulicBoundaryLocationsImporter_Import_Import_successful); return true; Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Plugin.Test/HydraulicBoundaryLocationsImporterTest.cs =================================================================== diff -u -rd1b1324ebf4c2ea0aa5df649d451b1e7565ad1dd -r49a31d829b415ba8be3da0364b495d75488024ed --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Plugin.Test/HydraulicBoundaryLocationsImporterTest.cs (.../HydraulicBoundaryLocationsImporterTest.cs) (revision d1b1324ebf4c2ea0aa5df649d451b1e7565ad1dd) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Plugin.Test/HydraulicBoundaryLocationsImporterTest.cs (.../HydraulicBoundaryLocationsImporterTest.cs) (revision 49a31d829b415ba8be3da0364b495d75488024ed) @@ -253,10 +253,8 @@ importer.ProgressChanged = IncrementProgress; - var observableList = importTarget.Parent.HydraulicBoundaryDatabase.Locations; - // Precondition - CollectionAssert.IsEmpty(observableList); + CollectionAssert.IsEmpty(importTarget.Parent.HydraulicBoundaryDatabase.Locations); Assert.IsTrue(File.Exists(validFilePath)); importer.ValidateAndConnectTo(validFilePath); @@ -271,9 +269,9 @@ // Assert Assert.IsTrue(importResult); - Assert.AreEqual(18, observableList.Count); - CollectionAssert.AllItemsAreNotNull(observableList); - CollectionAssert.AllItemsAreUnique(observableList); + Assert.AreEqual(18, importTarget.Parent.HydraulicBoundaryDatabase.Locations.Count); + CollectionAssert.AllItemsAreNotNull(importTarget.Parent.HydraulicBoundaryDatabase.Locations); + CollectionAssert.AllItemsAreUnique(importTarget.Parent.HydraulicBoundaryDatabase.Locations); } [Test]