Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r4a876bc30ca9373e8e2fa4f1f7d3e0553d4115a2
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs) (revision 4a876bc30ca9373e8e2fa4f1f7d3e0553d4115a2)
@@ -85,7 +85,7 @@
GrassCoverErosionOutwardsDataSynchronizationService.ClearWaveConditionsCalculationOutput(calculation);
calculationService.Calculate(
- calculation, failureMechanism, assessmentSection, assessmentSection.HydraulicBoundaryDatabase.FilePath);
+ calculation, failureMechanism, assessmentSection);
}
protected override void OnCancel()
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r4a876bc30ca9373e8e2fa4f1f7d3e0553d4115a2
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs) (revision 4a876bc30ca9373e8e2fa4f1f7d3e0553d4115a2)
@@ -46,20 +46,19 @@
/// Error and status information is logged during the execution of the operation.
///
/// The that holds all the information required to perform the calculation.
- /// The that holds information about the norm used in the calculation.
/// The grass cover erosion outwards failure mechanism, which contains general parameters that apply to all
/// instances.
- /// The path of the HLCD file that should be used for performing the calculation.
+ /// The that holds information about the norm used in the calculation.
/// Thrown when ,
/// or is null.
/// Thrown when:
///
- /// - contains invalid characters.
+ /// - the hydraulic boundary database file path contains invalid characters.
/// - has no (0) contribution.
///
/// 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.
@@ -71,8 +70,7 @@
/// Thrown when an error occurs during the calculation.
public void Calculate(GrassCoverErosionOutwardsWaveConditionsCalculation calculation,
GrassCoverErosionOutwardsFailureMechanism failureMechanism,
- IAssessmentSection assessmentSection,
- string hlcdFilePath)
+ IAssessmentSection assessmentSection)
{
if (calculation == null)
{
@@ -96,8 +94,6 @@
RoundedDouble c = failureMechanism.GeneralInput.GeneralWaveConditionsInput.C;
double norm = failureMechanism.GetNorm(assessmentSection, calculation.InputParameters.CategoryType);
- string preprocessorDirectory = assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory();
-
RoundedDouble assessmentLevel = failureMechanism.GetAssessmentLevel(assessmentSection,
calculation.InputParameters.HydraulicBoundaryLocation,
calculation.InputParameters.CategoryType);
@@ -112,8 +108,7 @@
b,
c,
norm,
- hlcdFilePath,
- preprocessorDirectory);
+ assessmentSection.HydraulicBoundaryDatabase);
if (!Canceled)
{
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs
===================================================================
diff -u -r3c851a1c7bae12523ca12e22d63dd9950bbe163f -r4a876bc30ca9373e8e2fa4f1f7d3e0553d4115a2
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs (.../GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs) (revision 3c851a1c7bae12523ca12e22d63dd9950bbe163f)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs (.../GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs) (revision 4a876bc30ca9373e8e2fa4f1f7d3e0553d4115a2)
@@ -150,7 +150,7 @@
AssertWaveHeightCalculationActivity(activities.ElementAt(5),
hydraulicBoundaryLocation,
mechanismSpecificFactorizedSignalingNorm,
- "Iv",
+ "Iv",
hydraulicBoundaryDatabase);
AssertWaveHeightCalculationActivity(activities.ElementAt(6),
hydraulicBoundaryLocation,
@@ -166,19 +166,25 @@
AssertWaveHeightCalculationActivity(activities.ElementAt(8),
hydraulicBoundaryLocation,
lowerLimitNorm,
- "IVv",
+ "IVv",
hydraulicBoundaryDatabase);
AssertWaveHeightCalculationActivity(activities.ElementAt(9),
hydraulicBoundaryLocation,
factorizedLowerLimitNorm,
- "Vv",
+ "Vv",
hydraulicBoundaryDatabase);
var hydraulicBoundaryLocationCalculationOutput = new TestHydraulicBoundaryLocationCalculationOutput(2.0);
failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output = hydraulicBoundaryLocationCalculationOutput;
- AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activities.ElementAt(10), calculation1, hydraulicBoundaryLocationCalculationOutput.Result);
- AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activities.ElementAt(11), calculation2, hydraulicBoundaryLocationCalculationOutput.Result);
+ AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activities.ElementAt(10),
+ calculation1,
+ hydraulicBoundaryLocationCalculationOutput.Result,
+ hydraulicBoundaryDatabase);
+ AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activities.ElementAt(11),
+ calculation2,
+ hydraulicBoundaryLocationCalculationOutput.Result,
+ hydraulicBoundaryDatabase);
}
[Test]
@@ -282,8 +288,14 @@
var hydraulicBoundaryLocationCalculationOutput = new TestHydraulicBoundaryLocationCalculationOutput(2.0);
failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output = hydraulicBoundaryLocationCalculationOutput;
- AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activities.ElementAt(6), calculation1, hydraulicBoundaryLocationCalculationOutput.Result);
- AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activities.ElementAt(7), calculation2, hydraulicBoundaryLocationCalculationOutput.Result);
+ AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activities.ElementAt(6),
+ calculation1,
+ hydraulicBoundaryLocationCalculationOutput.Result,
+ hydraulicBoundaryDatabase);
+ AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activities.ElementAt(7),
+ calculation2,
+ hydraulicBoundaryLocationCalculationOutput.Result,
+ hydraulicBoundaryDatabase);
}
private static GrassCoverErosionOutwardsFailureMechanism CreateFailureMechanism()
@@ -332,7 +344,8 @@
private static void AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(Activity activity,
GrassCoverErosionOutwardsWaveConditionsCalculation calculation,
- RoundedDouble assessmentLevel)
+ RoundedDouble assessmentLevel,
+ HydraulicBoundaryDatabase hydraulicBoundaryDatabase)
{
var mocks = new MockRepository();
var testCalculator = new TestWaveConditionsCosineCalculator();
@@ -341,9 +354,9 @@
calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.Is.NotNull))
.WhenCalled(invocation =>
{
- var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
- Assert.AreEqual(validFilePath, settings.HlcdFilePath);
- Assert.IsEmpty(settings.PreprocessorDirectory);
+ HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+ HydraulicBoundaryCalculationSettingsFactory.CreateSettings(hydraulicBoundaryDatabase),
+ (HydraRingCalculationSettings) invocation.Arguments[0]);
})
.Return(testCalculator)
.Repeat
@@ -425,7 +438,8 @@
// Setup
GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanism();
var assessmentSection = new AssessmentSectionStub();
- assessmentSection.HydraulicBoundaryDatabase.FilePath = validFilePath;
+ HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase;
+ hydraulicBoundaryDatabase.FilePath = validFilePath;
var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation("locationName 1");
GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(failureMechanism, assessmentSection, new[]
@@ -444,7 +458,8 @@
AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(
activity,
calculation,
- failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output.Result);
+ failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output.Result,
+ hydraulicBoundaryDatabase);
}
[Test]
@@ -504,7 +519,8 @@
// Setup
GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanism();
var assessmentSection = new AssessmentSectionStub();
- assessmentSection.HydraulicBoundaryDatabase.FilePath = validFilePath;
+ HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase;
+ hydraulicBoundaryDatabase.FilePath = validFilePath;
var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation("locationName 1");
GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(failureMechanism, assessmentSection, new[]
@@ -532,8 +548,8 @@
Assert.AreEqual(2, activities.Count());
RoundedDouble assessmentLevel = failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output.Result;
- AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activities.First(), calculation1, assessmentLevel);
- AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activities.ElementAt(1), calculation2, assessmentLevel);
+ AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activities.First(), calculation1, assessmentLevel, hydraulicBoundaryDatabase);
+ AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activities.ElementAt(1), calculation2, assessmentLevel, hydraulicBoundaryDatabase);
}
#endregion
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -r631448b5dbf13f2c3c4e411729c9fba4e1e8cdcd -r4a876bc30ca9373e8e2fa4f1f7d3e0553d4115a2
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 631448b5dbf13f2c3c4e411729c9fba4e1e8cdcd)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 4a876bc30ca9373e8e2fa4f1f7d3e0553d4115a2)
@@ -52,10 +52,6 @@
[TestFixture]
public class GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest
{
- 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 Constructor_ReturnsNewInstance()
{
@@ -79,8 +75,7 @@
// Call
TestDelegate test = () => new GrassCoverErosionOutwardsWaveConditionsCalculationService().Calculate(null,
failureMechanism,
- assessmentSection,
- validFilePath);
+ assessmentSection);
// Assert
var exception = Assert.Throws(test);
@@ -101,8 +96,7 @@
// Call
TestDelegate test = () => new GrassCoverErosionOutwardsWaveConditionsCalculationService().Calculate(calculation,
null,
- assessmentSection,
- validFilePath);
+ assessmentSection);
// Assert
var exception = Assert.Throws(test);
@@ -120,8 +114,7 @@
// Call
TestDelegate test = () => new GrassCoverErosionOutwardsWaveConditionsCalculationService().Calculate(calculation,
failureMechanism,
- null,
- validFilePath);
+ null);
// Assert
var exception = Assert.Throws(test);
@@ -137,13 +130,8 @@
// Setup
var mockRepository = new MockRepository();
var calculatorFactory = mockRepository.StrictMock();
- calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.Is.NotNull))
- .WhenCalled(invocation =>
- {
- var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
- Assert.AreEqual(validFilePath, settings.HlcdFilePath);
- Assert.IsEmpty(settings.PreprocessorDirectory);
- })
+ calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(null))
+ .IgnoreArguments()
.Return(new TestWaveConditionsCosineCalculator())
.Repeat
.Twice();
@@ -169,8 +157,7 @@
// Call
Action call = () => new GrassCoverErosionOutwardsWaveConditionsCalculationService().Calculate(calculation,
failureMechanism,
- assessmentSection,
- validFilePath);
+ assessmentSection);
// Assert
TestHelper.AssertLogMessages(call, messages =>
@@ -206,13 +193,8 @@
// Setup
var mockRepository = new MockRepository();
var calculatorFactory = mockRepository.StrictMock();
- calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.Is.NotNull))
- .WhenCalled(invocation =>
- {
- var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
- Assert.AreEqual(validFilePath, settings.HlcdFilePath);
- Assert.IsEmpty(settings.PreprocessorDirectory);
- })
+ calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(null))
+ .IgnoreArguments()
.Return(new TestWaveConditionsCosineCalculator())
.Repeat
.Twice();
@@ -250,8 +232,7 @@
// Call
Action call = () => new GrassCoverErosionOutwardsWaveConditionsCalculationService().Calculate(calculation,
failureMechanism,
- assessmentSection,
- validFilePath);
+ assessmentSection);
// Assert
TestHelper.AssertLogMessages(call, messages =>
@@ -305,9 +286,9 @@
calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.Is.NotNull))
.WhenCalled(invocation =>
{
- var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
- Assert.AreEqual(validFilePath, settings.HlcdFilePath);
- Assert.IsEmpty(settings.PreprocessorDirectory);
+ HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+ HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
+ (HydraRingCalculationSettings) invocation.Arguments[0]);
})
.Return(waveConditionsCosineCalculator)
.Repeat
@@ -319,8 +300,7 @@
// Call
new GrassCoverErosionOutwardsWaveConditionsCalculationService().Calculate(calculation,
failureMechanism,
- assessmentSection,
- validFilePath);
+ assessmentSection);
// Assert
WaveConditionsCosineCalculationInput[] testWaveConditionsInputs = waveConditionsCosineCalculator.ReceivedInputs.ToArray();
@@ -383,8 +363,7 @@
// Call
grassCoverErosionOutwardsWaveConditionsCalculationService.Calculate(calculation,
failureMechanism,
- assessmentSection,
- validFilePath);
+ assessmentSection);
// Assert
Assert.IsFalse(calculation.HasOutput);
@@ -413,13 +392,8 @@
var mockRepository = new MockRepository();
var calculatorFactory = mockRepository.StrictMock();
- calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.Is.NotNull))
- .WhenCalled(invocation =>
- {
- var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
- Assert.AreEqual(validFilePath, settings.HlcdFilePath);
- Assert.IsEmpty(settings.PreprocessorDirectory);
- })
+ calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(null))
+ .IgnoreArguments()
.Return(waveConditionsCosineCalculator);
mockRepository.ReplayAll();
@@ -431,8 +405,7 @@
// Call
grassCoverErosionOutwardsWaveConditionsCalculationService.Calculate(calculation,
failureMechanism,
- assessmentSection,
- validFilePath);
+ assessmentSection);
// Assert
Assert.IsNull(calculation.Output);
@@ -459,13 +432,8 @@
var mockRepository = new MockRepository();
var calculatorFactory = mockRepository.StrictMock();
- calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.Is.NotNull))
- .WhenCalled(invocation =>
- {
- var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
- Assert.AreEqual(validFilePath, settings.HlcdFilePath);
- Assert.IsEmpty(settings.PreprocessorDirectory);
- })
+ calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(null))
+ .IgnoreArguments()
.Return(new TestWaveConditionsCosineCalculator())
.Repeat
.Times(3);
@@ -476,8 +444,7 @@
// Call
new GrassCoverErosionOutwardsWaveConditionsCalculationService().Calculate(calculation,
failureMechanism,
- assessmentSection,
- validFilePath);
+ assessmentSection);
// Assert
Assert.IsNotNull(calculation.Output);
@@ -516,13 +483,8 @@
};
var mockRepository = new MockRepository();
var calculatorFactory = mockRepository.StrictMock();
- calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.Is.NotNull))
- .WhenCalled(invocation =>
- {
- var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
- Assert.AreEqual(validFilePath, settings.HlcdFilePath);
- Assert.IsEmpty(settings.PreprocessorDirectory);
- })
+ calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(null))
+ .IgnoreArguments()
.Return(calculatorThatFails)
.Repeat
.Times(3);
@@ -539,8 +501,7 @@
{
new GrassCoverErosionOutwardsWaveConditionsCalculationService().Calculate(calculation,
failureMechanism,
- assessmentSection,
- validFilePath);
+ assessmentSection);
}
catch (HydraRingCalculationException e)
{
@@ -633,8 +594,7 @@
{
new GrassCoverErosionOutwardsWaveConditionsCalculationService().Calculate(calculation,
failureMechanism,
- assessmentSection,
- validFilePath);
+ assessmentSection);
};
// Assert
@@ -701,9 +661,9 @@
calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.Is.NotNull))
.WhenCalled(invocation =>
{
- var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
- Assert.AreEqual(validFilePath, settings.HlcdFilePath);
- Assert.IsEmpty(settings.PreprocessorDirectory);
+ HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+ HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
+ (HydraRingCalculationSettings) invocation.Arguments[0]);
})
.Return(new TestWaveConditionsCosineCalculator())
.Repeat
@@ -715,8 +675,7 @@
// Call
new GrassCoverErosionOutwardsWaveConditionsCalculationService().Calculate(calculation,
failureMechanism,
- assessmentSection,
- validFilePath);
+ assessmentSection);
}
// Assert
@@ -728,6 +687,10 @@
{
// Setup
AssessmentSectionStub assessmentSection = CreateAssessmentSection();
+ assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true;
+ assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = true;
+ assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = TestHelper.GetScratchPadPath();
+
var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(
failureMechanism,
@@ -744,25 +707,20 @@
calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.Is.NotNull))
.WhenCalled(invocation =>
{
- var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
- Assert.AreEqual(validFilePath, settings.HlcdFilePath);
- Assert.AreEqual(validPreprocessorDirectory, settings.PreprocessorDirectory);
+ HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+ HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
+ (HydraRingCalculationSettings) invocation.Arguments[0]);
}).Return(new TestWaveConditionsCosineCalculator())
.Repeat
.Times(3);
mockRepository.ReplayAll();
- assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true;
- assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = true;
- assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = validPreprocessorDirectory;
-
using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
{
// Call
new GrassCoverErosionOutwardsWaveConditionsCalculationService().Calculate(calculation,
failureMechanism,
- assessmentSection,
- validFilePath);
+ assessmentSection);
}
// Assert
@@ -774,6 +732,10 @@
{
// Setup
AssessmentSectionStub assessmentSection = CreateAssessmentSection();
+ assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true;
+ assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = false;
+ assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = "InvalidPreprocessorDirectory";
+
var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(
failureMechanism,
@@ -790,26 +752,21 @@
calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg.Is.NotNull))
.WhenCalled(invocation =>
{
- var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
- Assert.AreEqual(validFilePath, settings.HlcdFilePath);
- Assert.IsEmpty(settings.PreprocessorDirectory);
+ HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+ HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
+ (HydraRingCalculationSettings) invocation.Arguments[0]);
})
.Return(new TestWaveConditionsCosineCalculator())
.Repeat
.Times(3);
mockRepository.ReplayAll();
- assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true;
- assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = false;
- assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = "InvalidPreprocessorDirectory";
-
using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
{
// Call
new GrassCoverErosionOutwardsWaveConditionsCalculationService().Calculate(calculation,
failureMechanism,
- assessmentSection,
- validFilePath);
+ assessmentSection);
}
// Assert
@@ -818,6 +775,9 @@
private static AssessmentSectionStub CreateAssessmentSection()
{
+ string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
+ string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
+
return new AssessmentSectionStub
{
HydraulicBoundaryDatabase =