Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs
===================================================================
diff -u -r51e4c5dc8ba6f7fe7f923418fa4af2d2c2f46196 -r8cb74c6836f9d1903069a0720d4524b8304555cc
--- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 51e4c5dc8ba6f7fe7f923418fa4af2d2c2f46196)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 8cb74c6836f9d1903069a0720d4524b8304555cc)
@@ -51,9 +51,9 @@
/// Performs a calculation for the design water level.
///
/// The hydraulic boundary location calculation to perform.
- /// The norm to use during the calculation.
/// The containing all data
/// to perform a hydraulic boundary calculation.
+ /// The norm to use during the calculation.
/// The object which is used to build log messages.
/// Preprocessing is disabled when the preprocessor directory equals .
/// Thrown when ,
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r98acff3e7a3057555a04bda58f5d0c1a0d27d2fd -r8cb74c6836f9d1903069a0720d4524b8304555cc
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision 98acff3e7a3057555a04bda58f5d0c1a0d27d2fd)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision 8cb74c6836f9d1903069a0720d4524b8304555cc)
@@ -412,9 +412,10 @@
calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(Arg.Is.NotNull))
.WhenCalled(invocation =>
{
- var settings = (HydraRingCalculationSettings)invocation.Arguments[0];
- Assert.AreEqual(validFilePath, settings.HlcdFilePath);
- Assert.IsEmpty(settings.PreprocessorDirectory);
+ var hydraRingCalculationSettings = (HydraRingCalculationSettings) invocation.Arguments[0];
+ HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+ HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
+ hydraRingCalculationSettings);
})
.Return(designWaterLevelCalculator);
mockRepository.ReplayAll();
@@ -483,9 +484,10 @@
calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(Arg.Is.NotNull))
.WhenCalled(invocation =>
{
- var settings = (HydraRingCalculationSettings)invocation.Arguments[0];
- Assert.AreEqual(validFilePath, settings.HlcdFilePath);
- Assert.AreEqual(preprocessorDirectory, settings.PreprocessorDirectory);
+ var hydraRingCalculationSettings = (HydraRingCalculationSettings) invocation.Arguments[0];
+ HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+ HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
+ hydraRingCalculationSettings);
})
.Return(designWaterLevelCalculator);
mockRepository.ReplayAll();
@@ -552,9 +554,10 @@
calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(Arg.Is.NotNull))
.WhenCalled(invocation =>
{
- var settings = (HydraRingCalculationSettings)invocation.Arguments[0];
- Assert.AreEqual(validFilePath, settings.HlcdFilePath);
- Assert.IsEmpty(settings.PreprocessorDirectory);
+ var hydraRingCalculationSettings = (HydraRingCalculationSettings) invocation.Arguments[0];
+ HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+ HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
+ hydraRingCalculationSettings);
})
.Return(designWaterLevelCalculator);
mockRepository.ReplayAll();
@@ -618,13 +621,8 @@
Converged = false
};
var calculatorFactory = mockRepository.Stub();
- calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(Arg.Is.NotNull))
- .WhenCalled(invocation =>
- {
- var settings = (HydraRingCalculationSettings)invocation.Arguments[0];
- Assert.AreEqual(validFilePath, settings.HlcdFilePath);
- Assert.IsEmpty(settings.PreprocessorDirectory);
- })
+ calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(null))
+ .IgnoreArguments()
.Return(designWaterLevelCalculator);
mockRepository.ReplayAll();
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r98acff3e7a3057555a04bda58f5d0c1a0d27d2fd -r8cb74c6836f9d1903069a0720d4524b8304555cc
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision 98acff3e7a3057555a04bda58f5d0c1a0d27d2fd)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision 8cb74c6836f9d1903069a0720d4524b8304555cc)
@@ -41,6 +41,7 @@
using Ringtoets.Common.Data.TestUtil;
using Ringtoets.Common.Plugin.TestUtil;
using Ringtoets.Common.Service;
+using Ringtoets.Common.Service.TestUtil;
using Ringtoets.GrassCoverErosionOutwards.Data;
using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
using Ringtoets.HydraRing.Calculation.Calculator;
@@ -346,13 +347,15 @@
{
Converged = false
};
+
var calculatorFactory = mockRepository.Stub();
calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(Arg.Is.NotNull))
.WhenCalled(invocation =>
{
- var settings = (HydraRingCalculationSettings)invocation.Arguments[0];
- Assert.AreEqual(filePath, settings.HlcdFilePath);
- Assert.IsEmpty(settings.PreprocessorDirectory);
+ var hydraRingCalculationSettings = (HydraRingCalculationSettings) invocation.Arguments[0];
+ HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+ HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase),
+ hydraRingCalculationSettings);
})
.Return(designWaterLevelCalculator).Repeat.Times(5);
mockRepository.ReplayAll();
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rd149137378015c9050e5be4c0ea6c050966cd4a6 -r8cb74c6836f9d1903069a0720d4524b8304555cc
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision d149137378015c9050e5be4c0ea6c050966cd4a6)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 8cb74c6836f9d1903069a0720d4524b8304555cc)
@@ -575,12 +575,13 @@
Converged = false
};
+ HydraulicBoundaryCalculationSettings expectedCalculationSettings = HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase);
calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(Arg.Is.NotNull))
.WhenCalled(invocation =>
{
- var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
- Assert.AreEqual(validFilePath, settings.HlcdFilePath);
- Assert.IsEmpty(settings.PreprocessorDirectory);
+ var hydraRingCalculationSettings = (HydraRingCalculationSettings)invocation.Arguments[0];
+ HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(expectedCalculationSettings,
+ hydraRingCalculationSettings);
})
.Return(designWaterLevelCalculator)
.Repeat
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs
===================================================================
diff -u -rd149137378015c9050e5be4c0ea6c050966cd4a6 -r8cb74c6836f9d1903069a0720d4524b8304555cc
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision d149137378015c9050e5be4c0ea6c050966cd4a6)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision 8cb74c6836f9d1903069a0720d4524b8304555cc)
@@ -298,12 +298,13 @@
Converged = false
};
+ HydraulicBoundaryCalculationSettings expectedCalculationSettings = HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase);
calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(Arg.Is.NotNull))
.WhenCalled(invocation =>
{
- var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
- Assert.AreEqual(validFilePath, settings.HlcdFilePath);
- Assert.IsEmpty(settings.PreprocessorDirectory);
+ var hydraRingCalculationSettings = (HydraRingCalculationSettings) invocation.Arguments[0];
+ HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(expectedCalculationSettings,
+ hydraRingCalculationSettings);
})
.Return(designWaterLevelCalculator)
.Repeat
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs
===================================================================
diff -u -rd149137378015c9050e5be4c0ea6c050966cd4a6 -r8cb74c6836f9d1903069a0720d4524b8304555cc
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs (.../GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs) (revision d149137378015c9050e5be4c0ea6c050966cd4a6)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs (.../GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs) (revision 8cb74c6836f9d1903069a0720d4524b8304555cc)
@@ -35,6 +35,7 @@
using Ringtoets.Common.Data.Hydraulics;
using Ringtoets.Common.Data.TestUtil;
using Ringtoets.Common.Service;
+using Ringtoets.Common.Service.TestUtil;
using Ringtoets.GrassCoverErosionOutwards.Data;
using Ringtoets.GrassCoverErosionOutwards.Data.TestUtil;
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
@@ -118,27 +119,33 @@
double lowerLimitNorm = assessmentSection.FailureMechanismContribution.LowerLimitNorm;
double factorizedLowerLimitNorm = lowerLimitNorm * 30;
+ HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase;
AssertDesignWaterLevelCalculationActivity(activities.First(),
hydraulicBoundaryLocation,
mechanismSpecificFactorizedSignalingNorm,
- "Iv");
+ "Iv",
+ hydraulicBoundaryDatabase);
AssertDesignWaterLevelCalculationActivity(activities.ElementAt(1),
hydraulicBoundaryLocation,
mechanismSpecificSignalingNorm,
- "IIv");
+ "IIv",
+ hydraulicBoundaryDatabase);
AssertDesignWaterLevelCalculationActivity(activities.ElementAt(2),
hydraulicBoundaryLocation,
mechanismSpecificLowerLimitNorm,
- "IIIv");
+ "IIIv",
+ hydraulicBoundaryDatabase);
AssertDesignWaterLevelCalculationActivity(activities.ElementAt(3),
hydraulicBoundaryLocation,
lowerLimitNorm,
- "IVv");
+ "IVv",
+ hydraulicBoundaryDatabase);
AssertDesignWaterLevelCalculationActivity(activities.ElementAt(4),
hydraulicBoundaryLocation,
factorizedLowerLimitNorm,
- "Vv");
+ "Vv",
+ hydraulicBoundaryDatabase);
AssertWaveHeightCalculationActivity(activities.ElementAt(5),
hydraulicBoundaryLocation,
@@ -235,19 +242,23 @@
double mechanismSpecificSignalingNorm = GetExpectedNorm(failureMechanism, assessmentSection.FailureMechanismContribution.SignalingNorm);
double mechanismSpecificLowerLimitNorm = GetExpectedNorm(failureMechanism, assessmentSection.FailureMechanismContribution.LowerLimitNorm);
+ HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase;
AssertDesignWaterLevelCalculationActivity(activities.First(),
hydraulicBoundaryLocation,
mechanismSpecificFactorizedSignalingNorm,
- "Iv");
+ "Iv",
+ hydraulicBoundaryDatabase);
AssertDesignWaterLevelCalculationActivity(activities.ElementAt(1),
hydraulicBoundaryLocation,
mechanismSpecificSignalingNorm,
- "IIv");
+ "IIv",
+ hydraulicBoundaryDatabase);
AssertDesignWaterLevelCalculationActivity(activities.ElementAt(2),
hydraulicBoundaryLocation,
mechanismSpecificLowerLimitNorm,
- "IIIv");
+ "IIIv",
+ hydraulicBoundaryDatabase);
AssertWaveHeightCalculationActivity(activities.ElementAt(3),
hydraulicBoundaryLocation,
@@ -587,54 +598,64 @@
double mechanismSpecificFactorizedSignalingNorm = GetExpectedNorm(failureMechanism,
assessmentSection.FailureMechanismContribution.SignalingNorm / 30);
+ HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase;
AssertDesignWaterLevelCalculationActivity(activities.First(),
hydraulicBoundaryLocation1,
mechanismSpecificFactorizedSignalingNorm,
- "Iv");
+ "Iv",
+ hydraulicBoundaryDatabase);
AssertDesignWaterLevelCalculationActivity(activities.ElementAt(1),
hydraulicBoundaryLocation2,
mechanismSpecificFactorizedSignalingNorm,
- "Iv");
+ "Iv",
+ hydraulicBoundaryDatabase);
double mechanismSpecificSignalingNorm = GetExpectedNorm(failureMechanism, assessmentSection.FailureMechanismContribution.SignalingNorm);
AssertDesignWaterLevelCalculationActivity(activities.ElementAt(2),
hydraulicBoundaryLocation1,
mechanismSpecificSignalingNorm,
- "IIv");
+ "IIv",
+ hydraulicBoundaryDatabase);
AssertDesignWaterLevelCalculationActivity(activities.ElementAt(3),
hydraulicBoundaryLocation2,
mechanismSpecificSignalingNorm,
- "IIv");
+ "IIv",
+ hydraulicBoundaryDatabase);
double mechanismSpecificLowerLimitNorm = GetExpectedNorm(failureMechanism, assessmentSection.FailureMechanismContribution.LowerLimitNorm);
AssertDesignWaterLevelCalculationActivity(activities.ElementAt(4),
hydraulicBoundaryLocation1,
mechanismSpecificLowerLimitNorm,
- "IIIv");
+ "IIIv",
+ hydraulicBoundaryDatabase);
AssertDesignWaterLevelCalculationActivity(activities.ElementAt(5),
hydraulicBoundaryLocation2,
mechanismSpecificLowerLimitNorm,
- "IIIv");
+ "IIIv",
+ hydraulicBoundaryDatabase);
double lowerLimitNorm = assessmentSection.FailureMechanismContribution.LowerLimitNorm;
AssertDesignWaterLevelCalculationActivity(activities.ElementAt(6),
hydraulicBoundaryLocation1,
lowerLimitNorm,
- "IVv");
+ "IVv",
+ hydraulicBoundaryDatabase);
AssertDesignWaterLevelCalculationActivity(activities.ElementAt(7),
hydraulicBoundaryLocation2,
lowerLimitNorm,
- "IVv");
+ "IVv",
+ hydraulicBoundaryDatabase);
double factorizedLowerLimitNorm = lowerLimitNorm * 30;
AssertDesignWaterLevelCalculationActivity(activities.ElementAt(8),
hydraulicBoundaryLocation1,
factorizedLowerLimitNorm,
- "Vv");
+ "Vv", hydraulicBoundaryDatabase);
AssertDesignWaterLevelCalculationActivity(activities.ElementAt(9),
hydraulicBoundaryLocation2,
factorizedLowerLimitNorm,
- "Vv");
+ "Vv",
+ hydraulicBoundaryDatabase);
}
[Test]
@@ -753,17 +774,19 @@
private static void AssertDesignWaterLevelCalculationActivity(Activity activity,
HydraulicBoundaryLocation hydraulicBoundaryLocation,
double norm,
- string categoryBoundaryName)
+ string categoryBoundaryName,
+ HydraulicBoundaryDatabase hydraulicBoundaryDatabase)
{
var mocks = new MockRepository();
var designWaterLevelCalculator = new TestDesignWaterLevelCalculator();
var calculatorFactory = mocks.Stub();
calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(Arg.Is.NotNull))
.WhenCalled(invocation =>
{
- var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
- Assert.AreEqual(validFilePath, settings.HlcdFilePath);
- Assert.IsEmpty(settings.PreprocessorDirectory);
+ var hydraRingCalculationSettings = (HydraRingCalculationSettings) invocation.Arguments[0];
+ HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
+ HydraulicBoundaryCalculationSettingsFactory.CreateSettings(hydraulicBoundaryDatabase),
+ hydraRingCalculationSettings);
})
.Return(designWaterLevelCalculator);
mocks.ReplayAll();
@@ -794,7 +817,7 @@
calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(Arg.Is.NotNull))
.WhenCalled(invocation =>
{
- var settings = (HydraRingCalculationSettings)invocation.Arguments[0];
+ var settings = (HydraRingCalculationSettings) invocation.Arguments[0];
Assert.AreEqual(validFilePath, settings.HlcdFilePath);
Assert.IsEmpty(settings.PreprocessorDirectory);
})