Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -r3450f7ca7e4504b963bd760cf28939c02ffc0b68 -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 3450f7ca7e4504b963bd760cf28939c02ffc0b68)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -43,8 +43,8 @@
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Forms.TreeNodeInfos;
+using Ringtoets.Common.IO.HydraRing;
 using Ringtoets.Common.Utils;
-using Ringtoets.HydraRing.IO;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs
===================================================================
diff -u -r8e182435811ddd7f9cf29ae57f62b91a2ce5a29c -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs	(.../ClosingStructuresCalculationService.cs)	(revision 8e182435811ddd7f9cf29ae57f62b91a2ce5a29c)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs	(.../ClosingStructuresCalculationService.cs)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -29,6 +29,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Structures;
+using Ringtoets.Common.IO.HydraRing;
 using Ringtoets.Common.Service;
 using Ringtoets.Common.Service.ValidationRules;
 using Ringtoets.Common.Utils;
@@ -37,7 +38,6 @@
 using Ringtoets.HydraRing.Calculation.Data;
 using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
 using Ringtoets.HydraRing.Calculation.Parsers;
-using Ringtoets.HydraRing.IO;
 using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using ClosingStructuresFormsResources = Ringtoets.ClosingStructures.Forms.Properties.Resources;
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/Ringtoets.ClosingStructures.Service.csproj
===================================================================
diff -u -r440f228de8eb72ed5be40270b20a46113917333e -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/Ringtoets.ClosingStructures.Service.csproj	(.../Ringtoets.ClosingStructures.Service.csproj)	(revision 440f228de8eb72ed5be40270b20a46113917333e)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/Ringtoets.ClosingStructures.Service.csproj	(.../Ringtoets.ClosingStructures.Service.csproj)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -80,6 +80,11 @@
       <Name>Ringtoets.Common.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.IO\Ringtoets.Common.IO.csproj">
+      <Project>{52BA7627-CBAB-4209-BE77-3B5F31378277}</Project>
+      <Name>Ringtoets.Common.IO</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Service\Ringtoets.Common.Service.csproj">
       <Project>{D951D6DA-FE83-4920-9FDB-63BF96480B54}</Project>
       <Name>Ringtoets.Common.Service</Name>
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs
===================================================================
diff -u -r2973c5f790a5131e427bd5f73e2a620044199639 -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs	(.../HydraulicBoundaryLocationCalculationGuiService.cs)	(revision 2973c5f790a5131e427bd5f73e2a620044199639)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs	(.../HydraulicBoundaryLocationCalculationGuiService.cs)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -27,10 +27,10 @@
 using Core.Common.Gui.Forms.ProgressDialog;
 using log4net;
 using Ringtoets.Common.Forms.Properties;
+using Ringtoets.Common.IO.HydraRing;
 using Ringtoets.Common.Service;
 using Ringtoets.Common.Service.MessageProviders;
 using Ringtoets.HydraRing.Data;
-using Ringtoets.HydraRing.IO;
 
 namespace Ringtoets.Common.Forms.GuiServices
 {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -r86984ca293c30b4f9b47da7825cbae1404fffe08 -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision 86984ca293c30b4f9b47da7825cbae1404fffe08)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -214,6 +214,11 @@
       <Name>Ringtoets.Common.Data</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.Common.IO\Ringtoets.Common.IO.csproj">
