Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs
===================================================================
diff -u
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs	(revision 0)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs	(revision 7a1b6072eb543968bd2d9b1a21c53572cd98b89a)
@@ -0,0 +1,122 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using log4net;
+using Ringtoets.ClosingStructures.Data;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.HydraRing.Calculation.Calculator;
+using Ringtoets.HydraRing.Calculation.Calculator.Factory;
+using Ringtoets.HydraRing.Calculation.Data;
+using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
+
+namespace Ringtoets.ClosingStructures.Service
+{
+    /// <summary>
+    /// Service that provides methods for perfoming Hydra-ring calculations for closing structures calculations.
+    /// </summary>
+    public class ClosingStructuresCalculationService
+    {
+        private static ILog log = LogManager.GetLogger(typeof(ClosingStructuresCalculationService));
+
+        private IStructuresClosureCalculator calculator;
+        private bool canceled;
+
+        /// <summary>
+        /// Performs a height structures calculation based on the supplied <see cref="ClosingStructuresCalculation"/> and sets 
+        /// <see cref="ClosingStructuresCalculation.Output"/> if the calculation was successful. Error and status information is 
+        /// logged during the execution of the operation.
+        /// </summary>
+        /// <param name="calculation">The <see cref="ClosingStructuresCalculation"/> that holds all the information required to perform the calculation.</param>
+        /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> that holds information about the norm used in the calculation.</param>
+        /// <param name="failureMechanismSection">The <see cref="FailureMechanismSection"/> to create input with.</param>
+        /// <param name="generalInput">The <see cref="GeneralClosingStructuresInput"/> to create the input with for the calculation.</param>
+        /// <param name="failureMechanismContribution">The amount of contribution for this failure mechanism in the assessment section.</param>
+        /// <param name="hlcdDirectory">The directory of the HLCD file that should be used for performing the calculation.</param>
+        /// <exception cref="NotSupportedException"></exception>
+        public void Calculate(ClosingStructuresCalculation calculation,
+                              IAssessmentSection assessmentSection,
+                              FailureMechanismSection failureMechanismSection,
+                              GeneralClosingStructuresInput generalInput,
+                              double failureMechanismContribution, string hlcdDirectory)
+        {
+            StructuresClosureCalculationInput input;
+
+            switch (calculation.InputParameters.InflowModelType)
+            {
+                case ClosingStructureInflowModelType.VerticalWall:
+                    input = CreateClosureVerticalWallCalculationInput(calculation, failureMechanismSection, generalInput);
+                    break;
+
+                default:
+                    throw new NotSupportedException("ClosingStructureInflowModelType");
+            }
+
+            calculator = HydraRingCalculatorFactory.Instance.CreateStructuresClosureCalculator(hlcdDirectory, assessmentSection.Id);
+
+            calculator.Calculate(input);
+        }
+
+        private static StructuresClosureVerticalWallCalculationInput CreateClosureVerticalWallCalculationInput(ClosingStructuresCalculation calculation,
+                                                                                                               FailureMechanismSection failureMechanismSection,
+                                                                                                               GeneralClosingStructuresInput generalInput)
+        {
+            return new StructuresClosureVerticalWallCalculationInput(
+                calculation.InputParameters.HydraulicBoundaryLocation.Id,
+                new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.StructureNormalOrientation),
+                ParseForeshore(calculation.InputParameters),
+                ParseBreakWater(calculation.InputParameters),
+                generalInput.GravitationalAcceleration,
+                calculation.InputParameters.FactorStormDurationOpenStructure,
+                calculation.InputParameters.FailureProbabilityOpenStructure,
+                calculation.InputParameters.FailureProbabilityReparation,
+                calculation.InputParameters.IdenticalApertures,
+                calculation.InputParameters.AllowedLevelIncreaseStorage.Mean, calculation.InputParameters.AllowedLevelIncreaseStorage.StandardDeviation,
+                generalInput.ModelFactorStorageVolume.Mean, generalInput.ModelFactorStorageVolume.StandardDeviation,
+                calculation.InputParameters.StorageStructureArea.Mean, calculation.InputParameters.StorageStructureArea.CoefficientOfVariation,
+                generalInput.ModelFactorInflowVolume,
+                calculation.InputParameters.FlowWidthAtBottomProtection.Mean, calculation.InputParameters.FlowWidthAtBottomProtection.StandardDeviation,
+                calculation.InputParameters.CriticalOvertoppingDischarge.Mean, calculation.InputParameters.CriticalOvertoppingDischarge.CoefficientOfVariation,
+                calculation.InputParameters.FailureProbabilityStructureWithErosion,
+                calculation.InputParameters.StormDuration.Mean, calculation.InputParameters.StormDuration.CoefficientOfVariation,
+                calculation.InputParameters.ProbabilityOpenStructureBeforeFlooding,
+                generalInput.ModelFactorOvertoppingFlow.Mean, generalInput.ModelFactorOvertoppingFlow.StandardDeviation,
+                calculation.InputParameters.StructureNormalOrientation,
+                calculation.InputParameters.ModelFactorSuperCriticalFlow.Mean, calculation.InputParameters.ModelFactorSuperCriticalFlow.StandardDeviation,
+                calculation.InputParameters.LevelCrestStructureNotClosing.Mean, calculation.InputParameters.LevelCrestStructureNotClosing.StandardDeviation,
+                calculation.InputParameters.WidthFlowApertures.Mean, calculation.InputParameters.WidthFlowApertures.CoefficientOfVariation,
+                calculation.InputParameters.DeviationWaveDirection);
+        }
+
+        private static IEnumerable<HydraRingForelandPoint> ParseForeshore(ClosingStructuresInput input)
+        {
+            return input.UseForeshore ? input.ForeshoreGeometry.Select(c => new HydraRingForelandPoint(c.X, c.Y)) : new HydraRingForelandPoint[0];
+        }
+
+        private static HydraRingBreakWater ParseBreakWater(ClosingStructuresInput input)
+        {
+            return input.UseBreakWater ? new HydraRingBreakWater((int)input.BreakWater.Type, input.BreakWater.Height) : null;
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/Ringtoets.ClosingStructures.Service.csproj
===================================================================
diff -u -r8c7c25ff896b8967361c5c8f4e6ef261ff6f5164 -r7a1b6072eb543968bd2d9b1a21c53572cd98b89a
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/Ringtoets.ClosingStructures.Service.csproj	(.../Ringtoets.ClosingStructures.Service.csproj)	(revision 8c7c25ff896b8967361c5c8f4e6ef261ff6f5164)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/Ringtoets.ClosingStructures.Service.csproj	(.../Ringtoets.ClosingStructures.Service.csproj)	(revision 7a1b6072eb543968bd2d9b1a21c53572cd98b89a)
@@ -32,6 +32,10 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="log4net, Version=1.2.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\log4net.2.0.4\lib\net40-full\log4net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
@@ -40,12 +44,14 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="ClosingStructuresCalculationActivity.cs" />
+    <Compile Include="ClosingStructuresCalculationService.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
@@ -63,6 +69,11 @@
       <Name>Ringtoets.HydraRing.Calculation</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Data\Ringtoets.HydraRing.Data.csproj">
+      <Project>{70f8cc9c-5bc8-4fb2-b201-eae7fa8088c2}</Project>
+      <Name>Ringtoets.HydraRing.Data</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\Ringtoets.ClosingStructures.Data\Ringtoets.ClosingStructures.Data.csproj">
       <Project>{C6309704-D67B-434C-BC98-9F8910BC1D10}</Project>
       <Name>Ringtoets.ClosingStructures.Data</Name>
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/packages.config
===================================================================
diff -u
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/packages.config	(revision 0)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/packages.config	(revision 7a1b6072eb543968bd2d9b1a21c53572cd98b89a)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright (C) Stichting Deltares 2016. All rights reserved.
+
+This file is part of Ringtoets.
+
+Ringtoets is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
+
+<packages>
+  <package id="log4net" version="2.0.4" targetFramework="net40" />
+</packages>
\ No newline at end of file
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureCalculationTest.cs
===================================================================
diff -u -rc9130fbb8186c9b1c3d4c4b8496fd4035b80f825 -r7a1b6072eb543968bd2d9b1a21c53572cd98b89a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureCalculationTest.cs	(.../TestClosingStructureCalculationTest.cs)	(revision c9130fbb8186c9b1c3d4c4b8496fd4035b80f825)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureCalculationTest.cs	(.../TestClosingStructureCalculationTest.cs)	(revision 7a1b6072eb543968bd2d9b1a21c53572cd98b89a)
@@ -34,7 +34,7 @@
             var referenceStructure = new TestClosingStructure();
 
             // Call 
-            var calculation = new TestClosingStructureCalculation();
+            var calculation = new TestClosingStructuresCalculation();
 
             // Assert
             Assert.IsInstanceOf<ClosingStructuresCalculation>(calculation);
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/Ringtoets.ClosingStructures.Data.TestUtil.csproj
===================================================================
diff -u -rc9130fbb8186c9b1c3d4c4b8496fd4035b80f825 -r7a1b6072eb543968bd2d9b1a21c53572cd98b89a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/Ringtoets.ClosingStructures.Data.TestUtil.csproj	(.../Ringtoets.ClosingStructures.Data.TestUtil.csproj)	(revision c9130fbb8186c9b1c3d4c4b8496fd4035b80f825)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/Ringtoets.ClosingStructures.Data.TestUtil.csproj	(.../Ringtoets.ClosingStructures.Data.TestUtil.csproj)	(revision 7a1b6072eb543968bd2d9b1a21c53572cd98b89a)
@@ -46,7 +46,7 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TestClosingStructure.cs" />
-    <Compile Include="TestClosingStructureCalculation.cs" />
+    <Compile Include="TestClosingStructuresCalculation.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Fisheye: Tag 7a1b6072eb543968bd2d9b1a21c53572cd98b89a refers to a dead (removed) revision in file `Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/TestClosingStructureCalculation.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/TestClosingStructuresCalculation.cs
===================================================================
diff -u
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/TestClosingStructuresCalculation.cs	(revision 0)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/TestClosingStructuresCalculation.cs	(revision 7a1b6072eb543968bd2d9b1a21c53572cd98b89a)
@@ -0,0 +1,34 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Ringtoets.HydraRing.Data;
+
+namespace Ringtoets.ClosingStructures.Data.TestUtil
+{
+    public class TestClosingStructuresCalculation : ClosingStructuresCalculation
+    {
+        public TestClosingStructuresCalculation()
+        {
+            InputParameters.Structure = new TestClosingStructure();
+            InputParameters.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "location", 1, 1);
+        }
+    }
+}
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs
===================================================================
diff -u
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs	(revision 0)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs	(revision 7a1b6072eb543968bd2d9b1a21c53572cd98b89a)
@@ -0,0 +1,160 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Linq;
+using Core.Common.Base.Geometry;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.ClosingStructures.Data;
+using Ringtoets.ClosingStructures.Data.TestUtil;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Contribution;
+using Ringtoets.Common.Data.DikeProfiles;
+using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.HydraRing.Calculation.Calculator.Factory;
+using Ringtoets.HydraRing.Calculation.Data;
+using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
+using Ringtoets.HydraRing.Calculation.TestUtil;
+using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
+using Ringtoets.HydraRing.Data;
+
+namespace Ringtoets.ClosingStructures.Service.Test
+{
+    [TestFixture]
+    public class ClosingStructuresCalculationServiceTest
+    {
+        private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
+
+        [Test]
+        [TestCase(true, false)]
+        [TestCase(true, true)]
+        [TestCase(false, false)]
+        public void Calculate_VariousVerticalWallCalculations_InputPropertiesCorrectlySentToCalculator(bool useForeshore, bool useBreakWater)
+        {
+            // Setup
+            var closingStructuresFailureMechanism = new ClosingStructuresFailureMechanism();
+
+            var mockRepository = new MockRepository();
+            var assessmentSectionStub = CreateAssessmentSectionStub(closingStructuresFailureMechanism, mockRepository);
+            mockRepository.ReplayAll();
+
+            closingStructuresFailureMechanism.AddSection(new FailureMechanismSection("test section", new[]
+            {
+                new Point2D(0, 0),
+                new Point2D(1, 1)
+            }));
+
+            ClosingStructuresCalculation calculation = new TestClosingStructuresCalculation()
+            {
+                InputParameters =
+                {
+                    HydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001)
+                }
+            };
+
+            if (useForeshore)
+            {
+                calculation.InputParameters.ForeshoreProfile = new ForeshoreProfile(new Point2D(0, 0),
+                                                                                    new[]
+                                                                                    {
+                                                                                        new Point2D(1, 1),
+                                                                                        new Point2D(2, 2)
+                                                                                    },
+                                                                                    useBreakWater ? new BreakWater(BreakWaterType.Wall, 3.0) : null,
+                                                                                    new ForeshoreProfile.ConstructionProperties());
+            }
+
+            FailureMechanismSection failureMechanismSection = closingStructuresFailureMechanism.Sections.First();
+
+            using (new HydraRingCalculatorFactoryConfig())
+            {
+                var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).StructuresClosureCalculator;
+
+                // Call
+                new ClosingStructuresCalculationService().Calculate(calculation,
+                                                                    assessmentSectionStub,
+                                                                    failureMechanismSection,
+                                                                    closingStructuresFailureMechanism.GeneralInput,
+                                                                    closingStructuresFailureMechanism.Contribution,
+                                                                    testDataPath);
+
+                // Assert
+                StructuresClosureCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray();
+                Assert.AreEqual(1, calculationInputs.Length);
+                Assert.AreEqual(testDataPath, calculator.HydraulicBoundaryDatabaseDirectory);
+                Assert.AreEqual(assessmentSectionStub.Id, calculator.RingId);
+
+                GeneralClosingStructuresInput generalInput = closingStructuresFailureMechanism.GeneralInput;
+                ClosingStructuresInput input = calculation.InputParameters;
+                var expectedInput = new StructuresClosureVerticalWallCalculationInput(
+                    1300001,
+                    new HydraRingSection(1, failureMechanismSection.GetSectionLength(), input.StructureNormalOrientation),
+                    useForeshore ? input.ForeshoreGeometry.Select(c => new HydraRingForelandPoint(c.X, c.Y)) : new HydraRingForelandPoint[0],
+                    useBreakWater ? new HydraRingBreakWater((int) input.BreakWater.Type, input.BreakWater.Height) : null,
+                    generalInput.GravitationalAcceleration,
+                    input.FactorStormDurationOpenStructure,
+                    input.FailureProbabilityOpenStructure,
+                    input.FailureProbabilityReparation,
+                    input.IdenticalApertures,
+                    input.AllowedLevelIncreaseStorage.Mean, input.AllowedLevelIncreaseStorage.StandardDeviation,
+                    generalInput.ModelFactorStorageVolume.Mean, generalInput.ModelFactorStorageVolume.StandardDeviation,
+                    input.StorageStructureArea.Mean, input.StorageStructureArea.CoefficientOfVariation,
+                    generalInput.ModelFactorInflowVolume,
+                    input.FlowWidthAtBottomProtection.Mean, input.FlowWidthAtBottomProtection.StandardDeviation,
+                    input.CriticalOvertoppingDischarge.Mean, input.CriticalOvertoppingDischarge.CoefficientOfVariation,
+                    input.FailureProbabilityStructureWithErosion,
+                    input.StormDuration.Mean, input.StormDuration.CoefficientOfVariation,
+                    input.ProbabilityOpenStructureBeforeFlooding,
+                    generalInput.ModelFactorOvertoppingFlow.Mean, generalInput.ModelFactorOvertoppingFlow.StandardDeviation,
+                    input.StructureNormalOrientation,
+                    input.ModelFactorSuperCriticalFlow.Mean, input.ModelFactorSuperCriticalFlow.StandardDeviation,
+                    input.LevelCrestStructureNotClosing.Mean, input.LevelCrestStructureNotClosing.StandardDeviation,
+                    input.WidthFlowApertures.Mean, input.WidthFlowApertures.CoefficientOfVariation,
+                    input.DeviationWaveDirection);
+
+                StructuresClosureVerticalWallCalculationInput actualInput = (StructuresClosureVerticalWallCalculationInput)calculationInputs[0];
+                HydraRingDataEqualityHelper.AreEqual(expectedInput, actualInput);
+                Assert.IsFalse(calculator.IsCanceled);
+            }
+            mockRepository.VerifyAll();
+        }
+
+        private static IAssessmentSection CreateAssessmentSectionStub(IFailureMechanism failureMechanism, MockRepository mockRepository)
+        {
+            var assessmentSectionStub = mockRepository.Stub<IAssessmentSection>();
+            assessmentSectionStub.Stub(a => a.Id).Return("21");
+            assessmentSectionStub.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(new[]
+            {
+                failureMechanism
+            }, 1, 2));
+            assessmentSectionStub.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            {
+                Locations =
+                {
+                    new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0)
+                }
+            };
+            return assessmentSectionStub;
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/Ringtoets.ClosingStructures.Service.Test.csproj
===================================================================
diff -u -r8c7c25ff896b8967361c5c8f4e6ef261ff6f5164 -r7a1b6072eb543968bd2d9b1a21c53572cd98b89a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/Ringtoets.ClosingStructures.Service.Test.csproj	(.../Ringtoets.ClosingStructures.Service.Test.csproj)	(revision 8c7c25ff896b8967361c5c8f4e6ef261ff6f5164)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/Ringtoets.ClosingStructures.Service.Test.csproj	(.../Ringtoets.ClosingStructures.Service.Test.csproj)	(revision 7a1b6072eb543968bd2d9b1a21c53572cd98b89a)
@@ -52,6 +52,7 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="ClosingStructuresCalculationActivityTest.cs" />
+    <Compile Include="ClosingStructuresCalculationServiceTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -65,6 +66,10 @@
       <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
