Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationActivity.cs =================================================================== diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r0784b9559488e13d6ac2f42b9a0a315bcb14d3f4 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationActivity.cs (.../StabilityPointStructuresCalculationActivity.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationActivity.cs (.../StabilityPointStructuresCalculationActivity.cs) (revision 0784b9559488e13d6ac2f42b9a0a315bcb14d3f4) @@ -81,8 +81,7 @@ calculationService.Calculate(calculation, failureMechanism.GeneralInput, - assessmentSection.HydraulicBoundaryDatabase.FilePath, - assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory()); + HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase)); } protected override void OnCancel() Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationActivityFactoryTest.cs =================================================================== diff -u -r3a66b473b9465f0b8b6f33be8e32b2d25e3155df -r0784b9559488e13d6ac2f42b9a0a315bcb14d3f4 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationActivityFactoryTest.cs (.../StabilityPointStructuresCalculationActivityFactoryTest.cs) (revision 3a66b473b9465f0b8b6f33be8e32b2d25e3155df) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationActivityFactoryTest.cs (.../StabilityPointStructuresCalculationActivityFactoryTest.cs) (revision 0784b9559488e13d6ac2f42b9a0a315bcb14d3f4) @@ -33,6 +33,7 @@ using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Service; +using Ringtoets.Common.Service.TestUtil; using Ringtoets.HydraRing.Calculation.Calculator.Factory; using Ringtoets.HydraRing.Calculation.Data.Input; using Ringtoets.HydraRing.Calculation.Data.Input.Structures; @@ -122,7 +123,7 @@ // Assert Assert.IsInstanceOf(activity); - AssertStabilityPointStructuresCalculationActivity(activity, calculation); + AssertStabilityPointStructuresCalculationActivity(activity, calculation, assessmentSection.HydraulicBoundaryDatabase); mocks.VerifyAll(); } @@ -209,8 +210,9 @@ CollectionAssert.AllItemsAreInstancesOfType(activities, typeof(StabilityPointStructuresCalculationActivity)); Assert.AreEqual(2, activities.Count()); - AssertStabilityPointStructuresCalculationActivity(activities.First(), calculation1); - AssertStabilityPointStructuresCalculationActivity(activities.ElementAt(1), calculation2); + HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase; + AssertStabilityPointStructuresCalculationActivity(activities.First(), calculation1, hydraulicBoundaryDatabase); + AssertStabilityPointStructuresCalculationActivity(activities.ElementAt(1), calculation2, hydraulicBoundaryDatabase); mocks.VerifyAll(); } @@ -271,8 +273,9 @@ CollectionAssert.AllItemsAreInstancesOfType(activities, typeof(StabilityPointStructuresCalculationActivity)); Assert.AreEqual(2, activities.Count()); - AssertStabilityPointStructuresCalculationActivity(activities.First(), calculation1); - AssertStabilityPointStructuresCalculationActivity(activities.ElementAt(1), calculation2); + HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase; + AssertStabilityPointStructuresCalculationActivity(activities.First(), calculation1, hydraulicBoundaryDatabase); + AssertStabilityPointStructuresCalculationActivity(activities.ElementAt(1), calculation2, hydraulicBoundaryDatabase); mocks.VerifyAll(); } @@ -289,7 +292,8 @@ } private static void AssertStabilityPointStructuresCalculationActivity(Activity activity, - ICalculation calculation) + ICalculation calculation, + HydraulicBoundaryDatabase hydraulicBoundaryDatabase) { var mocks = new MockRepository(); var testCalculator = new TestStructuresCalculator(); @@ -298,9 +302,9 @@ Arg.Is.NotNull)) .WhenCalled(invocation => { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); + HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( + HydraulicBoundaryCalculationSettingsFactory.CreateSettings(hydraulicBoundaryDatabase), + (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(testCalculator); mocks.ReplayAll(); Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs =================================================================== diff -u -r94aa3f043a2db78b3fabafb0aa4556778eae64bd -r0784b9559488e13d6ac2f42b9a0a315bcb14d3f4 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 94aa3f043a2db78b3fabafb0aa4556778eae64bd) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 0784b9559488e13d6ac2f42b9a0a315bcb14d3f4) @@ -29,6 +29,7 @@ using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.DikeProfiles; +using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Service.Structures; using Ringtoets.Common.Service.TestUtil; @@ -48,7 +49,8 @@ public class StabilityPointStructuresCalculationServiceTest { private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); - private static readonly string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + private static readonly string validHydraulicBoundaryDatabaseFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + private static readonly string validHlcdFilePath = Path.Combine(testDataPath, "Hlcd.sqlite"); private static readonly string validPreprocessorDirectory = TestHelper.GetScratchPadPath(); [Test] @@ -79,7 +81,7 @@ var failureMechanism = new StabilityPointStructuresFailureMechanism(); var mockRepository = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, validFilePath); + IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, validHydraulicBoundaryDatabaseFilePath); mockRepository.ReplayAll(); var calculation = new TestStabilityPointStructuresCalculation @@ -123,7 +125,7 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(new StabilityPointStructuresFailureMechanism(), mockRepository, - validFilePath); + validHydraulicBoundaryDatabaseFilePath); mockRepository.ReplayAll(); var calculation = new TestStabilityPointStructuresCalculation @@ -202,7 +204,7 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(new StabilityPointStructuresFailureMechanism(), mockRepository, - validFilePath); + validHydraulicBoundaryDatabaseFilePath); mockRepository.ReplayAll(); var calculation = new TestStabilityPointStructuresCalculation @@ -281,7 +283,7 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(new StabilityPointStructuresFailureMechanism(), mockRepository, - validFilePath); + validHydraulicBoundaryDatabaseFilePath); mockRepository.ReplayAll(); var calculation = new TestStabilityPointStructuresCalculation @@ -362,7 +364,7 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(new StabilityPointStructuresFailureMechanism(), mockRepository, - validFilePath); + validHydraulicBoundaryDatabaseFilePath); mockRepository.ReplayAll(); var calculation = new TestStabilityPointStructuresCalculation @@ -440,7 +442,7 @@ var failureMechanism = new StabilityPointStructuresFailureMechanism(); var mockRepository = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, validFilePath); + IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, validHydraulicBoundaryDatabaseFilePath); mockRepository.ReplayAll(); var calculation = new TestStabilityPointStructuresCalculation @@ -471,7 +473,7 @@ var failureMechanism = new StabilityPointStructuresFailureMechanism(); var mockRepository = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, validFilePath); + IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, validHydraulicBoundaryDatabaseFilePath); mockRepository.ReplayAll(); var calculation = new TestStabilityPointStructuresCalculation @@ -519,8 +521,7 @@ // Call TestDelegate call = () => service.Calculate(calculation, failureMechanism.GeneralInput, - validFilePath, - validPreprocessorDirectory); + CreateCalculationSettings()); // Assert const string expectedMessage = "The value of argument 'structureInput' (100) is invalid for Enum type 'StabilityPointStructureInflowModelType'."; @@ -560,8 +561,7 @@ // Call TestDelegate call = () => service.Calculate(calculation, failureMechanism.GeneralInput, - validFilePath, - validPreprocessorDirectory); + CreateCalculationSettings()); // Assert const string expectedMessage = "The value of argument 'structureInput' (100) is invalid for Enum type 'LoadSchematizationType'."; @@ -586,14 +586,8 @@ var calculator = new TestStructuresCalculator(); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateStructuresCalculator( - Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.AreEqual(validPreprocessorDirectory, settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateStructuresCalculator(null)) + .IgnoreArguments() .Return(calculator); mockRepository.ReplayAll(); @@ -617,8 +611,7 @@ // Call new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - validFilePath, - validPreprocessorDirectory); + CreateCalculationSettings()); // Assert StructuresStabilityPointCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); @@ -711,14 +704,8 @@ var calculator = new TestStructuresCalculator(); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateStructuresCalculator( - Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.AreEqual(validPreprocessorDirectory, settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateStructuresCalculator(null)) + .IgnoreArguments() .Return(calculator); mockRepository.ReplayAll(); @@ -744,8 +731,7 @@ // Call new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - validFilePath, - validPreprocessorDirectory); + CreateCalculationSettings()); // Assert StructuresStabilityPointCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); @@ -837,14 +823,8 @@ var calculator = new TestStructuresCalculator(); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateStructuresCalculator( - Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.AreEqual(validPreprocessorDirectory, settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateStructuresCalculator(null)) + .IgnoreArguments() .Return(calculator); mockRepository.ReplayAll(); @@ -868,8 +848,7 @@ // Call new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - validFilePath, - validPreprocessorDirectory); + CreateCalculationSettings()); // Assert StructuresStabilityPointCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); @@ -962,14 +941,8 @@ var calculator = new TestStructuresCalculator(); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateStructuresCalculator( - Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.AreEqual(validPreprocessorDirectory, settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateStructuresCalculator(null)) + .IgnoreArguments() .Return(calculator); mockRepository.ReplayAll(); @@ -995,8 +968,7 @@ // Call new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - validFilePath, - validPreprocessorDirectory); + CreateCalculationSettings()); // Assert StructuresStabilityPointCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); @@ -1088,14 +1060,8 @@ var calculator = new TestStructuresCalculator(); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateStructuresCalculator( - Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.AreEqual(validPreprocessorDirectory, settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateStructuresCalculator(null)) + .IgnoreArguments() .Return(calculator); mockRepository.ReplayAll(); @@ -1119,8 +1085,7 @@ // Call new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - validFilePath, - validPreprocessorDirectory); + CreateCalculationSettings()); // Assert StructuresStabilityPointCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); @@ -1215,14 +1180,8 @@ var calculator = new TestStructuresCalculator(); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateStructuresCalculator( - Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.AreEqual(validPreprocessorDirectory, settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateStructuresCalculator(null)) + .IgnoreArguments() .Return(calculator); mockRepository.ReplayAll(); @@ -1248,8 +1207,7 @@ // Call new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - validFilePath, - validPreprocessorDirectory); + CreateCalculationSettings()); // Assert StructuresStabilityPointCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); @@ -1343,14 +1301,8 @@ var calculator = new TestStructuresCalculator(); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateStructuresCalculator( - Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.AreEqual(validPreprocessorDirectory, settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateStructuresCalculator(null)) + .IgnoreArguments() .Return(calculator); mockRepository.ReplayAll(); @@ -1374,8 +1326,7 @@ // Call new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - validFilePath, - validPreprocessorDirectory); + CreateCalculationSettings()); // Assert StructuresStabilityPointCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); @@ -1470,14 +1421,8 @@ var calculator = new TestStructuresCalculator(); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateStructuresCalculator( - Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.AreEqual(validPreprocessorDirectory, settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateStructuresCalculator(null)) + .IgnoreArguments() .Return(calculator); mockRepository.ReplayAll(); @@ -1503,8 +1448,7 @@ // Call new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - validFilePath, - validPreprocessorDirectory); + CreateCalculationSettings()); // Assert StructuresStabilityPointCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); @@ -1586,13 +1530,17 @@ } [Test] - [Combinatorial] - public void Calculate_PreprocessorDirectorySet_InputPropertiesCorrectlySentToCalculator([Values(true, false)] bool usePreprocessor) + [TestCase(true)] + [TestCase(false)] + public void Calculate_PreprocessorDirectorySet_InputPropertiesCorrectlySentToCalculator(bool usePreprocessor) { // Setup string preprocessorDirectory = usePreprocessor ? validPreprocessorDirectory : string.Empty; + var calculationSettings = new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath, + validHlcdFilePath, + preprocessorDirectory); var failureMechanism = new StabilityPointStructuresFailureMechanism(); @@ -1605,9 +1553,8 @@ Arg.Is.NotNull)) .WhenCalled(invocation => { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.AreEqual(preprocessorDirectory, settings.PreprocessorDirectory); + HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( + calculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(calculator); mockRepository.ReplayAll(); @@ -1625,8 +1572,7 @@ // Call new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - validFilePath, - preprocessorDirectory); + calculationSettings); // Assert StructuresStabilityPointCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); @@ -1656,14 +1602,8 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateStructuresCalculator( - Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.AreEqual(validPreprocessorDirectory, settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateStructuresCalculator(null)) + .IgnoreArguments() .Return(new TestStructuresCalculator()); mockRepository.ReplayAll(); @@ -1700,8 +1640,7 @@ { Action call = () => new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - validFilePath, - validPreprocessorDirectory); + CreateCalculationSettings()); // Assert TestHelper.AssertLogMessages(call, messages => @@ -1733,14 +1672,8 @@ EndInFailure = true }; var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateStructuresCalculator( - Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.AreEqual(validPreprocessorDirectory, settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateStructuresCalculator(null)) + .IgnoreArguments() .Return(calculator); mockRepository.ReplayAll(); @@ -1764,8 +1697,7 @@ { new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - validFilePath, - validPreprocessorDirectory); + CreateCalculationSettings()); } catch (HydraRingCalculationException) { @@ -1803,14 +1735,8 @@ EndInFailure = true }; var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateStructuresCalculator( - Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.AreEqual(validPreprocessorDirectory, settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateStructuresCalculator(null)) + .IgnoreArguments() .Return(calculator); mockRepository.ReplayAll(); @@ -1834,8 +1760,7 @@ { new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - validFilePath, - validPreprocessorDirectory); + CreateCalculationSettings()); } catch (HydraRingCalculationException) { @@ -1873,14 +1798,8 @@ LastErrorFileContent = "An error occurred" }; var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateStructuresCalculator( - Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.AreEqual(validPreprocessorDirectory, settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateStructuresCalculator(null)) + .IgnoreArguments() .Return(calculator); mockRepository.ReplayAll(); @@ -1905,8 +1824,7 @@ { new StabilityPointStructuresCalculationService().Calculate(calculation, failureMechanism.GeneralInput, - validFilePath, - validPreprocessorDirectory); + CreateCalculationSettings()); } catch (HydraRingCalculationException e) { @@ -1932,6 +1850,13 @@ mockRepository.VerifyAll(); } + private static HydraulicBoundaryCalculationSettings CreateCalculationSettings() + { + return new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath, + validHlcdFilePath, + string.Empty); + } + /// /// Sets all input parameters of to invalid values. ///