+      <Project>{52BA7627-CBAB-4209-BE77-3B5F31378277}</Project>
+      <Name>Ringtoets.Common.IO</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\Ringtoets.Common.Service\Ringtoets.Common.Service.csproj">
       <Project>{D951D6DA-FE83-4920-9FDB-63BF96480B54}</Project>
       <Name>Ringtoets.Common.Service</Name>
Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraulicDatabaseHelper.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraulicDatabaseHelper.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraulicDatabaseHelper.cs	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -0,0 +1,137 @@
+// 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.IO;
+using Core.Common.IO.Exceptions;
+using Core.Common.Utils;
+using Ringtoets.HydraRing.Data;
+using Ringtoets.HydraRing.IO.HydraulicBoundaryDatabaseContext;
+using Ringtoets.HydraRing.IO.HydraulicLocationConfigurationDatabaseContext;
+using Ringtoets.HydraRing.IO.Properties;
+
+namespace Ringtoets.Common.IO.HydraRing
+{
+    /// <summary>
+    /// This class defines helper methods for obtaining meta data from hyraulic boundary databases.
+    /// </summary>
+    public static class HydraulicDatabaseHelper
+    {
+        private const string hydraRingConfigurationDatabaseExtension = "config.sqlite";
+        private const string hlcdFileName = "HLCD.sqlite";
+
+        /// <summary>
+        /// Attempts to connect to the <paramref name="filePath"/> as if it is a Hydraulic Boundary Locations 
+        /// database with a Hydraulic Location Configurations database next to it.
+        /// </summary>
+        /// <param name="filePath">The path of the Hydraulic Boundary Locations database file.</param>
+        /// <returns>A <see cref="string"/> describing the problem when trying to connect to the <paramref name="filePath"/> 
+        /// or <c>null</c> if a connection could be correctly made.</returns>
+        public static string ValidatePathForCalculation(string filePath)
+        {
+            try
+            {
+                FileUtils.ValidateFilePath(filePath);
+            }
+            catch (ArgumentException e)
+            {
+                return e.Message;
+            }
+
+            string directoryName;
+            try
+            {
+                directoryName = Path.GetDirectoryName(filePath);
+            }
+            catch (PathTooLongException)
+            {
+                return String.Format(Resources.HydraulicDatabaseHelper_ValidatePathForCalculation_Invalid_path_0_, filePath);
+            }
+
+            string settingsDatabaseFileName = GetHydraulicBoundarySettingsDatabase(filePath);
+            try
+            {
+                using (var db = new HydraulicBoundarySqLiteDatabaseReader(filePath))
+                {
+                    db.GetVersion();
+                }
+                string hlcdFilePath = Path.Combine(directoryName, hlcdFileName);
+                new HydraulicLocationConfigurationSqLiteDatabaseReader(hlcdFilePath).Dispose();
+                new DesignTablesSettingsProvider(settingsDatabaseFileName).Dispose();
+                new HydraulicModelsSettingsProvider(settingsDatabaseFileName).Dispose();
+                new NumericsSettingsProvider(settingsDatabaseFileName).Dispose();
+            }
+            catch (CriticalFileReadException e)
+            {
+                return e.Message;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Checks whether the version of a <see cref="HydraulicBoundaryDatabase"/> matches the version
+        /// of a database at the given <see cref="pathToDatabase"/>.
+        /// </summary>
+        /// <param name="database">The database to compare the version of.</param>
+        /// <param name="pathToDatabase">The path to the database to compare the version of.</param>
+        /// <returns><c>true</c> if <paramref name="database"/> equals the version of the database at
+        /// <paramref name="pathToDatabase"/>, <c>false</c> otherwise.</returns>
+        /// <exception cref="CriticalFileReadException">Thrown when no connection with the hydraulic 
+        /// boundary database could be created using <paramref name="pathToDatabase"/>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when:
+        /// <list type="bullet">
+        /// <item><paramref name="database"/> is <c>null</c></item>
+        /// <item><paramref name="pathToDatabase"/> is <c>null</c></item>
+        /// </list></exception>
+        public static bool HaveEqualVersion(HydraulicBoundaryDatabase database, string pathToDatabase)
+        {
+            if (database == null)
+            {
+                throw new ArgumentNullException("database");
+            }
+            if (pathToDatabase == null)
+            {
+                throw new ArgumentNullException("pathToDatabase");
+            }
+            return database.Version == GetVersion(pathToDatabase);
+        }
+
+        /// <summary>
+        /// Returns the version from the database pointed at by the <paramref name="filePath"/>.
+        /// </summary>
+        /// <param name="filePath">The location of the database.</param>
+        /// <returns>The version from the database as a <see cref="string"/>.</returns>
+        /// <exception cref="CriticalFileReadException">Thrown when no connection with the hydraulic 
+        /// boundary database could be created.</exception>
+        private static string GetVersion(string filePath)
+        {
+            using (var db = new HydraulicBoundarySqLiteDatabaseReader(filePath))
+            {
+                return db.GetVersion();
+            }
+        }
+
+        public static string GetHydraulicBoundarySettingsDatabase(string hydraulicBoundaryDatabaseFilePath)
+        {
+            return Path.ChangeExtension(hydraulicBoundaryDatabaseFilePath, hydraRingConfigurationDatabaseExtension);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj
===================================================================
diff -u -rba15b57903cc8a77a35dcf0efa392b5aa7a5e70e -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj	(.../Ringtoets.Common.IO.csproj)	(revision ba15b57903cc8a77a35dcf0efa392b5aa7a5e70e)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj	(.../Ringtoets.Common.IO.csproj)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -69,6 +69,7 @@
     <Compile Include="HydraRing\HydraulicBoundaryLocationFilter.cs" />
     <Compile Include="FileImporters\ProfilesImporter.cs" />
     <Compile Include="FileImporters\StructuresImporter.cs" />
+    <Compile Include="HydraRing\HydraulicDatabaseHelper.cs" />
     <Compile Include="HydraRing\HydraulicModelsSettingsProvider.cs" />
     <Compile Include="HydraRing\NumericsSettingsProvider.cs" />
     <Compile Include="HydraulicBoundaryLocationsExporter.cs" />
Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs
===================================================================
diff -u -rc7d39e2c22a5df98a9f398cab98040a51faba283 -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs	(.../DesignWaterLevelCalculationService.cs)	(revision c7d39e2c22a5df98a9f398cab98040a51faba283)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs	(.../DesignWaterLevelCalculationService.cs)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -33,7 +32,6 @@
 using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics;
 using Ringtoets.HydraRing.Calculation.Parsers;
 using Ringtoets.HydraRing.Data;
-using Ringtoets.HydraRing.IO;
 
 namespace Ringtoets.Common.Service
 {
@@ -154,7 +152,7 @@
         {
             var assessmentLevelCalculationInput = new AssessmentLevelCalculationInput(1, hydraulicBoundaryLocation.Id, norm);
 
-            HydraRingSettingsHelper.SetHydraRingSettings(assessmentLevelCalculationInput, hydraulicBoundaryDatabaseFilePath);
+            HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(assessmentLevelCalculationInput, hydraulicBoundaryDatabaseFilePath);
 
             return assessmentLevelCalculationInput;
         }
Index: Ringtoets/Common/src/Ringtoets.Common.Service/HydraRingSettingsDatabaseHelper.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Service/HydraRingSettingsDatabaseHelper.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/HydraRingSettingsDatabaseHelper.cs	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -0,0 +1,78 @@
+// 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 Core.Common.IO.Exceptions;
+using Core.Common.Utils;
+using Ringtoets.Common.IO.HydraRing;
+using Ringtoets.HydraRing.Calculation.Data.Input;
+
+namespace Ringtoets.Common.Service
+{
+    /// <summary>
+    /// Helper class for providing a convinient method for obtaining and updating Hydra-Ring settings per location from the settings database 
+    /// based on <see cref="HydraRingCalculationInput"/>.
+    /// </summary>
+    public static class HydraRingSettingsDatabaseHelper 
+    {
+        /// <summary>
+        /// Obtains the Hydra-Ring settings based on the location and the failure mechanism obtained from the <paramref name="calculationInput"/>
+        /// and sets these value on the <paramref name="calculationInput"/>.
+        /// </summary>
+        /// <param name="calculationInput">The calculation input for which the settings are updated.</param>
+        /// <param name="hydraulicBoundaryDatabaseFilePath">The path to the hydraulic boundary database file.</param>
+        /// <exception cref="ArgumentException">Thrown when the <paramref name="hydraulicBoundaryDatabaseFilePath"/> 
+        /// contains invalid characters.</exception>
+        /// <exception cref="CriticalFileReadException">Thrown when:
+        /// <list type="bullet">
+        /// <item>No settings database file could be found at the location of <paramref name="hydraulicBoundaryDatabaseFilePath"/>
+        /// with the same name.</item>
+        /// <item>Unable to open settings database file.</item>
+        /// </list>
+        /// </exception>
+        public static void AssignSettingsFromDatabase(HydraRingCalculationInput calculationInput, string hydraulicBoundaryDatabaseFilePath)
+        {
+            FileUtils.ValidateFilePath(hydraulicBoundaryDatabaseFilePath);
+
+            var locationId = calculationInput.HydraulicBoundaryLocationId;
+            var settingsDatabaseFileName = HydraulicDatabaseHelper.GetHydraulicBoundarySettingsDatabase(hydraulicBoundaryDatabaseFilePath);
+
+            using (var designTablesSettingsProviders = new DesignTablesSettingsProvider(settingsDatabaseFileName))
+            {
+                calculationInput.DesignTablesSetting = designTablesSettingsProviders.GetDesignTablesSetting(
+                    locationId, 
+                    calculationInput.FailureMechanismType);
+            }
+            using (var numericsSettingsProvider = new NumericsSettingsProvider(settingsDatabaseFileName))
+            {
+                calculationInput.NumericsSettings = numericsSettingsProvider.GetNumericsSettings(
+                    locationId, 
+                    calculationInput.FailureMechanismType);
+            }
+            using (var modelsSettingsProvider = new HydraulicModelsSettingsProvider(settingsDatabaseFileName))
+            {
+                calculationInput.HydraulicModelsSetting = modelsSettingsProvider.GetHydraulicModelsSetting(
+                    locationId, 
+                    calculationInput.FailureMechanismType);
+            }
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 02d0e67121f748ae6d69ab9f68643d2f5e62f800 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Service/HydraRingSettingsHelper.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj
===================================================================
diff -u -r16f6bd5805e77d549cded91fc48fff35ffbdec00 -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj	(.../Ringtoets.Common.Service.csproj)	(revision 16f6bd5805e77d549cded91fc48fff35ffbdec00)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj	(.../Ringtoets.Common.Service.csproj)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -49,7 +49,7 @@
     </Compile>
     <Compile Include="CalculationServiceHelper.cs" />
     <Compile Include="HydraRingInputParser.cs" />
-    <Compile Include="HydraRingSettingsHelper.cs" />
+    <Compile Include="HydraRingSettingsDatabaseHelper.cs" />
     <Compile Include="ParameterNameExtractor.cs" />
     <Compile Include="ValidationRules\NumericInputRule.cs" />
     <Compile Include="ValidationRules\UseBreakWaterRule.cs" />
Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs
===================================================================
diff -u -rc7d39e2c22a5df98a9f398cab98040a51faba283 -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision c7d39e2c22a5df98a9f398cab98040a51faba283)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -24,14 +24,14 @@
 using System.Linq;
 using Core.Common.Base.Data;
 using log4net;
+using Ringtoets.Common.IO.HydraRing;
 using Ringtoets.Common.Service.MessageProviders;
 using Ringtoets.Common.Service.Properties;
 using Ringtoets.HydraRing.Calculation.Calculator;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
 using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics;
 using Ringtoets.HydraRing.Calculation.Parsers;
 using Ringtoets.HydraRing.Data;
-using Ringtoets.HydraRing.IO;
 
 namespace Ringtoets.Common.Service
 {
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraulicDatabaseHelperTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraulicDatabaseHelperTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraulicDatabaseHelperTest.cs	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -0,0 +1,193 @@
+// 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.IO;
+using Core.Common.IO.Exceptions;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Ringtoets.Common.IO.HydraRing;
+using Ringtoets.HydraRing.Data;
+
+namespace Ringtoets.Common.IO.Test.HydraRing
+{
+    [TestFixture]
+    public class HydraulicDatabaseHelperTest
+    {
+        private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.HydraRing.IO, "HydraulicBoundaryLocationReader");
+
+        [Test]
+        public void ValidatePathForCalculation_ExistingFileWithHlcd_ReturnsNull()
+        {
+            // Setup
+            string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
+
+            // Call
+            var result = HydraulicDatabaseHelper.ValidatePathForCalculation(validFilePath);
+
+            // Assert
+            Assert.IsNull(result);
+        }
+
+        [Test]
+        public void ValidatePathForCalculation_NonExistingFile_ReturnsMessageWithError()
+        {
+            // Setup
+            var nonexistingSqlite = "nonexisting.sqlite";
+            string filePath = Path.Combine(testDataPath, nonexistingSqlite);
+
+            // Call
+            var result = HydraulicDatabaseHelper.ValidatePathForCalculation(filePath);
+
+            // Assert
+            StringAssert.StartsWith(string.Format("Fout bij het lezen van bestand '{0}':", filePath), result);
+        }
+
+        [Test]
+        public void ValidatePathForCalculation_InvalidFile_ReturnsMessageWithError()
+        {
+            // Setup
+            var invalidPath = Path.Combine(testDataPath, "complete.sqlite");
+            invalidPath = invalidPath.Replace('c', Path.GetInvalidPathChars()[0]);
+
+            // Call
+            var result = HydraulicDatabaseHelper.ValidatePathForCalculation(invalidPath);
+
+            // Assert
+            StringAssert.StartsWith(string.Format("Fout bij het lezen van bestand '{0}':", invalidPath), result);
+        }
+
+        [Test]
+        public void ValidatePathForCalculation_FileIsDirectory_ReturnsMessageWithError()
+        {
+            // Setup
+            string filePath = Path.Combine(testDataPath, "/");
+
+            // Call
+            var result = HydraulicDatabaseHelper.ValidatePathForCalculation(filePath);
+
+            // Assert
+            StringAssert.StartsWith(string.Format("Fout bij het lezen van bestand '{0}':", filePath), result);
+        }
+
+        [Test]
+        public void ValidatePathForCalculation_ExistingFileWithoutHlcd_ReturnsMessageWithError()
+        {
+            // Setup
+            string validFilePath = Path.Combine(testDataPath, "withoutHLCD", "empty.sqlite");
+
+            // Call
+            var result = HydraulicDatabaseHelper.ValidatePathForCalculation(validFilePath);
+
+            // Assert
+            StringAssert.StartsWith(string.Format("Fout bij het lezen van bestand '{0}':", validFilePath), result);
+        }
+
+        [Test]
+        public void ValidatePathForCalculation_InvalidFilePath_ReturnsMessageWithError()
+        {
+            // Setup
+            var invalidFilePath = "C:\\Thisissomeverylongpath\\toadirectorywhich\\doesntevenexist\\Nowlets\\finishwithsomelongname\\" +
+                                  "loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong" +
+                                  "naaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaame" +
+                                  "\\followedbythefile";
+
+            // Call
+            var result = HydraulicDatabaseHelper.ValidatePathForCalculation(invalidFilePath);
+
+            // Assert
+            StringAssert.StartsWith(string.Format("Het opgegeven bestandspad ({0}) is niet geldig.", invalidFilePath), result);
+        }
+
+        [Test]
+        public void HaveEqualVersion_InvalidFile_ThrowsCriticalFileReadException()
+        {
+            // Setup
+            var invalidPath = Path.Combine(testDataPath, "complete.sqlite");
+            invalidPath = invalidPath.Replace('c', Path.GetInvalidPathChars()[0]);
+
+            // Call
+            TestDelegate test = () => HydraulicDatabaseHelper.HaveEqualVersion(new HydraulicBoundaryDatabase(), invalidPath);
+
+            // Assert
+            Assert.Throws<CriticalFileReadException>(test);
+        }
+
+        [Test]
+        public void HaveEqualVersion_PathNotSet_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate test = () => HydraulicDatabaseHelper.HaveEqualVersion(new HydraulicBoundaryDatabase(), null);
+
+            // Assert
+            var parameter = Assert.Throws<ArgumentNullException>(test).ParamName;
+            Assert.AreEqual("pathToDatabase", parameter);
+        }
+
+        [Test]
+        public void HaveEqualVersion_DatabaseNotSet_ThrowsArgumentNullException()
+        {
+            // Setup
+            string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
+
+            // Call
+            TestDelegate test = () => HydraulicDatabaseHelper.HaveEqualVersion(null, validFilePath);
+
+            // Assert
+            var parameter = Assert.Throws<ArgumentNullException>(test).ParamName;
+            Assert.AreEqual("database", parameter);
+        }
+
+        [Test]
+        public void HaveEqualVersion_ValidFileEqualVersion_ReturnsTrue()
+        {
+            // Setup
+            string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
+            var database = new HydraulicBoundaryDatabase()
+            {
+                Version = "Dutch coast South19-11-2015 12:0013"
+            };
+
+            // Call
+            bool isEqual = HydraulicDatabaseHelper.HaveEqualVersion(database, validFilePath);
+
+            // Assert
+            Assert.IsTrue(isEqual);
+        }
+
+        [Test]
+        public void HaveEqualVersion_ValidFileDifferentVersion_ReturnsFalse()
+        {
+            // Setup
+            string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
+            var database = new HydraulicBoundaryDatabase()
+            {
+                Version = "Dutch coast South19-11-2015 12:0113"
+            };
+
+            // Call
+            bool isEqual = HydraulicDatabaseHelper.HaveEqualVersion(database, validFilePath);
+
+            // Assert
+            Assert.IsFalse(isEqual);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Ringtoets.Common.IO.Test.csproj
===================================================================
diff -u -rba15b57903cc8a77a35dcf0efa392b5aa7a5e70e -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Ringtoets.Common.IO.Test.csproj	(.../Ringtoets.Common.IO.Test.csproj)	(revision ba15b57903cc8a77a35dcf0efa392b5aa7a5e70e)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Ringtoets.Common.IO.Test.csproj	(.../Ringtoets.Common.IO.Test.csproj)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -72,6 +72,7 @@
     <Compile Include="FileImporters\ProfilesImporterTest.cs" />
     <Compile Include="FileImporters\StructuresImporterTest.cs" />
     <Compile Include="HydraRing\HydraRingSettingsDatabaseReaderTest.cs" />
+    <Compile Include="HydraRing\HydraulicDatabaseHelperTest.cs" />
     <Compile Include="HydraRing\HydraulicModelsSettingsProviderTest.cs" />
     <Compile Include="HydraRing\NumericsSettingsProviderTest.cs" />
     <Compile Include="HydraulicBoundaryLocationsExporterTest.cs" />
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs
===================================================================
diff -u -r3450f7ca7e4504b963bd760cf28939c02ffc0b68 -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision 3450f7ca7e4504b963bd760cf28939c02ffc0b68)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -37,14 +37,14 @@
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Forms.TreeNodeInfos;
+using Ringtoets.Common.IO.HydraRing;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Forms;
 using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionInwards.Forms.PropertyClasses;
 using Ringtoets.GrassCoverErosionInwards.Forms.Views;
 using Ringtoets.GrassCoverErosionInwards.Service;
 using Ringtoets.GrassCoverErosionInwards.Utils;
-using Ringtoets.HydraRing.IO;
 using GrassCoverErosionInwardsPluginResources = Ringtoets.GrassCoverErosionInwards.Plugin.Properties.Resources;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs
===================================================================
diff -u -r8e182435811ddd7f9cf29ae57f62b91a2ce5a29c -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs	(.../GrassCoverErosionInwardsCalculationService.cs)	(revision 8e182435811ddd7f9cf29ae57f62b91a2ce5a29c)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs	(.../GrassCoverErosionInwardsCalculationService.cs)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -26,6 +26,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.IO.HydraRing;
 using Ringtoets.Common.Service;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Service.Properties;
@@ -35,7 +36,6 @@
 using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics;
 using Ringtoets.HydraRing.Calculation.Data.Input.Overtopping;
 using Ringtoets.HydraRing.Calculation.Parsers;
-using Ringtoets.HydraRing.IO;
 using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
 using RingtoetsCommonForms = Ringtoets.Common.Forms.Properties.Resources;
 
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/Ringtoets.GrassCoverErosionInwards.Service.csproj
===================================================================
diff -u -r7d4fdb527410c89577828ea5d84896945341bae8 -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/Ringtoets.GrassCoverErosionInwards.Service.csproj	(.../Ringtoets.GrassCoverErosionInwards.Service.csproj)	(revision 7d4fdb527410c89577828ea5d84896945341bae8)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/Ringtoets.GrassCoverErosionInwards.Service.csproj	(.../Ringtoets.GrassCoverErosionInwards.Service.csproj)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -74,6 +74,11 @@
       <Name>Ringtoets.Common.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.IO\Ringtoets.Common.IO.csproj">
+      <Project>{52BA7627-CBAB-4209-BE77-3B5F31378277}</Project>
+      <Name>Ringtoets.Common.IO</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Service\Ringtoets.Common.Service.csproj">
       <Project>{D951D6DA-FE83-4920-9FDB-63BF96480B54}</Project>
       <Name>Ringtoets.Common.Service</Name>
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r3450f7ca7e4504b963bd760cf28939c02ffc0b68 -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 3450f7ca7e4504b963bd760cf28939c02ffc0b68)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -40,6 +40,7 @@
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Forms.TreeNodeInfos;
 using Ringtoets.Common.IO;
+using Ringtoets.Common.IO.HydraRing;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
@@ -50,7 +51,6 @@
 using Ringtoets.GrassCoverErosionOutwards.Service;
 using Ringtoets.GrassCoverErosionOutwards.Service.MessageProviders;
 using Ringtoets.HydraRing.Data;
-using Ringtoets.HydraRing.IO;
 using RingtoetsGrassCoverErosionOutwardsFormsResources = Ringtoets.GrassCoverErosionOutwards.Forms.Properties.Resources;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -r3450f7ca7e4504b963bd760cf28939c02ffc0b68 -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 3450f7ca7e4504b963bd760cf28939c02ffc0b68)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -38,14 +38,14 @@
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Forms.TreeNodeInfos;
+using Ringtoets.Common.IO.HydraRing;
 using Ringtoets.Common.Utils;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Forms.PresentationObjects;
 using Ringtoets.HeightStructures.Forms.PropertyClasses;
 using Ringtoets.HeightStructures.Forms.Views;
 using Ringtoets.HeightStructures.IO;
 using Ringtoets.HeightStructures.Service;
-using Ringtoets.HydraRing.IO;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs
===================================================================
diff -u -r8e182435811ddd7f9cf29ae57f62b91a2ce5a29c -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs	(.../HeightStructuresCalculationService.cs)	(revision 8e182435811ddd7f9cf29ae57f62b91a2ce5a29c)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs	(.../HeightStructuresCalculationService.cs)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -26,6 +26,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Structures;
+using Ringtoets.Common.IO.HydraRing;
 using Ringtoets.Common.Service;
 using Ringtoets.Common.Service.ValidationRules;
 using Ringtoets.Common.Utils;
@@ -36,7 +37,6 @@
 using Ringtoets.HydraRing.Calculation.Data;
 using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
 using Ringtoets.HydraRing.Calculation.Parsers;
-using Ringtoets.HydraRing.IO;
 using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/Ringtoets.HeightStructures.Service.csproj
===================================================================
diff -u -re4e785f127ce9a2d0d1734c1b51e02d910a31bbe -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/Ringtoets.HeightStructures.Service.csproj	(.../Ringtoets.HeightStructures.Service.csproj)	(revision e4e785f127ce9a2d0d1734c1b51e02d910a31bbe)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/Ringtoets.HeightStructures.Service.csproj	(.../Ringtoets.HeightStructures.Service.csproj)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -74,6 +74,11 @@
       <Name>Ringtoets.Common.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.IO\Ringtoets.Common.IO.csproj">
+      <Project>{52BA7627-CBAB-4209-BE77-3B5F31378277}</Project>
+      <Name>Ringtoets.Common.IO</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Service\Ringtoets.Common.Service.csproj">
       <Project>{D951D6DA-FE83-4920-9FDB-63BF96480B54}</Project>
       <Name>Ringtoets.Common.Service</Name>
Fisheye: Tag 02d0e67121f748ae6d69ab9f68643d2f5e62f800 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicDatabaseHelper.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/Ringtoets.HydraRing.IO.csproj
===================================================================
diff -u -re69acb9595f7bf1d202ddd1fb51934b66768b75d -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/Ringtoets.HydraRing.IO.csproj	(.../Ringtoets.HydraRing.IO.csproj)	(revision e69acb9595f7bf1d202ddd1fb51934b66768b75d)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/Ringtoets.HydraRing.IO.csproj	(.../Ringtoets.HydraRing.IO.csproj)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -60,7 +60,6 @@
     <Compile Include="HydraulicBoundaryDatabaseContext\HydraulicBoundaryDatabaseQueryBuilder.cs" />
     <Compile Include="HydraulicBoundaryDatabaseContext\HydraulicBoundarySqLiteDatabaseReader.cs" />
     <Compile Include="HydraulicBoundaryLocationsWriter.cs" />
-    <Compile Include="HydraulicDatabaseHelper.cs" />
     <Compile Include="HydraulicLocationConfigurationDatabaseContext\HydraulicLocationConfigurationSqLiteDatabaseReader.cs" />
     <Compile Include="HydraulicLocationConfigurationDatabaseContext\HydraulicLocationConfigurationDatabaseQueryBuilder.cs" />
     <Compile Include="HydraulicLocationConfigurationDatabaseContext\LocationsTableDefinitions.cs" />
Fisheye: Tag 02d0e67121f748ae6d69ab9f68643d2f5e62f800 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicDatabaseHelperTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/Ringtoets.HydraRing.IO.Test.csproj
===================================================================
diff -u -r3d84064b23186da3fb11f19ff0d07f41e1209bbb -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/Ringtoets.HydraRing.IO.Test.csproj	(.../Ringtoets.HydraRing.IO.Test.csproj)	(revision 3d84064b23186da3fb11f19ff0d07f41e1209bbb)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/Ringtoets.HydraRing.IO.Test.csproj	(.../Ringtoets.HydraRing.IO.Test.csproj)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -60,7 +60,6 @@
     <Compile Include="HydraulicBoundaryDatabaseContext\HydraulicBoundaryDatabaseQueryBuilderTest.cs" />
     <Compile Include="HydraulicBoundaryDatabaseContext\HydraulicBoundaryDatabaseReaderTest.cs" />
     <Compile Include="HydraulicBoundaryLocationsWriterTest.cs" />
-    <Compile Include="HydraulicDatabaseHelperTest.cs" />
     <Compile Include="HydraulicLocationConfigurationDatabaseContext\HydraulicLocationConfigurationDatabaseQueryBuilderTest.cs" />
     <Compile Include="HydraulicLocationConfigurationDatabaseContext\HydraulicLocationConfigurationSqLiteDatabaseReaderTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/test-data/HydraulicBoundaryLocationReader/complete.config.sqlite
===================================================================
diff -u
Binary files differ
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r56ec7114c4c96eeee4a1bb16d0ecac2bb10a49b8 -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 56ec7114c4c96eeee4a1bb16d0ecac2bb10a49b8)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -52,6 +52,7 @@
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Common.IO;
 using Ringtoets.Common.IO.FileImporters;
+using Ringtoets.Common.IO.HydraRing;
 using Ringtoets.Common.IO.ReferenceLines;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
@@ -60,7 +61,6 @@
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Forms.PresentationObjects;
 using Ringtoets.HydraRing.Data;
-using Ringtoets.HydraRing.IO;
 using Ringtoets.Integration.Data;
 using Ringtoets.Integration.Data.StandAlone;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Ringtoets.Revetment.Service.csproj
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Ringtoets.Revetment.Service.csproj	(.../Ringtoets.Revetment.Service.csproj)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Ringtoets.Revetment.Service.csproj	(.../Ringtoets.Revetment.Service.csproj)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -73,6 +73,11 @@
       <Name>Ringtoets.Common.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.IO\Ringtoets.Common.IO.csproj">
+      <Project>{52BA7627-CBAB-4209-BE77-3B5F31378277}</Project>
+      <Name>Ringtoets.Common.IO</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Service\Ringtoets.Common.Service.csproj">
       <Project>{D951D6DA-FE83-4920-9FDB-63BF96480B54}</Project>
       <Name>Ringtoets.Common.Service</Name>
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs
===================================================================
diff -u -r8e182435811ddd7f9cf29ae57f62b91a2ce5a29c -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs	(.../WaveConditionsCalculationServiceBase.cs)	(revision 8e182435811ddd7f9cf29ae57f62b91a2ce5a29c)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs	(.../WaveConditionsCalculationServiceBase.cs)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -27,12 +27,12 @@
 using Core.Common.Base.Data;
 using Core.Common.Base.IO;
 using log4net;
+using Ringtoets.Common.IO.HydraRing;
 using Ringtoets.Common.Service;
 using Ringtoets.HydraRing.Calculation.Calculator;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
 using Ringtoets.HydraRing.Calculation.Data.Input.WaveConditions;
 using Ringtoets.HydraRing.Calculation.Parsers;
-using Ringtoets.HydraRing.IO;
 using Ringtoets.Revetment.Data;
 using Ringtoets.Revetment.Service.Properties;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -rc238c8de03e71e09a71c68b6f28fb057ef8a1c4d -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision c238c8de03e71e09a71c68b6f28fb057ef8a1c4d)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -37,8 +37,8 @@
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Forms.TreeNodeInfos;
+using Ringtoets.Common.IO.HydraRing;
 using Ringtoets.Common.Utils;
-using Ringtoets.HydraRing.IO;
 using Ringtoets.StabilityPointStructures.Data;
 using Ringtoets.StabilityPointStructures.Forms.PresentationObjects;
 using Ringtoets.StabilityPointStructures.Forms.PropertyClasses;
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/Ringtoets.StabilityPointStructures.Service.csproj
===================================================================
diff -u -rbd73023d5f8926a411da214fb5ce522056a0e30a -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/Ringtoets.StabilityPointStructures.Service.csproj	(.../Ringtoets.StabilityPointStructures.Service.csproj)	(revision bd73023d5f8926a411da214fb5ce522056a0e30a)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/Ringtoets.StabilityPointStructures.Service.csproj	(.../Ringtoets.StabilityPointStructures.Service.csproj)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -74,6 +74,11 @@
       <Name>Ringtoets.Common.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.IO\Ringtoets.Common.IO.csproj">
+      <Project>{52BA7627-CBAB-4209-BE77-3B5F31378277}</Project>
+      <Name>Ringtoets.Common.IO</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Service\Ringtoets.Common.Service.csproj">
       <Project>{D951D6DA-FE83-4920-9FDB-63BF96480B54}</Project>
       <Name>Ringtoets.Common.Service</Name>
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs
===================================================================
diff -u -r3e2b23a30146a72cc9a7c4d58f87699a6c67a60b -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs	(.../StabilityPointStructuresCalculationService.cs)	(revision 3e2b23a30146a72cc9a7c4d58f87699a6c67a60b)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs	(.../StabilityPointStructuresCalculationService.cs)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -27,6 +27,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Structures;
+using Ringtoets.Common.IO.HydraRing;
 using Ringtoets.Common.Service;
 using Ringtoets.Common.Service.ValidationRules;
 using Ringtoets.Common.Utils;
@@ -35,7 +36,6 @@
 using Ringtoets.HydraRing.Calculation.Data;
 using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
 using Ringtoets.HydraRing.Calculation.Parsers;
-using Ringtoets.HydraRing.IO;
 using Ringtoets.StabilityPointStructures.Data;
 using Ringtoets.StabilityPointStructures.Service.Properties;
 using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/Ringtoets.StabilityStoneCover.Plugin.csproj
===================================================================
diff -u -rbfe0c885c674d20d6ed6fbfb95e9cdc484b4788c -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/Ringtoets.StabilityStoneCover.Plugin.csproj	(.../Ringtoets.StabilityStoneCover.Plugin.csproj)	(revision bfe0c885c674d20d6ed6fbfb95e9cdc484b4788c)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/Ringtoets.StabilityStoneCover.Plugin.csproj	(.../Ringtoets.StabilityStoneCover.Plugin.csproj)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -80,6 +80,11 @@
       <Name>Ringtoets.Common.Forms</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.IO\Ringtoets.Common.IO.csproj">
+      <Project>{52BA7627-CBAB-4209-BE77-3B5F31378277}</Project>
+      <Name>Ringtoets.Common.IO</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Service\Ringtoets.Common.Service.csproj">
       <Project>{d951d6da-fe83-4920-9fdb-63bf96480b54}</Project>
       <Name>Ringtoets.Common.Service</Name>
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs
===================================================================
diff -u -r3450f7ca7e4504b963bd760cf28939c02ffc0b68 -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision 3450f7ca7e4504b963bd760cf28939c02ffc0b68)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -35,8 +35,8 @@
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Forms.TreeNodeInfos;
+using Ringtoets.Common.IO.HydraRing;
 using Ringtoets.HydraRing.Data;
-using Ringtoets.HydraRing.IO;
 using Ringtoets.StabilityStoneCover.Data;
 using Ringtoets.StabilityStoneCover.Forms;
 using Ringtoets.StabilityStoneCover.Forms.PresentationObjects;
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -r3450f7ca7e4504b963bd760cf28939c02ffc0b68 -r02d0e67121f748ae6d69ab9f68643d2f5e62f800
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 3450f7ca7e4504b963bd760cf28939c02ffc0b68)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
@@ -35,8 +35,8 @@
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Forms.TreeNodeInfos;
+using Ringtoets.Common.IO.HydraRing;
 using Ringtoets.HydraRing.Data;
-using Ringtoets.HydraRing.IO;
 using Ringtoets.WaveImpactAsphaltCover.Data;
 using Ringtoets.WaveImpactAsphaltCover.Forms;
 using Ringtoets.WaveImpactAsphaltCover.Forms.PresentationObjects;