+      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
+      <Name>Core.Common.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
       <Project>{D4200F43-3F72-4F42-AF0A-8CED416A38EC}</Project>
       <Name>Ringtoets.Common.Data</Name>
@@ -73,6 +78,14 @@
       <Project>{888d4097-8bc2-4703-9fb1-8744c94d525e}</Project>
       <Name>Ringtoets.HydraRing.Calculation</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Data\Ringtoets.HydraRing.Data.csproj">
+      <Project>{70F8CC9C-5BC8-4FB2-B201-EAE7FA8088C2}</Project>
+      <Name>Ringtoets.HydraRing.Data</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\HydraRing\test\Ringtoets.HydraRing.Calculation.TestUtil\Ringtoets.HydraRing.Calculation.TestUtil.csproj">
+      <Project>{74CBA865-9338-447F-BAD9-28312446AE84}</Project>
+      <Name>Ringtoets.HydraRing.Calculation.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.ClosingStructures.Data\Ringtoets.ClosingStructures.Data.csproj">
       <Project>{C6309704-D67B-434C-BC98-9F8910BC1D10}</Project>
       <Name>Ringtoets.ClosingStructures.Data</Name>
@@ -81,6 +94,10 @@
       <Project>{2BDF07D4-0E81-4B9E-9618-E7EBD9399912}</Project>
       <Name>Ringtoets.ClosingStructures.Service</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.ClosingStructures.Data.TestUtil\Ringtoets.ClosingStructures.Data.TestUtil.csproj">
