Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationActivityFactoryTest.cs
===================================================================
diff -u -ra04eb13a6d2bf03c00551c5e9330d07a399caca4 -rd73de75958a45ae87cf4e0a095dc0b58583af575
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationActivityFactoryTest.cs	(.../ClosingStructuresCalculationActivityFactoryTest.cs)	(revision a04eb13a6d2bf03c00551c5e9330d07a399caca4)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationActivityFactoryTest.cs	(.../ClosingStructuresCalculationActivityFactoryTest.cs)	(revision d73de75958a45ae87cf4e0a095dc0b58583af575)
@@ -35,6 +35,7 @@
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Service;
+using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
 using Ringtoets.HydraRing.Calculation.Data.Input;
 using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
@@ -122,7 +123,7 @@
 
             // Assert
             Assert.IsInstanceOf<ClosingStructuresCalculationActivity>(activity);
-            AssertClosingStructuresCalculationActivity(activity, calculation);
+            AssertClosingStructuresCalculationActivity(activity, calculation, assessmentSection.HydraulicBoundaryDatabase);
             mocks.VerifyAll();
         }
 
@@ -209,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();
         }
 
@@ -271,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();
         }
 
@@ -289,7 +292,8 @@
         }
 
         private static void AssertClosingStructuresCalculationActivity(Activity activity,
-                                                                       ICalculation<ClosingStructuresInput> calculation)
+                                                                       ICalculation<ClosingStructuresInput> calculation,
+                                                                       HydraulicBoundaryDatabase hydraulicBoundaryDatabase)
         {
             var mocks = new MockRepository();
             var testCalculator = new TestStructuresCalculator<StructuresClosureCalculationInput>();
@@ -298,9 +302,9 @@
                                          Arg<HydraRingCalculationSettings>.Is.NotNull))
                              .WhenCalled(invocation =>
                              {
-                                 var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
-                                 Assert.AreEqual(testDataPath, settings.HlcdFilePath);
-                                 Assert.IsEmpty(settings.PreprocessorDirectory);
+                                 HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+                                     HydraulicBoundaryCalculationSettingsFactory.CreateSettings(hydraulicBoundaryDatabase), 
+                                     (HydraRingCalculationSettings)invocation.Arguments[0]);
                              })
                              .Return(testCalculator);
             mocks.ReplayAll();