Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs
===================================================================
diff -u -r92210258706d0f57e05552037b676bd941a6fe19 -r7194f9760969f736d93069f4c833bedd8b1f540b
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs (.../ClosingStructuresCalculationService.cs) (revision 92210258706d0f57e05552037b676bd941a6fe19)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs (.../ClosingStructuresCalculationService.cs) (revision 7194f9760969f736d93069f4c833bedd8b1f540b)
@@ -32,6 +32,7 @@
using Ringtoets.Common.Data.Structures;
using Ringtoets.Common.IO.HydraRing;
using Ringtoets.Common.Service;
+using Ringtoets.Common.Service.Structures;
using Ringtoets.Common.Service.ValidationRules;
using Ringtoets.HydraRing.Calculation.Calculator;
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
@@ -44,9 +45,9 @@
namespace Ringtoets.ClosingStructures.Service
{
///
- /// Service that provides methods for performing Hydra-ring calculations for closing structures calculations.
+ /// Service that provides methods for performing Hydra-ring calculations for closing structures.
///
- public class ClosingStructuresCalculationService
+ public class ClosingStructuresCalculationService : StructuresCalculationServiceBase
{
private static readonly ILog log = LogManager.GetLogger(typeof(ClosingStructuresCalculationService));
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs
===================================================================
diff -u -r92210258706d0f57e05552037b676bd941a6fe19 -r7194f9760969f736d93069f4c833bedd8b1f540b
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision 92210258706d0f57e05552037b676bd941a6fe19)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision 7194f9760969f736d93069f4c833bedd8b1f540b)
@@ -35,6 +35,7 @@
using Ringtoets.Common.Data.FailureMechanism;
using Ringtoets.Common.Data.Hydraulics;
using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Service.Structures;
using Ringtoets.Common.Service.TestUtil;
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
using Ringtoets.HydraRing.Calculation.Data;
@@ -52,6 +53,16 @@
private static readonly string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
[Test]
+ public void Constructor_ExpectedValues()
+ {
+ // Call
+ var service = new ClosingStructuresCalculationService();
+
+ // Assert
+ Assert.IsInstanceOf(service);
+ }
+
+ [Test]
public void Validate_CalculationNull_ThrowArgumentNullException()
{
// Setup
Index: Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj
===================================================================
diff -u -ra5cd9b063d07cb1205e7691b7ff38fc393005210 -r7194f9760969f736d93069f4c833bedd8b1f540b
--- Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj (.../Ringtoets.Common.Service.csproj) (revision a5cd9b063d07cb1205e7691b7ff38fc393005210)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj (.../Ringtoets.Common.Service.csproj) (revision 7194f9760969f736d93069f4c833bedd8b1f540b)
@@ -55,6 +55,7 @@
+
Index: Ringtoets/Common/src/Ringtoets.Common.Service/Structures/StructuresCalculationServiceBase.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Service/Structures/StructuresCalculationServiceBase.cs (revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/Structures/StructuresCalculationServiceBase.cs (revision 7194f9760969f736d93069f4c833bedd8b1f540b)
@@ -0,0 +1,30 @@
+// Copyright (C) Stichting Deltares 2017. 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 .
+//
+// 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.
+
+namespace Ringtoets.Common.Service.Structures
+{
+ ///
+ /// Service that provides generic logic for performing Hydra-Ring calculations for structures.
+ ///
+ public abstract class StructuresCalculationServiceBase
+ {
+ }
+}
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs
===================================================================
diff -u -r92210258706d0f57e05552037b676bd941a6fe19 -r7194f9760969f736d93069f4c833bedd8b1f540b
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs (.../HeightStructuresCalculationService.cs) (revision 92210258706d0f57e05552037b676bd941a6fe19)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs (.../HeightStructuresCalculationService.cs) (revision 7194f9760969f736d93069f4c833bedd8b1f540b)
@@ -29,6 +29,7 @@
using Ringtoets.Common.Data.Structures;
using Ringtoets.Common.IO.HydraRing;
using Ringtoets.Common.Service;
+using Ringtoets.Common.Service.Structures;
using Ringtoets.Common.Service.ValidationRules;
using Ringtoets.HeightStructures.Data;
using Ringtoets.HeightStructures.Service.Properties;
@@ -42,9 +43,9 @@
namespace Ringtoets.HeightStructures.Service
{
///
- /// Service that provides methods for performing Hydra-Ring calculations for height structures calculations.
+ /// Service that provides methods for performing Hydra-Ring calculations for height structures.
///
- public class HeightStructuresCalculationService
+ public class HeightStructuresCalculationService : StructuresCalculationServiceBase
{
private static readonly ILog log = LogManager.GetLogger(typeof(HeightStructuresCalculationService));
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs
===================================================================
diff -u -r92210258706d0f57e05552037b676bd941a6fe19 -r7194f9760969f736d93069f4c833bedd8b1f540b
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision 92210258706d0f57e05552037b676bd941a6fe19)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision 7194f9760969f736d93069f4c833bedd8b1f540b)
@@ -34,6 +34,7 @@
using Ringtoets.Common.Data.Hydraulics;
using Ringtoets.Common.Data.Structures;
using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Service.Structures;
using Ringtoets.Common.Service.TestUtil;
using Ringtoets.HeightStructures.Data;
using Ringtoets.HeightStructures.Data.TestUtil;
@@ -53,6 +54,16 @@
private static readonly string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
[Test]
+ public void Constructor_ExpectedValues()
+ {
+ // Call
+ var service = new HeightStructuresCalculationService();
+
+ // Assert
+ Assert.IsInstanceOf(service);
+ }
+
+ [Test]
public void Validate_CalculationNull_ThrowArgumentNullException()
{
// Setup
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs
===================================================================
diff -u -r92210258706d0f57e05552037b676bd941a6fe19 -r7194f9760969f736d93069f4c833bedd8b1f540b
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision 92210258706d0f57e05552037b676bd941a6fe19)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision 7194f9760969f736d93069f4c833bedd8b1f540b)
@@ -30,6 +30,7 @@
using Ringtoets.Common.Data.Structures;
using Ringtoets.Common.IO.HydraRing;
using Ringtoets.Common.Service;
+using Ringtoets.Common.Service.Structures;
using Ringtoets.Common.Service.ValidationRules;
using Ringtoets.HydraRing.Calculation.Calculator;
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
@@ -45,9 +46,9 @@
namespace Ringtoets.StabilityPointStructures.Service
{
///
- /// Service that provides methods for performing Hydra-ring calculations for stability point structures calculations.
+ /// Service that provides methods for performing Hydra-ring calculations for stability point structures.
///
- public class StabilityPointStructuresCalculationService
+ public class StabilityPointStructuresCalculationService : StructuresCalculationServiceBase
{
private static readonly ILog log = LogManager.GetLogger(typeof(StabilityPointStructuresCalculationService));
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs
===================================================================
diff -u -r92210258706d0f57e05552037b676bd941a6fe19 -r7194f9760969f736d93069f4c833bedd8b1f540b
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 92210258706d0f57e05552037b676bd941a6fe19)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 7194f9760969f736d93069f4c833bedd8b1f540b)
@@ -32,6 +32,7 @@
using Ringtoets.Common.Data.DikeProfiles;
using Ringtoets.Common.Data.FailureMechanism;
using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Service.Structures;
using Ringtoets.Common.Service.TestUtil;
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
using Ringtoets.HydraRing.Calculation.Data;
@@ -51,6 +52,16 @@
private static readonly string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
[Test]
+ public void Constructor_ExpectedValues()
+ {
+ // Call
+ var service = new StabilityPointStructuresCalculationService();
+
+ // Assert
+ Assert.IsInstanceOf(service);
+ }
+
+ [Test]
public void Validate_CalculationNull_ThrowArgumentNullException()
{
// Setup