+      <Project>{F5B43C29-6169-4E9A-859E-09090330B94E}</Project>
+      <Name>Ringtoets.ClosingStructures.Data.TestUtil</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/IHydraRingCalculatorFactory.cs
===================================================================
diff -u -re69acb9595f7bf1d202ddd1fb51934b66768b75d -r7a1b6072eb543968bd2d9b1a21c53572cd98b89a
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/IHydraRingCalculatorFactory.cs	(.../IHydraRingCalculatorFactory.cs)	(revision e69acb9595f7bf1d202ddd1fb51934b66768b75d)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/IHydraRingCalculatorFactory.cs	(.../IHydraRingCalculatorFactory.cs)	(revision 7a1b6072eb543968bd2d9b1a21c53572cd98b89a)
@@ -75,12 +75,21 @@
         IWaveHeightCalculator CreateWaveHeightCalculator(string hlcdDirectory, string ringId);
 
         /// <summary>
-        /// Creates a calculator for performing an overtopping calculation for structures.
+        /// Creates a calculator for performing a calculation for structures overtopping.
         /// </summary>
         /// <param name="hlcdDirectory">The directory where the hydraulic database can be found.</param>
         /// <param name="ringId">The id of the traject which is used in the calculation.</param>
         /// <returns>A new <see cref="IStructuresOvertoppingCalculator"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="hlcdDirectory"/> is <c>null</c>.</exception>
         IStructuresOvertoppingCalculator CreateStructuresOvertoppingCalculator(string hlcdDirectory, string ringId);
