Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs =================================================================== diff -u -r56cd61cf91a4ef3bd908d8647ca113cada46531b -r36e118b75a5a97039c3c1a1e2c6c5fdd08444946 --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs (.../ClosingStructuresCalculationActivityIntegrationTest.cs) (revision 56cd61cf91a4ef3bd908d8647ca113cada46531b) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs (.../ClosingStructuresCalculationActivityIntegrationTest.cs) (revision 36e118b75a5a97039c3c1a1e2c6c5fdd08444946) @@ -298,15 +298,27 @@ public void Run_HydraulicBoundaryDataSet_ExpectedSettingsSetToCalculator(bool usePreprocessorClosure) { // Setup + var calculation = new TestClosingStructuresCalculationScenario(); + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) { HydraulicBoundaryData = { - FilePath = validHrdFilePath, HydraulicLocationConfigurationDatabase = { FilePath = validHlcdFilePath, UsePreprocessorClosure = usePreprocessorClosure + }, + HydraulicBoundaryDatabases = + { + new HydraulicBoundaryDatabase + { + FilePath = validHrdFilePath, + Locations = + { + calculation.InputParameters.HydraulicBoundaryLocation + } + } } } }; @@ -318,14 +330,15 @@ .WhenCalled(invocation => { HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( - HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryData), + HydraulicBoundaryCalculationSettingsFactory.CreateSettings( + assessmentSection.HydraulicBoundaryData, + calculation.InputParameters.HydraulicBoundaryLocation), (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(new TestStructuresCalculator()); mockRepository.ReplayAll(); var failureMechanism = new ClosingStructuresFailureMechanism(); - var calculation = new TestClosingStructuresCalculationScenario(); CalculatableActivity activity = ClosingStructuresCalculationActivityFactory.CreateCalculationActivity(calculation, failureMechanism,