Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryCalculationSettings.cs =================================================================== diff -u -r59c26a72b1017bdb20e45a2301d8a109f5f16f5f -r3ff86742b1fa9935c42f90d951df9c20bbbf7b8f --- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryCalculationSettings.cs (.../HydraulicBoundaryCalculationSettings.cs) (revision 59c26a72b1017bdb20e45a2301d8a109f5f16f5f) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryCalculationSettings.cs (.../HydraulicBoundaryCalculationSettings.cs) (revision 3ff86742b1fa9935c42f90d951df9c20bbbf7b8f) @@ -1,6 +1,4 @@ -using System; - -namespace Ringtoets.Common.Data.Hydraulics +namespace Ringtoets.Common.Data.Hydraulics { /// /// Class which holds all hydraulic boundary calculations settings. Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryCalculationSettingsFactory.cs =================================================================== diff -u -r1a75c0f703334eacfc82f695b38405ccb9313add -r3ff86742b1fa9935c42f90d951df9c20bbbf7b8f --- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryCalculationSettingsFactory.cs (.../HydraulicBoundaryCalculationSettingsFactory.cs) (revision 1a75c0f703334eacfc82f695b38405ccb9313add) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryCalculationSettingsFactory.cs (.../HydraulicBoundaryCalculationSettingsFactory.cs) (revision 3ff86742b1fa9935c42f90d951df9c20bbbf7b8f) @@ -23,16 +23,16 @@ } string hydraulicBoundaryDatabaseFilePath = hydraulicBoundaryDatabase.FilePath; - string hydraulicBoundaryDatabaseDirectory = null; + string hlcdFilePath = null; if (!string.IsNullOrWhiteSpace(hydraulicBoundaryDatabaseFilePath)) { string directory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath); - hydraulicBoundaryDatabaseDirectory = Path.Combine(directory, "HLCD.sqlite"); + hlcdFilePath = Path.Combine(directory, "HLCD.sqlite"); } return new HydraulicBoundaryCalculationSettings(hydraulicBoundaryDatabaseFilePath, - hydraulicBoundaryDatabaseDirectory, + hlcdFilePath, hydraulicBoundaryDatabase.EffectivePreprocessorDirectory()); } } Index: Ringtoets/Common/src/Ringtoets.Common.Service/HydraRingCalculationSettingsFactory.cs =================================================================== diff -u --- Ringtoets/Common/src/Ringtoets.Common.Service/HydraRingCalculationSettingsFactory.cs (revision 0) +++ Ringtoets/Common/src/Ringtoets.Common.Service/HydraRingCalculationSettingsFactory.cs (revision 3ff86742b1fa9935c42f90d951df9c20bbbf7b8f) @@ -0,0 +1,32 @@ +using System; +using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.HydraRing.Calculation.Data.Input; + +namespace Ringtoets.Common.Service +{ + /// + /// Factory to create instances of . + /// + public static class HydraRingCalculationSettingsFactory + { + /// + /// Creates a new instance of a + /// based on a . + /// + /// The + /// to create a for. + /// A . + /// Thrown when + /// is null. + public static HydraRingCalculationSettings CreateSettings(HydraulicBoundaryCalculationSettings hydraulicBoundaryCalculationSettings) + { + if (hydraulicBoundaryCalculationSettings == null) + { + throw new ArgumentNullException(nameof(hydraulicBoundaryCalculationSettings)); + } + + return new HydraRingCalculationSettings(hydraulicBoundaryCalculationSettings.HlcdFilePath, + hydraulicBoundaryCalculationSettings.PreprocessorDirectory); + } + } +} \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj =================================================================== diff -u -rca294adc98299b17393265233305360300e8b0ef -r3ff86742b1fa9935c42f90d951df9c20bbbf7b8f --- Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj (.../Ringtoets.Common.Service.csproj) (revision ca294adc98299b17393265233305360300e8b0ef) +++ Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj (.../Ringtoets.Common.Service.csproj) (revision 3ff86742b1fa9935c42f90d951df9c20bbbf7b8f) @@ -16,6 +16,7 @@ + Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/HydraRingCalculationSettingsFactoryTest.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/HydraRingCalculationSettingsFactoryTest.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/HydraRingCalculationSettingsFactoryTest.cs (revision 3ff86742b1fa9935c42f90d951df9c20bbbf7b8f) @@ -0,0 +1,38 @@ +using System; +using NUnit.Framework; +using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.HydraRing.Calculation.Data.Input; + +namespace Ringtoets.Common.Service.Test +{ + [TestFixture] + public class HydraRingCalculationSettingsFactoryTest + { + [Test] + public void CreateSettings_HydraulicBoundaryCalculationSettingsNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => HydraRingCalculationSettingsFactory.CreateSettings(null); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("hydraulicBoundaryCalculationSettings", exception.ParamName); + } + + [Test] + public void CreateSettings_WithHydraulicBoundaryCalculationSettings_ReturnsExpectedSettings() + { + // Setup + var hydraulicBoundaryCalculationSettings = new HydraulicBoundaryCalculationSettings("HydraulicBoundaryDataBaseFilePath", + "hlcdFilePath", + "preprocessorDirectory"); + + // Call + HydraRingCalculationSettings hydraRingCalculationSettings = HydraRingCalculationSettingsFactory.CreateSettings(hydraulicBoundaryCalculationSettings); + + // Assert + Assert.AreEqual(hydraulicBoundaryCalculationSettings.HlcdFilePath, hydraRingCalculationSettings.HlcdFilePath); + Assert.AreEqual(hydraulicBoundaryCalculationSettings.PreprocessorDirectory, hydraRingCalculationSettings.PreprocessorDirectory); + } + } +} \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj =================================================================== diff -u -rca294adc98299b17393265233305360300e8b0ef -r3ff86742b1fa9935c42f90d951df9c20bbbf7b8f --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj (.../Ringtoets.Common.Service.Test.csproj) (revision ca294adc98299b17393265233305360300e8b0ef) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj (.../Ringtoets.Common.Service.Test.csproj) (revision 3ff86742b1fa9935c42f90d951df9c20bbbf7b8f) @@ -29,6 +29,7 @@ +