Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationActivity.cs =================================================================== diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -rc298d6cd499a20bc2e22f1221d537575a5f3ea76 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationActivity.cs (.../GrassCoverErosionInwardsCalculationActivity.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationActivity.cs (.../GrassCoverErosionInwardsCalculationActivity.cs) (revision c298d6cd499a20bc2e22f1221d537575a5f3ea76) @@ -82,8 +82,7 @@ calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - assessmentSection.HydraulicBoundaryDatabase.FilePath); + failureMechanism.Contribution); } protected override void OnCancel() Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs =================================================================== diff -u -r1c75bed5924869f10b491f7f5562c74496d8f96a -rc298d6cd499a20bc2e22f1221d537575a5f3ea76 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 1c75bed5924869f10b491f7f5562c74496d8f96a) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision c298d6cd499a20bc2e22f1221d537575a5f3ea76) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2018. All rights reserved. +// Copyright (C) Stichting Deltares 2018. All rights reserved. // // This file is part of Ringtoets. // @@ -118,7 +118,6 @@ /// The that holds information about the norm used in the calculation. /// Calculation input parameters that apply to all instances. /// The amount of contribution for this failure mechanism in the assessment section. - /// The path which points to the hydraulic boundary database file. /// Thrown when one of the following parameters is null: /// /// @@ -127,7 +126,7 @@ /// /// Thrown when: /// - /// The contains invalid characters. + /// The hydraulic boundary database file path contains invalid characters. /// The contribution of the failure mechanism is zero. /// The target probability or the calculated probability of a dike height calculation falls outside /// the [0.0, 1.0] range and is not . @@ -137,7 +136,7 @@ /// /// Thrown when: /// - /// No settings database file could be found at the location of + /// No settings database file could be found at the location of the hydraulic boundary database file path /// with the same name. /// Unable to open settings database file. /// Unable to read required data from database file. @@ -157,8 +156,7 @@ internal void Calculate(GrassCoverErosionInwardsCalculation calculation, IAssessmentSection assessmentSection, GeneralGrassCoverErosionInwardsInput generalInput, - double failureMechanismContribution, - string hydraulicBoundaryDatabaseFilePath) + double failureMechanismContribution) { if (calculation == null) { @@ -175,16 +173,16 @@ throw new ArgumentNullException(nameof(generalInput)); } - string effectivePreprocessorDirectory = assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(); - bool usePreprocessor = !string.IsNullOrEmpty(effectivePreprocessorDirectory); - + HydraulicBoundaryCalculationSettings calculationSettings = + HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase); int numberOfCalculators = CreateCalculators(calculation, assessmentSection, generalInput, failureMechanismContribution, - Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath), - effectivePreprocessorDirectory); + calculationSettings); + string hydraulicBoundaryDatabaseFilePath = calculationSettings.HydraulicBoundaryDatabaseFilePath; + bool usePreprocessor = !string.IsNullOrEmpty(calculationSettings.PreprocessorDirectory); CalculationServiceHelper.LogCalculationBegin(); try @@ -244,13 +242,13 @@ IAssessmentSection assessmentSection, GeneralGrassCoverErosionInwardsInput generalInput, double failureMechanismContribution, - string hlcdDirectory, - string preprocessorDirectory) + HydraulicBoundaryCalculationSettings calculationSettings) { var numberOfCalculators = 1; - var settings = new HydraRingCalculationSettings(hlcdDirectory, preprocessorDirectory); - overtoppingCalculator = HydraRingCalculatorFactory.Instance.CreateOvertoppingCalculator(settings); + HydraRingCalculationSettings hydraRingCalculationSettings = HydraRingCalculationSettingsFactory.CreateSettings(calculationSettings); + overtoppingCalculator = HydraRingCalculatorFactory.Instance.CreateOvertoppingCalculator( + hydraRingCalculationSettings); bool dikeHeightNormValid = TargetProbabilityCalculationServiceHelper.ValidateTargetProbability( GetNormForDikeHeight(calculation.InputParameters, @@ -260,7 +258,7 @@ if (calculation.InputParameters.DikeHeightCalculationType != DikeHeightCalculationType.NoCalculation && dikeHeightNormValid) { - dikeHeightCalculator = HydraRingCalculatorFactory.Instance.CreateDikeHeightCalculator(settings); + dikeHeightCalculator = HydraRingCalculatorFactory.Instance.CreateDikeHeightCalculator(hydraRingCalculationSettings); numberOfCalculators++; } @@ -271,8 +269,8 @@ failureMechanismContribution), lm => {}); if (calculation.InputParameters.OvertoppingRateCalculationType != OvertoppingRateCalculationType.NoCalculation && overtoppingRateNormValid) - { - overtoppingRateCalculator = HydraRingCalculatorFactory.Instance.CreateOvertoppingRateCalculator(settings); + { + overtoppingRateCalculator = HydraRingCalculatorFactory.Instance.CreateOvertoppingRateCalculator(hydraRingCalculationSettings); numberOfCalculators++; } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationActivityFactoryTest.cs =================================================================== diff -u -rdb71b309ed4ce429385a3ce6e8fb0a357f4e9135 -rc298d6cd499a20bc2e22f1221d537575a5f3ea76 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationActivityFactoryTest.cs (.../GrassCoverErosionInwardsCalculationActivityFactoryTest.cs) (revision db71b309ed4ce429385a3ce6e8fb0a357f4e9135) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationActivityFactoryTest.cs (.../GrassCoverErosionInwardsCalculationActivityFactoryTest.cs) (revision c298d6cd499a20bc2e22f1221d537575a5f3ea76) @@ -34,6 +34,7 @@ using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Service; +using Ringtoets.Common.Service.TestUtil; using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.HydraRing.Calculation.Calculator.Factory; using Ringtoets.HydraRing.Calculation.Data.Input; @@ -122,7 +123,7 @@ // Assert Assert.IsInstanceOf(activity); - AssertGrassCoverErosionInwardsCalculationActivity(activity, calculation); + AssertGrassCoverErosionInwardsCalculationActivity(activity, calculation, assessmentSection.HydraulicBoundaryDatabase); mocks.VerifyAll(); } @@ -210,8 +211,9 @@ CollectionAssert.AllItemsAreInstancesOfType(activities, typeof(GrassCoverErosionInwardsCalculationActivity)); Assert.AreEqual(2, activities.Count()); - AssertGrassCoverErosionInwardsCalculationActivity(activities.First(), calculation1); - AssertGrassCoverErosionInwardsCalculationActivity(activities.ElementAt(1), calculation2); + HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase; + AssertGrassCoverErosionInwardsCalculationActivity(activities.First(), calculation1, hydraulicBoundaryDatabase); + AssertGrassCoverErosionInwardsCalculationActivity(activities.ElementAt(1), calculation2, hydraulicBoundaryDatabase); mocks.VerifyAll(); } @@ -273,8 +275,9 @@ CollectionAssert.AllItemsAreInstancesOfType(activities, typeof(GrassCoverErosionInwardsCalculationActivity)); Assert.AreEqual(2, activities.Count()); - AssertGrassCoverErosionInwardsCalculationActivity(activities.First(), calculation1); - AssertGrassCoverErosionInwardsCalculationActivity(activities.ElementAt(1), calculation2); + HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase; + AssertGrassCoverErosionInwardsCalculationActivity(activities.First(), calculation1, hydraulicBoundaryDatabase); + AssertGrassCoverErosionInwardsCalculationActivity(activities.ElementAt(1), calculation2, hydraulicBoundaryDatabase); mocks.VerifyAll(); } @@ -298,17 +301,18 @@ } private static void AssertGrassCoverErosionInwardsCalculationActivity(Activity activity, - GrassCoverErosionInwardsCalculation calculation) + GrassCoverErosionInwardsCalculation calculation, + HydraulicBoundaryDatabase hydraulicBoundaryDatabase) { var mocks = new MockRepository(); var testCalculator = new TestOvertoppingCalculator(); var calculatorFactory = mocks.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(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/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs =================================================================== diff -u -rdb71b309ed4ce429385a3ce6e8fb0a357f4e9135 -rc298d6cd499a20bc2e22f1221d537575a5f3ea76 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs (.../GrassCoverErosionInwardsCalculationServiceTest.cs) (revision db71b309ed4ce429385a3ce6e8fb0a357f4e9135) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs (.../GrassCoverErosionInwardsCalculationServiceTest.cs) (revision c298d6cd499a20bc2e22f1221d537575a5f3ea76) @@ -49,7 +49,6 @@ { 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 validPreprocessorDirectory = TestHelper.GetScratchPadPath(); [Test] public void Validate_NoHydraulicBoundaryLocation_LogsMessageAndReturnFalse() @@ -706,8 +705,7 @@ TestDelegate test = () => new GrassCoverErosionInwardsCalculationService().Calculate(null, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - string.Empty); + failureMechanism.Contribution); // Assert var exception = Assert.Throws(test); @@ -726,8 +724,7 @@ TestDelegate test = () => new GrassCoverErosionInwardsCalculationService().Calculate(calculation, null, failureMechanism.GeneralInput, - failureMechanism.Contribution, - string.Empty); + failureMechanism.Contribution); // Assert var exception = Assert.Throws(test); @@ -749,8 +746,7 @@ TestDelegate test = () => new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, null, - failureMechanism.Contribution, - string.Empty); + failureMechanism.Contribution); // Assert var exception = Assert.Throws(test); @@ -775,13 +771,17 @@ GrassCoverErosionInwardsFailureMechanism failureMechanism = CreateGrassCoverErosionInwardsFailureMechanism(); var mockRepository = new MockRepository(); + IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, + mockRepository, + validFilePath); + HydraulicBoundaryCalculationSettings calculationSettings = HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase); + var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) .WhenCalled(invocation => { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); + HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( + calculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(new TestOvertoppingCalculator { @@ -790,27 +790,22 @@ calculatorFactory.Stub(cf => cf.CreateDikeHeightCalculator(Arg.Is.NotNull)) .WhenCalled(invocation => { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); + HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( + calculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); }).Return(new TestHydraulicLoadsCalculator { IllustrationPointsResult = new TestGeneralResult() }); calculatorFactory.Stub(cf => cf.CreateOvertoppingRateCalculator(Arg.Is.NotNull)) .WhenCalled(invocation => { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); + HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( + calculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(new TestHydraulicLoadsCalculator { IllustrationPointsResult = new TestGeneralResult() }); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, - mockRepository, - validFilePath); mockRepository.ReplayAll(); DikeProfile dikeProfile = GetDikeProfile(); @@ -836,8 +831,7 @@ new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); } // Assert @@ -908,21 +902,11 @@ }; var overtoppingCalculator = new TestOvertoppingCalculator(); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(null)) + .IgnoreArguments() .Return(dikeHeightCalculator); mockRepository.ReplayAll(); @@ -946,8 +930,7 @@ new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); } }; @@ -995,21 +978,11 @@ }; var overtoppingCalculator = new TestOvertoppingCalculator(); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); - calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(null)) + .IgnoreArguments() .Return(overtoppingRateCalculator); mockRepository.ReplayAll(); @@ -1033,8 +1006,7 @@ new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); } }; @@ -1076,13 +1048,8 @@ validFilePath); var overtoppingCalculator = new TestOvertoppingCalculator(); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); mockRepository.ReplayAll(); @@ -1105,8 +1072,7 @@ service.Calculate(calculation, assessmentSection, grassCoverErosionInwardsFailureMechanism.GeneralInput, - grassCoverErosionInwardsFailureMechanism.Contribution, - validFilePath); + grassCoverErosionInwardsFailureMechanism.Contribution); // Assert Assert.IsTrue(overtoppingCalculator.IsCanceled); @@ -1131,22 +1097,12 @@ validFilePath); var overtoppingCalculator = new TestOvertoppingCalculator(); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); var dikeHeightCalculator = new TestHydraulicLoadsCalculator(); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(null)) + .IgnoreArguments() .Return(dikeHeightCalculator); mockRepository.ReplayAll(); @@ -1178,8 +1134,7 @@ service.Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); // Assert Assert.IsNull(calculation.Output); @@ -1206,29 +1161,14 @@ var overtoppingCalculator = new TestOvertoppingCalculator(); var overtoppingRateCalculator = new TestHydraulicLoadsCalculator(); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(null)) + .IgnoreArguments() .Return(new TestHydraulicLoadsCalculator()); - calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(null)) + .IgnoreArguments() .Return(overtoppingRateCalculator); mockRepository.ReplayAll(); @@ -1260,8 +1200,7 @@ service.Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); // Assert Assert.IsNull(calculation.Output); @@ -1286,13 +1225,8 @@ EndInFailure = true }; var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); mockRepository.ReplayAll(); @@ -1319,8 +1253,7 @@ new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); } catch (HydraRingCalculationException) { @@ -1365,13 +1298,8 @@ EndInFailure = true }; var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); mockRepository.ReplayAll(); @@ -1398,8 +1326,7 @@ new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); } catch (HydraRingCalculationException) { @@ -1445,13 +1372,8 @@ EndInFailure = false }; var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); mockRepository.ReplayAll(); @@ -1478,8 +1400,7 @@ new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); } catch (HydraRingCalculationException e) { @@ -1529,21 +1450,11 @@ }; var overtoppingCalculator = new TestOvertoppingCalculator(); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(null)) + .IgnoreArguments() .Return(dikeHeightCalculator); mockRepository.ReplayAll(); @@ -1567,8 +1478,7 @@ new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); }; // Assert @@ -1614,21 +1524,11 @@ }; var overtoppingCalculator = new TestOvertoppingCalculator(); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(null)) + .IgnoreArguments() .Return(dikeHeightCalculator); mockRepository.ReplayAll(); @@ -1652,8 +1552,7 @@ new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); }; // Assert @@ -1700,21 +1599,11 @@ }; var calculatorFactory = mockRepository.StrictMock(); var overtoppingCalculator = new TestOvertoppingCalculator(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(null)) + .IgnoreArguments() .Return(dikeHeightCalculator); mockRepository.ReplayAll(); @@ -1738,8 +1627,7 @@ new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); }; // Assert @@ -1787,29 +1675,15 @@ var overtoppingCalculator = new TestOvertoppingCalculator(); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(null)) + .IgnoreArguments() .Return(new TestHydraulicLoadsCalculator()); - calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }).Return(overtoppingRateCalculator); + calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(null)) + .IgnoreArguments() + .Return(overtoppingRateCalculator); mockRepository.ReplayAll(); DikeProfile dikeProfile = GetDikeProfile(); @@ -1832,8 +1706,7 @@ new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); }; // Assert @@ -1879,29 +1752,14 @@ }; var overtoppingCalculator = new TestOvertoppingCalculator(); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(null)) + .IgnoreArguments() .Return(new TestHydraulicLoadsCalculator()); - calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(null)) + .IgnoreArguments() .Return(overtoppingRateCalculator); mockRepository.ReplayAll(); @@ -1925,8 +1783,7 @@ new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); }; // Assert @@ -1968,26 +1825,16 @@ validFilePath); var calculatorFactory = mockRepository.StrictMock(); var overtoppingCalculator = new TestOvertoppingCalculator(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); var overtoppingRateCalculator = new TestHydraulicLoadsCalculator { EndInFailure = false, LastErrorFileContent = "An error occurred" }; - calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(null)) + .IgnoreArguments() .Return(overtoppingRateCalculator); mockRepository.ReplayAll(); @@ -2011,8 +1858,7 @@ new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); }; // Assert @@ -2064,29 +1910,14 @@ IllustrationPointsResult = new TestGeneralResult() }; var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(null)) + .IgnoreArguments() .Return(dikeHeightCalculator); - calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(null)) + .IgnoreArguments() .Return(overtoppingRateCalculator); mockRepository.ReplayAll(); @@ -2099,8 +1930,7 @@ Action call = () => new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); // Assert TestHelper.AssertLogMessages(call, messages => @@ -2167,29 +1997,14 @@ IllustrationPointsResult = new TestGeneralResult() }; var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(null)) + .IgnoreArguments() .Return(dikeHeightCalculator); - calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(null)) + .IgnoreArguments() .Return(overtoppingRateCalculator); mockRepository.ReplayAll(); @@ -2203,8 +2018,7 @@ Action call = () => new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); // Assert TestHelper.AssertLogMessages(call, messages => @@ -2270,29 +2084,14 @@ IllustrationPointsParserErrorMessage = parserError }; var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(null)) + .IgnoreArguments() .Return(dikeHeightCalculator); - calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(null)) + .IgnoreArguments() .Return(overtoppingRateCalculator); mockRepository.ReplayAll(); @@ -2305,8 +2104,7 @@ Action call = () => new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); // Assert TestHelper.AssertLogMessages(call, messages => @@ -2373,29 +2171,14 @@ IllustrationPointsParserErrorMessage = parserError }; var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(null)) + .IgnoreArguments() .Return(dikeHeightCalculator); - calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(null)) + .IgnoreArguments() .Return(overtoppingRateCalculator); mockRepository.ReplayAll(); @@ -2409,8 +2192,7 @@ Action call = () => new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); // Assert TestHelper.AssertLogMessages(call, messages => @@ -2476,29 +2258,14 @@ IllustrationPointsResult = new TestGeneralResult() }; var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(null)) + .IgnoreArguments() .Return(dikeHeightCalculator); - calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(null)) + .IgnoreArguments() .Return(overtoppingRateCalculator); mockRepository.ReplayAll(); @@ -2511,8 +2278,7 @@ Action call = () => new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); // Assert TestHelper.AssertLogMessages(call, messages => @@ -2579,29 +2345,14 @@ IllustrationPointsResult = new TestGeneralResult() }; var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(null)) + .IgnoreArguments() .Return(dikeHeightCalculator); - calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(null)) + .IgnoreArguments() .Return(overtoppingRateCalculator); mockRepository.ReplayAll(); @@ -2615,8 +2366,7 @@ Action call = () => new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); // Assert TestHelper.AssertLogMessages(call, messages => @@ -2681,29 +2431,14 @@ IllustrationPointsResult = new TestGeneralResult() }; var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(null)) + .IgnoreArguments() .Return(dikeHeightCalculator); calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + .IgnoreArguments() .Return(overtoppingRateCalculator); mockRepository.ReplayAll(); @@ -2715,8 +2450,7 @@ Action call = () => new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); // Assert TestHelper.AssertLogMessagesWithLevelAndLoggedExceptions(call, messages => @@ -2785,29 +2519,14 @@ IllustrationPointsResult = new TestGeneralResult() }; var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(null)) + .IgnoreArguments() .Return(dikeHeightCalculator); - calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(null)) + .IgnoreArguments() .Return(overtoppingRateCalculator); mockRepository.ReplayAll(); @@ -2819,8 +2538,7 @@ Action call = () => new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); // Assert TestHelper.AssertLogMessagesWithLevelAndLoggedExceptions(call, messages => @@ -2891,29 +2609,14 @@ IllustrationPointsResult = TestGeneralResult.CreateGeneralResultWithSubMechanismIllustrationPoints() }; var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(null)) + .IgnoreArguments() .Return(dikeHeightCalculator); - calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(null)) + .IgnoreArguments() .Return(overtoppingRateCalculator); mockRepository.ReplayAll(); @@ -2925,8 +2628,7 @@ Action call = () => new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); // Assert TestHelper.AssertLogMessagesWithLevelAndLoggedExceptions(call, messages => @@ -2995,29 +2697,14 @@ IllustrationPointsResult = GeneralResultTestFactory.CreateGeneralResultWithDuplicateStochasts() }; var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(null)) + .IgnoreArguments() .Return(dikeHeightCalculator); - calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(null)) + .IgnoreArguments() .Return(overtoppingRateCalculator); mockRepository.ReplayAll(); @@ -3029,8 +2716,7 @@ Action call = () => new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); // Assert TestHelper.AssertLogMessagesWithLevelAndLoggedExceptions(call, messages => @@ -3101,29 +2787,14 @@ IllustrationPointsResult = new TestGeneralResult() }; var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(null)) + .IgnoreArguments() .Return(dikeHeightCalculator); - calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(null)) + .IgnoreArguments() .Return(overtoppingRateCalculator); mockRepository.ReplayAll(); @@ -3135,8 +2806,7 @@ Action call = () => new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); // Assert TestHelper.AssertLogMessagesWithLevelAndLoggedExceptions(call, messages => @@ -3205,29 +2875,14 @@ IllustrationPointsResult = new TestGeneralResult() }; var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); - calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(null)) + .IgnoreArguments() .Return(dikeHeightCalculator); - calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(null)) + .IgnoreArguments() .Return(overtoppingRateCalculator); mockRepository.ReplayAll(); @@ -3239,8 +2894,7 @@ Action call = () => new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); // Assert TestHelper.AssertLogMessagesWithLevelAndLoggedExceptions(call, messages => @@ -3298,32 +2952,31 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, validFilePath); + HydraulicBoundaryCalculationSettings calculationSettings = HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase); + var overtoppingCalculator = new TestOvertoppingCalculator(); var dikeHeightCalculator = new TestHydraulicLoadsCalculator(); var overtoppingRateCalculator = new TestHydraulicLoadsCalculator(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) .WhenCalled(invocation => { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); + HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( + calculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(overtoppingCalculator); calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(Arg.Is.NotNull)) .WhenCalled(invocation => { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); + HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( + calculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(dikeHeightCalculator); calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(Arg.Is.NotNull)) .WhenCalled(invocation => { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); + HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( + calculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(overtoppingRateCalculator); @@ -3346,8 +2999,7 @@ new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); } // Assert @@ -3364,39 +3016,37 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, validFilePath); + assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true; + assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = true; + assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = TestHelper.GetScratchPadPath(); + + HydraulicBoundaryCalculationSettings calculationSettings = HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase); + var overtoppingCalculator = new TestOvertoppingCalculator(); var dikeHeightCalculator = new TestHydraulicLoadsCalculator(); var overtoppingRateCalculator = new TestHydraulicLoadsCalculator(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) .WhenCalled(invocation => { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.AreEqual(validPreprocessorDirectory, settings.PreprocessorDirectory); + HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( + calculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(overtoppingCalculator); calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(Arg.Is.NotNull)) .WhenCalled(invocation => { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.AreEqual(validPreprocessorDirectory, settings.PreprocessorDirectory); + HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( + calculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(dikeHeightCalculator); calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(Arg.Is.NotNull)) .WhenCalled(invocation => { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.AreEqual(validPreprocessorDirectory, settings.PreprocessorDirectory); + HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( + calculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(overtoppingRateCalculator); - - assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true; - assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = true; - assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = validPreprocessorDirectory; - mockRepository.ReplayAll(); var calculation = new GrassCoverErosionInwardsCalculation @@ -3416,8 +3066,7 @@ new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); } // Assert @@ -3434,40 +3083,38 @@ GrassCoverErosionInwardsFailureMechanism failureMechanism = CreateGrassCoverErosionInwardsFailureMechanism(); var mockRepository = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); + IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository, validFilePath); + assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true; + assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = false; + assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = "NonExistingPreprocessorDirectory"; + + HydraulicBoundaryCalculationSettings calculationSettings = HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase); + var overtoppingCalculator = new TestOvertoppingCalculator(); var dikeHeightCalculator = new TestHydraulicLoadsCalculator(); var overtoppingRateCalculator = new TestHydraulicLoadsCalculator(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) .WhenCalled(invocation => { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); + HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( + calculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(overtoppingCalculator); calculatorFactory.Expect(cf => cf.CreateDikeHeightCalculator(Arg.Is.NotNull)) .WhenCalled(invocation => { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); + HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( + calculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(dikeHeightCalculator); calculatorFactory.Expect(cf => cf.CreateOvertoppingRateCalculator(Arg.Is.NotNull)) .WhenCalled(invocation => { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); + HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings( + calculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]); }) .Return(overtoppingRateCalculator); - - assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true; - assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = false; - assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = "NonExistingPreprocessorDirectory"; - mockRepository.ReplayAll(); var calculation = new GrassCoverErosionInwardsCalculation @@ -3487,8 +3134,7 @@ new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSection, failureMechanism.GeneralInput, - failureMechanism.Contribution, - validFilePath); + failureMechanism.Contribution); } // Assert @@ -3510,13 +3156,8 @@ validFilePath); var overtoppingCalculator = new TestOvertoppingCalculator(); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); mockRepository.ReplayAll(); @@ -3538,8 +3179,7 @@ service.Calculate(calculation, assessmentSection, grassCoverErosionInwardsFailureMechanism.GeneralInput, - grassCoverErosionInwardsFailureMechanism.Contribution, - validFilePath); + grassCoverErosionInwardsFailureMechanism.Contribution); // Assert Assert.IsNull(calculation.Output.DikeHeightOutput); @@ -3558,13 +3198,8 @@ validFilePath); var overtoppingCalculator = new TestOvertoppingCalculator(); var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(Arg.Is.NotNull)) - .WhenCalled(invocation => - { - var settings = (HydraRingCalculationSettings) invocation.Arguments[0]; - Assert.AreEqual(testDataPath, settings.HlcdFilePath); - Assert.IsEmpty(settings.PreprocessorDirectory); - }) + calculatorFactory.Expect(cf => cf.CreateOvertoppingCalculator(null)) + .IgnoreArguments() .Return(overtoppingCalculator); mockRepository.ReplayAll(); @@ -3586,8 +3221,7 @@ service.Calculate(calculation, assessmentSection, grassCoverErosionInwardsFailureMechanism.GeneralInput, - grassCoverErosionInwardsFailureMechanism.Contribution, - validFilePath); + grassCoverErosionInwardsFailureMechanism.Contribution); // Assert Assert.IsNull(calculation.Output.OvertoppingRateOutput);