Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationActivityFactoryTest.cs
===================================================================
diff -u -r4fc2d8aef4716a3b5c6fb5944fec5769ffdf2ba3 -rdd347e5ef5916532cce1004e1941e8523ec448b4
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationActivityFactoryTest.cs	(.../ClosingStructuresCalculationActivityFactoryTest.cs)	(revision 4fc2d8aef4716a3b5c6fb5944fec5769ffdf2ba3)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationActivityFactoryTest.cs	(.../ClosingStructuresCalculationActivityFactoryTest.cs)	(revision dd347e5ef5916532cce1004e1941e8523ec448b4)
@@ -1,4 +1,4 @@
-// Copyright (C) Stichting Deltares 2017. All rights reserved.
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
 //
 // This file is part of Ringtoets.
 //
@@ -35,9 +35,11 @@
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Service;
-using Ringtoets.HydraRing.Calculation.Calculator.Factory;
-using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
+using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
+using Riskeer.HydraRing.Calculation.Calculator.Factory;
+using Riskeer.HydraRing.Calculation.Data.Input;
+using Riskeer.HydraRing.Calculation.Data.Input.Structures;
 
 namespace Ringtoets.ClosingStructures.Service.Test
 {
@@ -121,7 +123,7 @@
 
             // Assert
             Assert.IsInstanceOf<ClosingStructuresCalculationActivity>(activity);
-            AssertClosingStructuresCalculationActivity(activity, calculation);
+            AssertClosingStructuresCalculationActivity(activity, calculation, assessmentSection.HydraulicBoundaryDatabase);
             mocks.VerifyAll();
         }
 
@@ -208,8 +210,9 @@
             CollectionAssert.AllItemsAreInstancesOfType(activities, typeof(ClosingStructuresCalculationActivity));
             Assert.AreEqual(2, activities.Count());
 
-            AssertClosingStructuresCalculationActivity(activities.First(), calculation1);
-            AssertClosingStructuresCalculationActivity(activities.ElementAt(1), calculation2);
+            HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase;
+            AssertClosingStructuresCalculationActivity(activities.First(), calculation1, hydraulicBoundaryDatabase);
+            AssertClosingStructuresCalculationActivity(activities.ElementAt(1), calculation2, hydraulicBoundaryDatabase);
             mocks.VerifyAll();
         }
 
@@ -270,8 +273,9 @@
             CollectionAssert.AllItemsAreInstancesOfType(activities, typeof(ClosingStructuresCalculationActivity));
             Assert.AreEqual(2, activities.Count());
 
-            AssertClosingStructuresCalculationActivity(activities.First(), calculation1);
-            AssertClosingStructuresCalculationActivity(activities.ElementAt(1), calculation2);
+            HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase;
+            AssertClosingStructuresCalculationActivity(activities.First(), calculation1, hydraulicBoundaryDatabase);
+            AssertClosingStructuresCalculationActivity(activities.ElementAt(1), calculation2, hydraulicBoundaryDatabase);
             mocks.VerifyAll();
         }
 
@@ -288,12 +292,20 @@
         }
 
         private static void AssertClosingStructuresCalculationActivity(Activity activity,
-                                                                       ICalculation<ClosingStructuresInput> calculation)
+                                                                       ICalculation<ClosingStructuresInput> calculation,
+                                                                       HydraulicBoundaryDatabase hydraulicBoundaryDatabase)
         {
             var mocks = new MockRepository();
             var testCalculator = new TestStructuresCalculator<StructuresClosureCalculationInput>();
             var calculatorFactory = mocks.StrictMock<IHydraRingCalculatorFactory>();
-            calculatorFactory.Expect(cf => cf.CreateStructuresCalculator<StructuresClosureCalculationInput>(testDataPath, ""))
+            calculatorFactory.Expect(cf => cf.CreateStructuresCalculator<StructuresClosureCalculationInput>(
+                                         Arg<HydraRingCalculationSettings>.Is.NotNull))
+                             .WhenCalled(invocation =>
+                             {
+                                 HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(hydraulicBoundaryDatabase), 
+                                     (HydraRingCalculationSettings)invocation.Arguments[0]);
+                             })
                              .Return(testCalculator);
             mocks.ReplayAll();