Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs =================================================================== diff -u -r2f01022374461fa646d0d4185ca5c248c330de7e -r088f1f6f74733f2b37f6b79b434026bdbc34c941 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs (.../HydraulicBoundaryDatabaseImporterTest.cs) (revision 2f01022374461fa646d0d4185ca5c248c330de7e) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs (.../HydraulicBoundaryDatabaseImporterTest.cs) (revision 088f1f6f74733f2b37f6b79b434026bdbc34c941) @@ -144,8 +144,11 @@ // Setup var mocks = new MockRepository(); var assessmentSection = mocks.StrictMock(); + var observer = mocks.StrictMock(); mocks.ReplayAll(); + assessmentSection.Attach(observer); + var context = new HydraulicBoundaryDatabaseContext(assessmentSection); var expectedMessage = "Er is nog geen bestand geopend."; @@ -160,13 +163,19 @@ } [Test] - public void Import_ImportingToValidTargetWithValidFile_ImportHydraulicBoundaryLocationsToCollection() + public void Import_ImportingToValidTargetWithValidFile_ImportHydraulicBoundaryLocationsToCollectionAndAssessmentSectionNotified() { // Setup var mocks = new MockRepository(); var assessmentSection = mocks.StrictMock(); + var observer = mocks.StrictMock(); + + observer.Expect(o => o.UpdateObserver()); + mocks.ReplayAll(); + assessmentSection.Attach(observer); + var importTarget = new HydraulicBoundaryDatabaseContext(assessmentSection); string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); @@ -199,17 +208,17 @@ { // Setup var mocks = new MockRepository(); - var observer = mocks.StrictMock(); var assessmentSection = mocks.StrictMock(); + var observer = mocks.StrictMock(); mocks.ReplayAll(); + assessmentSection.Attach(observer); + var importTarget = new HydraulicBoundaryDatabaseContext(assessmentSection); string corruptPath = Path.Combine(testDataPath, "corruptschema.sqlite"); var expectedLogMessage = string.Format("Fout bij het lezen van bestand '{0}': Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database. Het bestand wordt overgeslagen.", corruptPath); - importTarget.Attach(observer); - var importResult = true; importer.ValidateAndConnectTo(corruptPath); @@ -222,18 +231,21 @@ Assert.IsFalse(importResult); Assert.IsNull(importTarget.Parent.HydraulicBoundaryDatabase, "No HydraulicBoundaryDatabase object should be created when import from corrupt database."); - mocks.VerifyAll(); // Expect no calls on 'observer' + mocks.VerifyAll(); } [Test] public void Import_CorruptSchemaFile_ReturnsFalse() { // Setup var mocks = new MockRepository(); - var assessmentSectionMock = mocks.StrictMock(); - var importTarget = mocks.StrictMock(assessmentSectionMock); + var assessmentSection = mocks.StrictMock(); + var observer = mocks.StrictMock(); + var importTarget = mocks.StrictMock(assessmentSection); mocks.ReplayAll(); + assessmentSection.Attach(observer); + string validFilePath = Path.Combine(testDataPath, "corruptschema.sqlite"); string expectedMessage = new FileReaderErrorMessageBuilder(validFilePath) .Build("Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database. Het bestand wordt overgeslagen.");