Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationGuiServiceTest.cs
===================================================================
diff -u -r915001caffacbbee15c0e3bf449072245bc5f509 -r75ac52f6f7e203e77dd212e6c32d68e7e58c28b2
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationGuiServiceTest.cs	(.../HydraulicBoundaryLocationGuiServiceTest.cs)	(revision 915001caffacbbee15c0e3bf449072245bc5f509)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationGuiServiceTest.cs	(.../HydraulicBoundaryLocationGuiServiceTest.cs)	(revision 75ac52f6f7e203e77dd212e6c32d68e7e58c28b2)
@@ -73,7 +73,7 @@
         }
 
         [Test]
-        public void CalculateDesignWaterLevels_NullHydraulicBoundaryDatabase_ThrowsArgumentNullException()
+        public void CalculateDesignWaterLevels_NullObservable_ThrowsArgumentNullException()
         {
             // Setup
             var locations = Enumerable.Empty<HydraulicBoundaryLocation>();
@@ -82,11 +82,11 @@
                 var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent);
 
                 // Call
-                TestDelegate test = () => guiService.CalculateDesignWaterLevels(null, locations, "", 1);
+                TestDelegate test = () => guiService.CalculateDesignWaterLevels("", null, locations, "", 1);
 
                 // Assert
                 string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
-                const string expectedParamName = "hydraulicBoundaryDatabase";
+                const string expectedParamName = "observable";
                 Assert.AreEqual(expectedParamName, paramName);
             }
         }
@@ -95,44 +95,40 @@
         public void CalculateDesignWaterLevels_NullLocations_ThrowsArgumentNullException()
         {
             // Setup
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            var observableMock = mockRepository.StrictMock<IObservable>();
+            mockRepository.ReplayAll();
+            const string databasePath = "Does not exist";
 
             using (var viewParent = new Form())
             {
                 var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent);
 
                 // Call
-                TestDelegate test = () => guiService.CalculateDesignWaterLevels(hydraulicBoundaryDatabase, null, "", 1);
+                TestDelegate test = () => guiService.CalculateDesignWaterLevels(databasePath, observableMock, null, "", 1);
 
                 // Assert
                 string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
                 const string expectedParamName = "locations";
                 Assert.AreEqual(expectedParamName, paramName);
             }