+
+        /// <summary>
+        /// Creates a calculator for performing a calculation for structures closure.
+        /// </summary>
+        /// <param name="hlcdDirectory">The directory where the hydraulic database can be found.</param>
+        /// <param name="ringId">The id of the traject which is used in the calculation.</param>
+        /// <returns>A new <see cref="IStructuresOvertoppingCalculator"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hlcdDirectory"/> is <c>null</c>.</exception>
+        IStructuresClosureCalculator CreateStructuresClosureCalculator(string hlcdDirectory, string ringId);
     }
 }
\ No newline at end of file
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs
===================================================================
diff -u -rc9130fbb8186c9b1c3d4c4b8496fd4035b80f825 -r7a1b6072eb543968bd2d9b1a21c53572cd98b89a
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs	(.../TestHydraRingCalculatorFactory.cs)	(revision c9130fbb8186c9b1c3d4c4b8496fd4035b80f825)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs	(.../TestHydraRingCalculatorFactory.cs)	(revision 7a1b6072eb543968bd2d9b1a21c53572cd98b89a)
@@ -39,6 +39,7 @@
         public readonly TestWaveConditionsCosineCalculator WaveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator();
         public readonly TestWaveHeightCalculator WaveHeightCalculator = new TestWaveHeightCalculator();
         public readonly TestStructuresOvertoppingCalculator StructuresOvertoppingCalculator = new TestStructuresOvertoppingCalculator();
