Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/HydraRingCalculationSettings.cs =================================================================== diff -u -rd479aa88d66f9a5a61008baeb9d7e26a99fefa93 -r95aa30905727b2c07ff6c4c598e12d98bd4b76d3 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/HydraRingCalculationSettings.cs (.../HydraRingCalculationSettings.cs) (revision d479aa88d66f9a5a61008baeb9d7e26a99fefa93) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/HydraRingCalculationSettings.cs (.../HydraRingCalculationSettings.cs) (revision 95aa30905727b2c07ff6c4c598e12d98bd4b76d3) @@ -11,42 +11,31 @@ /// /// Creates a new instance of . /// - /// The path which points to the hydraulic boundary - /// database file. - /// The path which points to - /// the hydraulic boundary locations configuration file. + /// The path which points to the HLCD file. /// The preprocessor directory to be used for the calculations. - /// Thrown when + /// Thrown when any parameter is null /// is null - /// Thrown when - /// or of the input parameters contains invalid - /// characters. - public HydraRingCalculationSettings(string hydraulicBoundaryDatabaseFilePath, - string hydraulicBoundaryLocationsConfigurationFilePath, + public HydraRingCalculationSettings(string hlcdFilePath, string preprocessorDirectory) { + if (hlcdFilePath == null) + { + throw new ArgumentNullException(nameof(hlcdFilePath)); + } + if (preprocessorDirectory == null) { throw new ArgumentNullException(nameof(preprocessorDirectory)); } - IOUtils.ValidateFilePath(hydraulicBoundaryDatabaseFilePath); - IOUtils.ValidateFilePath(hydraulicBoundaryLocationsConfigurationFilePath); - - HydraulicBoundaryDatabaseFilePath = hydraulicBoundaryDatabaseFilePath; - HydraulicBoundaryLocationsConfigurationFilePath = hydraulicBoundaryLocationsConfigurationFilePath; + HlcdFilePath = hlcdFilePath; PreprocessorDirectory = preprocessorDirectory; } /// - /// Gets the hydraulic boundary database filepath. - /// - public string HydraulicBoundaryDatabaseFilePath { get; } - - /// /// Gets the hydraulic locations configurations filepath. /// - public string HydraulicBoundaryLocationsConfigurationFilePath { get; } + public string HlcdFilePath { get; } /// /// Gets the preprocessor director. Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/HydraRingCalculationSettingsTest.cs =================================================================== diff -u -rd479aa88d66f9a5a61008baeb9d7e26a99fefa93 -r95aa30905727b2c07ff6c4c598e12d98bd4b76d3 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/HydraRingCalculationSettingsTest.cs (.../HydraRingCalculationSettingsTest.cs) (revision d479aa88d66f9a5a61008baeb9d7e26a99fefa93) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/HydraRingCalculationSettingsTest.cs (.../HydraRingCalculationSettingsTest.cs) (revision 95aa30905727b2c07ff6c4c598e12d98bd4b76d3) @@ -1,5 +1,4 @@ using System; -using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.HydraRing.Calculation.Data.Input; @@ -9,51 +8,22 @@ public class HydraRingCalculationSettingsTest { [Test] - [TestCaseSource(typeof(InvalidPathHelper), nameof(InvalidPathHelper.InvalidPaths))] - public void Constructor_WithInvalidHydraulicBoundaryDatabaseFilePath_ThrowsArgumentException( - string invalidHydraulicBoundaryDatabaseFilePath) + public void Constructor_HlcdFilePathNull_ThrowsArgumentNullException() { - // Setup - string hlcdFilePath = TestHelper.GetScratchPadPath(); - string preProcessorDirectory = TestHelper.GetScratchPadPath(); - // Call - TestDelegate call = () => new HydraRingCalculationSettings(invalidHydraulicBoundaryDatabaseFilePath, - hlcdFilePath, - preProcessorDirectory); + TestDelegate call = () => new HydraRingCalculationSettings(null, + string.Empty); // Assert - Assert.Throws(call); + var exception = Assert.Throws(call); + Assert.AreEqual("hlcdFilePath", exception.ParamName); } [Test] - [TestCaseSource(typeof(InvalidPathHelper), nameof(InvalidPathHelper.InvalidPaths))] - public void Constructor_WithInvalidHydraulicBoundaryLocationsConfigurationsFilePath_ThrowsArgumentException( - string invalidHlcdFilePath) + public void Constructor_PreprocessorDirectoryNull_ThrowsArgumentNullException() { - // Setup - string hydraulicBoundaryLocationsDatabaseFilePath = TestHelper.GetScratchPadPath(); - string preProcessorDirectory = TestHelper.GetScratchPadPath(); - // Call - TestDelegate call = () => new HydraRingCalculationSettings(hydraulicBoundaryLocationsDatabaseFilePath, - invalidHlcdFilePath, - preProcessorDirectory); - - // Assert - Assert.Throws(call); - } - - [Test] - public void Constructor_WithPreprocessorDirectoryNull_ThrowsArgumentNullException() - { - // Setup - string hydraulicBoundaryLocationsDatabaseFilePath = TestHelper.GetScratchPadPath(); - string hlcdFilePath = TestHelper.GetScratchPadPath(); - - // Call - TestDelegate call = () => new HydraRingCalculationSettings(hydraulicBoundaryLocationsDatabaseFilePath, - hlcdFilePath, + TestDelegate call = () => new HydraRingCalculationSettings(string.Empty, null); // Assert @@ -65,18 +35,15 @@ public void Constructor_WithArguments_ExpectedValues() { // Setup - string hydraulicBoundaryDatabaseFilePath = TestHelper.GetScratchPadPath(); - string hlcdFilePath = TestHelper.GetScratchPadPath(); - string preProcessorDirectory = TestHelper.GetScratchPadPath(); + const string hlcdFilePath = "hlcdFilePath"; + const string preProcessorDirectory = "PreprocessorDirectory"; // Call - var settings = new HydraRingCalculationSettings(hydraulicBoundaryDatabaseFilePath, - hlcdFilePath, + var settings = new HydraRingCalculationSettings(hlcdFilePath, preProcessorDirectory); // Assert - Assert.AreEqual(hydraulicBoundaryDatabaseFilePath, settings.HydraulicBoundaryDatabaseFilePath); - Assert.AreEqual(hydraulicBoundaryDatabaseFilePath, settings.HydraulicBoundaryLocationsConfigurationFilePath); + Assert.AreEqual(hlcdFilePath, settings.HlcdFilePath); Assert.AreEqual(preProcessorDirectory, settings.PreprocessorDirectory); } }