Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs
===================================================================
diff -u -r96a6ad152dc45508f0501e489c29611244e9d76c -rec03b23520b9fbc7e2f79f2a5589bb832b510fda
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision 96a6ad152dc45508f0501e489c29611244e9d76c)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision ec03b23520b9fbc7e2f79f2a5589bb832b510fda)
@@ -80,7 +80,7 @@
             const string locationName = "locationName";
             const string activityDescription = "GetActivityDescription";
 
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, locationName, 0, 0);
+            var calculation = new DesignWaterLevelCalculation(new TestHydraulicBoundaryLocation(locationName));
 
             var calculationMessageProvider = mockRepository.StrictMock<ICalculationMessageProvider>();
             calculationMessageProvider.Expect(calc => calc.GetActivityDescription(locationName)).Return(activityDescription);
@@ -89,7 +89,7 @@
             string validFilePath = Path.Combine(testDataPath, validFile);
 
             // Call
-            var activity = new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocation,
+            var activity = new DesignWaterLevelCalculationActivity(calculation,
                                                                    validFilePath,
                                                                    1,
                                                                    calculationMessageProvider);
@@ -106,12 +106,12 @@
         public void ParameteredConstructor_NullCalculationServiceMessageProvider_ThrowsArgumentNullException()
         {
             // Setup
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0, 0);
+            var calculation = new DesignWaterLevelCalculation(new TestHydraulicBoundaryLocation(string.Empty));
 
             string validFilePath = Path.Combine(testDataPath, validFile);
 
             // Call
-            TestDelegate call = () => new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocation,
+            TestDelegate call = () => new DesignWaterLevelCalculationActivity(calculation,
                                                                               validFilePath,
                                                                               1,
                                                                               null);
@@ -122,7 +122,7 @@
         }
 
         [Test]
-        public void ParameteredConstructor_HydraulicBoundaryLocationNull_ThrowsArgumentNullException()
+        public void ParameteredConstructor_DesignWaterLevelCalculationNull_ThrowsArgumentNullException()
         {
             // Setup
             var calculationMessageProviderStub = mockRepository.Stub<ICalculationMessageProvider>();
@@ -138,7 +138,7 @@
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("hydraulicBoundaryLocation", exception.ParamName);
+            Assert.AreEqual("designWaterLevelCalculation", exception.ParamName);
             mockRepository.VerifyAll();
         }
 
@@ -150,14 +150,14 @@
             const string locationName = "testLocation";
             const string calculationName = "calculationName";
 
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, locationName, 0, 0);
+            var calculation = new DesignWaterLevelCalculation(new TestHydraulicBoundaryLocation(locationName));
 
             var calculationMessageProvider = mockRepository.StrictMock<ICalculationMessageProvider>();
             calculationMessageProvider.Expect(calc => calc.GetActivityDescription(locationName)).Return(string.Empty);
             calculationMessageProvider.Expect(calc => calc.GetCalculationName(locationName)).Return(calculationName).Repeat.AtLeastOnce();
             mockRepository.ReplayAll();
 
-            var activity = new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocation,
+            var activity = new DesignWaterLevelCalculationActivity(calculation,
                                                                    inValidFilePath,
                                                                    1,
                                                                    calculationMessageProvider);
@@ -187,7 +187,7 @@
             const string calculationName = "calculationName";
             const double norm = 1.0 / 30;
 
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, locationName, 0, 0);
+            var calculation = new DesignWaterLevelCalculation(new TestHydraulicBoundaryLocation(locationName));
             var calculator = new TestDesignWaterLevelCalculator
             {
                 Converged = true
@@ -200,7 +200,7 @@
             calculationMessageProvider.Stub(calc => calc.GetCalculationName(locationName)).Return(calculationName);
             mockRepository.ReplayAll();
 
-            var activity = new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocation,
+            var activity = new DesignWaterLevelCalculationActivity(calculation,
                                                                    validFilePath,
                                                                    norm,
                                                                    calculationMessageProvider);
@@ -224,7 +224,7 @@
 
                 AssessmentLevelCalculationInput designWaterLevelCalculationInput = calculator.ReceivedInputs.Single();
 
-                Assert.AreEqual(hydraulicBoundaryLocation.Id, designWaterLevelCalculationInput.HydraulicBoundaryLocationId);
+                Assert.AreEqual(calculation.GetId(), designWaterLevelCalculationInput.HydraulicBoundaryLocationId);
                 Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(norm), designWaterLevelCalculationInput.Beta);
             }
             Assert.AreEqual(ActivityState.Executed, activity.State);