+        public readonly TestStructuresClosureCalculator StructuresClosureCalculator = new TestStructuresClosureCalculator();
 
         public IDesignWaterLevelCalculator CreateDesignWaterLevelCalculator(string hlcdDirectory, string ringId)
         {
@@ -81,6 +82,13 @@
             StructuresOvertoppingCalculator.RingId = ringId;
             return StructuresOvertoppingCalculator;
         }
+
+        public IStructuresClosureCalculator CreateStructuresClosureCalculator(string hlcdDirectory, string ringId)
+        {
+            StructuresClosureCalculator.HydraulicBoundaryDatabaseDirectory = hlcdDirectory;
+            StructuresClosureCalculator.RingId = ringId;
+            return StructuresClosureCalculator;
+        }
     }
 
     public class TestWaveHeightCalculator : TestHydraRingCalculator<WaveHeightCalculationInput>, IWaveHeightCalculator
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/HydraRingDataEqualityHelper.cs
===================================================================
diff -u -rb2f617ad0d8d6457422a569685763b9718740560 -r7a1b6072eb543968bd2d9b1a21c53572cd98b89a
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/HydraRingDataEqualityHelper.cs	(.../HydraRingDataEqualityHelper.cs)	(revision b2f617ad0d8d6457422a569685763b9718740560)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/HydraRingDataEqualityHelper.cs	(.../HydraRingDataEqualityHelper.cs)	(revision 7a1b6072eb543968bd2d9b1a21c53572cd98b89a)
@@ -78,6 +78,28 @@
             AreEqual(expectedInput.Variables.ToArray(), actualInput.Variables.ToArray());
         }
 
