Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs =================================================================== diff -u -r4b6e29ab07507a1383536a277e8b450cfa76e780 -r1d3f4583c76e5886ef45b64734f8e408b8c9673f --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs (.../HydraRingCalculatorBase.cs) (revision 4b6e29ab07507a1383536a277e8b450cfa76e780) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs (.../HydraRingCalculatorBase.cs) (revision 1d3f4583c76e5886ef45b64734f8e408b8c9673f) @@ -93,7 +93,7 @@ throw new ArgumentNullException(nameof(calculationSettings)); } - hlcdDirectory = calculationSettings.HydraulicBoundaryLocationsConfigurationFilePath; + hlcdDirectory = calculationSettings.HlcdFilePath; preprocessorDirectory = calculationSettings.PreprocessorDirectory; lastErrorFileParser = new LastErrorFileParser(); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs =================================================================== diff -u -r4b6e29ab07507a1383536a277e8b450cfa76e780 -r1d3f4583c76e5886ef45b64734f8e408b8c9673f --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs (.../HydraRingCalculatorBaseTest.cs) (revision 4b6e29ab07507a1383536a277e8b450cfa76e780) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs (.../HydraRingCalculatorBaseTest.cs) (revision 1d3f4583c76e5886ef45b64734f8e408b8c9673f) @@ -64,7 +64,8 @@ { // Setup var parser = new TestParser(); - var calculator = new TestHydraRingCalculator("", "", parser); + HydraRingCalculationSettings settings = CreateHydraRingCalculationSettings(); + var calculator = new TestHydraRingCalculator(settings, parser); var hydraRingCalculationInput = new TestHydraRingCalculationInput(); hydraRingCalculationInput.PreprocessorSetting = new PreprocessorSetting(1, 2, new NumericsSetting(1, 4, 50, 0.15, 0.05, 0.01, 0.01, 0, 2, 20000, 100000, 0.1, -6, 6)); @@ -93,7 +94,7 @@ { // Setup var parser = new TestParser(); - var calculator = new TestHydraRingCalculator("", "", parser); + var calculator = new TestHydraRingCalculator(CreateHydraRingCalculationSettings(), parser); // Call calculator.PublicCalculate(new TestHydraRingCalculationInput()); @@ -109,7 +110,7 @@ // Setup var parseException = new HydraRingFileParserException("message", new Exception()); var parser = new TestParser(parseException); - var calculator = new TestHydraRingCalculator("", "", parser); + var calculator = new TestHydraRingCalculator(CreateHydraRingCalculationSettings(), parser); // Call TestDelegate test = () => calculator.PublicCalculate(new TestHydraRingCalculationInput()); @@ -134,7 +135,7 @@ "Exception message", new Exception("InnerException")); var parser = new TestParser(supportedException); - var calculator = new TestHydraRingCalculator("", "", parser); + var calculator = new TestHydraRingCalculator(CreateHydraRingCalculationSettings(), parser); // Call TestDelegate test = () => calculator.PublicCalculate(new TestHydraRingCalculationInput()); @@ -152,7 +153,7 @@ public void Calculate_LastErrorFilePresent_LastErrorFileContentSet() { // Setup - var calculator = new TestHydraRingCalculator("", "", new TestParser()); + var calculator = new TestHydraRingCalculator(CreateHydraRingCalculationSettings(), new TestParser()); // Call calculator.PublicCalculate(new TestHydraRingCalculationInput()); @@ -165,7 +166,7 @@ public void Calculate_IllustrationPointsParserThrowsException_SetsIllustrationPointsParserError() { // Setup - var calculator = new TestHydraRingCalculator("", "", new TestParser()); + var calculator = new TestHydraRingCalculator(CreateHydraRingCalculationSettings(), new TestParser()); // Call calculator.PublicCalculate(new TestHydraRingCalculationInput()); @@ -175,6 +176,13 @@ Assert.AreEqual(expectedMessage, calculator.IllustrationPointsParserErrorMessage); Assert.IsNull(calculator.IllustrationPointsResult); } + + private static HydraRingCalculationSettings CreateHydraRingCalculationSettings() + { + var settings = new HydraRingCalculationSettings(string.Empty, + string.Empty); + return settings; + } } internal class TestHydraRingCalculator : HydraRingCalculatorBase @@ -185,7 +193,7 @@ public TestHydraRingCalculator(HydraRingCalculationSettings calculationSettings) : base(calculationSettings) {} - public TestHydraRingCalculator(string hlcdDirectory, string preprocessorDirectory, IHydraRingFileParser parser) : base(hlcdDirectory, preprocessorDirectory) + public TestHydraRingCalculator(HydraRingCalculationSettings calculationSettings, IHydraRingFileParser parser) : base(calculationSettings) { this.parser = parser; }