+            mockRepository.VerifyAll();
         }
 
         [Test]
         public void CalculateDesignWaterLevels_HydraulicDatabaseDoesNotExist_LogsErrorAndDoesNotNotifyObservers()
         {
             // Setup
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
-            {
-                FilePath = "Does not exist"
-            };
-
-            var observerMock = mockRepository.StrictMock<IObserver>();
+            var observableMock = mockRepository.StrictMock<IObservable>();
             mockRepository.ReplayAll();
-
-            hydraulicBoundaryDatabase.Attach(observerMock);
-
+            const string databasePath = "Does not exist";
             var locations = Enumerable.Empty<HydraulicBoundaryLocation>();
 
             using (var viewParent = new Form())
             {
                 var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent);
 
                 // Call
-                Action call = () => guiService.CalculateDesignWaterLevels(hydraulicBoundaryDatabase, locations, "", 1);
+                Action call = () => guiService.CalculateDesignWaterLevels(databasePath, observableMock, locations, "", 1);
 
                 // Assert
                 TestHelper.AssertLogMessages(call, messages =>
@@ -149,18 +145,12 @@
         public void CalculateDesignWaterLevels_ValidPathEmptyList_NotifyObserversButNoLog()
         {
             // Setup
-            string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
-            {
-                FilePath = validFilePath
-            };
+            string validDatabasePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
 
-            var observerMock = mockRepository.StrictMock<IObserver>();
-            observerMock.Expect(o => o.UpdateObserver());
+            var observableMock = mockRepository.StrictMock<IObservable>();
+            observableMock.NotifyObservers();
             mockRepository.ReplayAll();
 
-            hydraulicBoundaryDatabase.Attach(observerMock);
-
             DialogBoxHandler = (name, wnd) =>
             {
                 // Expect an activity dialog which is automatically closed
@@ -172,7 +162,7 @@
                 var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent);
 
                 // Call
-                Action call = () => guiService.CalculateDesignWaterLevels(hydraulicBoundaryDatabase, locations, "", 1);
+                Action call = () => guiService.CalculateDesignWaterLevels(validDatabasePath, observableMock, locations, "", 1);
 
                 // Assert
                 TestHelper.AssertLogMessagesCount(call, 0);
@@ -184,18 +174,12 @@
         public void CalculateDesignWaterLevels_ValidPathOneLocationInTheList_NotifyObserversAndLogsMessages()
         {
             // Setup
-            string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
-            {
-                FilePath = validFilePath
-            };
+            string validDatabasePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
 
-            var observerMock = mockRepository.StrictMock<IObserver>();
-            observerMock.Expect(o => o.UpdateObserver());
+            var observableMock = mockRepository.StrictMock<IObservable>();
+            observableMock.NotifyObservers();
             mockRepository.ReplayAll();
 
-            hydraulicBoundaryDatabase.Attach(observerMock);
-
             DialogBoxHandler = (name, wnd) =>
             {
                 // Expect an activity dialog which is automatically closed
@@ -211,7 +195,7 @@
                 var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent);
 
                 // Call
-                Action call = () => guiService.CalculateDesignWaterLevels(hydraulicBoundaryDatabase, locations, "", 1);
+                Action call = () => guiService.CalculateDesignWaterLevels(validDatabasePath, observableMock, locations, "", 1);
 
                 // Assert
                 TestHelper.AssertLogMessages(call, messages =>
@@ -230,7 +214,7 @@
         }
 
         [Test]
-        public void CalculateWaveHeights_NullHydraulicBoundaryDatabase_ThrowsArgumentNullException()
+        public void CalculateWaveHeights_NullObservable_ThrowsArgumentNullException()
         {
             // Setup
             var locations = Enumerable.Empty<HydraulicBoundaryLocation>();
@@ -240,11 +224,11 @@
                 var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent);
 
                 // Call
-                TestDelegate test = () => guiService.CalculateWaveHeights(null, locations, "", 1);
+                TestDelegate test = () => guiService.CalculateWaveHeights("", null, locations, "", 1);
 
                 // Assert
                 string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
-                const string expectedParamName = "hydraulicBoundaryDatabase";
+                const string expectedParamName = "observable";
                 Assert.AreEqual(expectedParamName, paramName);
             }
         }
@@ -253,14 +237,16 @@
         public void CalculateWaveHeights_NullLocations_ThrowsArgumentNullException()
         {
             // Setup
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            var observableMock = mockRepository.StrictMock<IObservable>();
+            mockRepository.ReplayAll();
+            const string databasePath = "Does not exist";
 
             using (var viewParent = new Form())
             {
                 var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent);
 
                 // Call
-                TestDelegate test = () => guiService.CalculateWaveHeights(hydraulicBoundaryDatabase, null, "", 1);
+                TestDelegate test = () => guiService.CalculateWaveHeights(databasePath, observableMock, null, "", 1);
 
                 // Assert
                 string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
@@ -273,14 +259,9 @@
         public void CalculateWaveHeights_HydraulicDatabaseDoesNotExist_LogsErrorAndDoesNotNotifyObservers()
         {
             // Setup
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
-            {
-                FilePath = "Does not exist"
-            };
-
-            var observerMock = mockRepository.StrictMock<IObserver>();
+            var observableMock = mockRepository.StrictMock<IObservable>();
             mockRepository.ReplayAll();
-            hydraulicBoundaryDatabase.Attach(observerMock);
+            const string databasePath = "Does not exist";
 
             var locations = Enumerable.Empty<HydraulicBoundaryLocation>();
 
@@ -289,7 +270,7 @@
                 var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent);
 
                 // Call
-                Action call = () => guiService.CalculateWaveHeights(hydraulicBoundaryDatabase, locations, "", 1);
+                Action call = () => guiService.CalculateWaveHeights(databasePath, observableMock, locations, "", 1);
 
                 // Assert
                 TestHelper.AssertLogMessages(call, messages =>
@@ -306,18 +287,12 @@
         public void CalculateWaveHeights_ValidPathEmptyList_NotifyObserversButNoLog()
         {
             // Setup
-            string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
-            {
-                FilePath = validFilePath
-            };
+            string validDatabasePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
 
-            var observerMock = mockRepository.StrictMock<IObserver>();
-            observerMock.Expect(o => o.UpdateObserver());
+            var observableMock = mockRepository.StrictMock<IObservable>();
+            observableMock.NotifyObservers();
             mockRepository.ReplayAll();
 
-            hydraulicBoundaryDatabase.Attach(observerMock);
-
             DialogBoxHandler = (name, wnd) =>
             {
                 // Expect an activity dialog which is automatically closed
@@ -330,7 +305,7 @@
                 var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent);
 
                 // Call
-                Action call = () => guiService.CalculateWaveHeights(hydraulicBoundaryDatabase, locations, "", 1);
+                Action call = () => guiService.CalculateWaveHeights(validDatabasePath, observableMock, locations, "", 1);
 
                 // Assert
                 TestHelper.AssertLogMessagesCount(call, 0);
@@ -342,18 +317,12 @@
         public void CalculateWaveHeights_ValidPathOneLocationInTheList_NotifyObserversAndLogsMessages()
         {
             // Setup
-            string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
-            {
-                FilePath = validFilePath
-            };
+            string validDatabasePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
 
-            var observerMock = mockRepository.StrictMock<IObserver>();
-            observerMock.Expect(o => o.UpdateObserver());
+            var observableMock = mockRepository.StrictMock<IObservable>();
+            observableMock.NotifyObservers();
             mockRepository.ReplayAll();
 
-            hydraulicBoundaryDatabase.Attach(observerMock);
-
             DialogBoxHandler = (name, wnd) =>
             {
                 // Expect an activity dialog which is automatically closed
@@ -369,7 +338,7 @@
                 var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent);
 
                 // Call
-                Action call = () => guiService.CalculateWaveHeights(hydraulicBoundaryDatabase, locations, "", 1);
+                Action call = () => guiService.CalculateWaveHeights(validDatabasePath, observableMock, locations, "", 1);
 
                 // Assert
                 TestHelper.AssertLogMessages(call, messages =>