Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationActivityFactoryTest.cs
===================================================================
diff -u -r6326d845e3bd5e4a5e4dfbf30ba385cbf51dc3c4 -rc2bb1b1360db0abb1d88a284463d66f53f02fe37
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationActivityFactoryTest.cs	(.../HeightStructuresCalculationActivityFactoryTest.cs)	(revision 6326d845e3bd5e4a5e4dfbf30ba385cbf51dc3c4)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationActivityFactoryTest.cs	(.../HeightStructuresCalculationActivityFactoryTest.cs)	(revision c2bb1b1360db0abb1d88a284463d66f53f02fe37)
@@ -33,6 +33,7 @@
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Service;
+using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Data.TestUtil;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
@@ -122,7 +123,7 @@
 
             // Assert
             Assert.IsInstanceOf<HeightStructuresCalculationActivity>(activity);
-            AssertHeightStructuresCalculationActivity(activity, calculation);
+            AssertHeightStructuresCalculationActivity(activity, calculation, assessmentSection.HydraulicBoundaryDatabase);
             mocks.VerifyAll();
         }
 
@@ -209,8 +210,9 @@
             CollectionAssert.AllItemsAreInstancesOfType(activities, typeof(HeightStructuresCalculationActivity));
             Assert.AreEqual(2, activities.Count());
 
-            AssertHeightStructuresCalculationActivity(activities.First(), calculation1);
-            AssertHeightStructuresCalculationActivity(activities.ElementAt(1), calculation2);
+            HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase;
+            AssertHeightStructuresCalculationActivity(activities.First(), calculation1, hydraulicBoundaryDatabase);
+            AssertHeightStructuresCalculationActivity(activities.ElementAt(1), calculation2, hydraulicBoundaryDatabase);
             mocks.VerifyAll();
         }
 
@@ -271,8 +273,9 @@
             CollectionAssert.AllItemsAreInstancesOfType(activities, typeof(HeightStructuresCalculationActivity));
             Assert.AreEqual(2, activities.Count());
 
-            AssertHeightStructuresCalculationActivity(activities.First(), calculation1);
-            AssertHeightStructuresCalculationActivity(activities.ElementAt(1), calculation2);
+            HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase;
+            AssertHeightStructuresCalculationActivity(activities.First(), calculation1, hydraulicBoundaryDatabase);
+            AssertHeightStructuresCalculationActivity(activities.ElementAt(1), calculation2, hydraulicBoundaryDatabase);
             mocks.VerifyAll();
         }
 
@@ -289,7 +292,8 @@
         }
 
         private static void AssertHeightStructuresCalculationActivity(Activity activity,
-                                                                      ICalculation<HeightStructuresInput> calculation)
+                                                                      ICalculation<HeightStructuresInput> calculation,
+                                                                      HydraulicBoundaryDatabase hydraulicBoundaryDatabase)
         {
             var mocks = new MockRepository();
             var testCalculator = new TestStructuresCalculator<StructuresOvertoppingCalculationInput>();
@@ -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();