+        /// <summary>
+        /// Asserts whether or not <paramref name="expectedInput"/> and <paramref name="actualInput"/> are equal to eachother.
+        /// </summary>
+        /// <param name="expectedInput">The expected calculation input.</param>
+        /// <param name="actualInput">The actual calculation input.</param>
+        public static void AreEqual(StructuresClosureCalculationInput expectedInput, StructuresClosureCalculationInput actualInput)
+        {
+            Assert.AreEqual(expectedInput.FailureMechanismType, actualInput.FailureMechanismType);
+            Assert.AreEqual(expectedInput.CalculationTypeId, actualInput.CalculationTypeId);
+            Assert.AreEqual(expectedInput.VariableId, actualInput.VariableId);
+            Assert.AreEqual(expectedInput.HydraulicBoundaryLocationId, actualInput.HydraulicBoundaryLocationId);
+            Assert.AreEqual(expectedInput.Section.SectionId, actualInput.Section.SectionId);
+
+            Assert.AreEqual(expectedInput.Beta, actualInput.Beta, accuracy);
+            Assert.AreEqual(expectedInput.Section.CrossSectionNormal, actualInput.Section.CrossSectionNormal, accuracy);
+
+            AreEqual(expectedInput.BreakWater, actualInput.BreakWater);
+            AreEqual(expectedInput.Section, actualInput.Section);
+            AreEqual(expectedInput.ForelandsPoints.ToArray(), actualInput.ForelandsPoints.ToArray());
+            AreEqual(expectedInput.Variables.ToArray(), actualInput.Variables.ToArray());
+        }
+
         private static void AreEqual(HydraRingBreakWater expectedBreakWater, HydraRingBreakWater actualBreakWater)
         {
             if (expectedBreakWater == null)