@@ -255,8 +255,9 @@
                     Output = new TestHydraulicBoundaryLocationOutput(3.0, CalculationConvergence.CalculatedConverged)
                 }
             };
+            var calculation = new DesignWaterLevelCalculation(hydraulicBoundaryLocation);
 
-            var activity = new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocation,
+            var activity = new DesignWaterLevelCalculationActivity(calculation,
                                                                    validFilePath,
                                                                    norm,
                                                                    calculationMessageProvider);
@@ -294,7 +295,9 @@
 
             string validFilePath = Path.Combine(testDataPath, validFile);
 
-            var activity = new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocation,
+            var calculation = new DesignWaterLevelCalculation(hydraulicBoundaryLocation);
+
+            var activity = new DesignWaterLevelCalculationActivity(calculation,
                                                                    validFilePath,
                                                                    norm,
                                                                    calculationMessageProvider);
@@ -351,8 +354,10 @@
                 }
             };
 
+            var calculation = new DesignWaterLevelCalculation(hydraulicBoundaryLocation);
+
             string validFilePath = Path.Combine(testDataPath, validFile);
-            var activity = new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocation,
+            var activity = new DesignWaterLevelCalculationActivity(calculation,
                                                                    validFilePath,
                                                                    30,
                                                                    calculationMessageProvider);
@@ -402,9 +407,11 @@
                 }
             };
 
+            var calculation = new DesignWaterLevelCalculation(hydraulicBoundaryLocation);
+
             string validFilePath = Path.Combine(testDataPath, validFile);
             const double norm = 1.0 / 300;
-            var activity = new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocation,
+            var activity = new DesignWaterLevelCalculationActivity(calculation,
                                                                    validFilePath,
                                                                    norm,
                                                                    calculationMessageProvider);
@@ -454,8 +461,10 @@
 
             string validFilePath = Path.Combine(testDataPath, validFile);
 
+            var calculation = new DesignWaterLevelCalculation(hydraulicBoundaryLocation);
+
             const double norm = 1.0 / 30;
-            var activity = new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocation,
+            var activity = new DesignWaterLevelCalculationActivity(calculation,
                                                                    validFilePath,
                                                                    norm,
                                                                    calculationMessageProvider);
@@ -480,14 +489,15 @@
         {
             // Setup
             var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+            var calculation = new DesignWaterLevelCalculation(hydraulicBoundaryLocation);
 
             var calculationMessageProvider = mockRepository.Stub<ICalculationMessageProvider>();
             var observer = mockRepository.StrictMock<IObserver>();
             observer.Expect(o => o.UpdateObserver());
             hydraulicBoundaryLocation.Attach(observer);
             mockRepository.ReplayAll();
 
-            var activity = new TestDesignWaterLevelCalculationActivity(hydraulicBoundaryLocation,
+            var activity = new TestDesignWaterLevelCalculationActivity(calculation,
                                                                        Path.Combine(testDataPath, validFile),
                                                                        1.0,
                                                                        calculationMessageProvider,
@@ -502,12 +512,12 @@
 
         private class TestDesignWaterLevelCalculationActivity : DesignWaterLevelCalculationActivity
         {
-            public TestDesignWaterLevelCalculationActivity(HydraulicBoundaryLocation hydraulicBoundaryLocation,
+            public TestDesignWaterLevelCalculationActivity(DesignWaterLevelCalculation designWaterLevelCalculation,
                                                            string hydraulicBoundaryDatabaseFilePath,
                                                            double norm,
                                                            ICalculationMessageProvider messageProvider,
                                                            ActivityState state)
-                : base(hydraulicBoundaryLocation,
+                : base(designWaterLevelCalculation,
                        hydraulicBoundaryDatabaseFilePath,
                        norm,
                        messageProvider)