Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs =================================================================== diff -u -r440f228de8eb72ed5be40270b20a46113917333e -rf70611f9af51a6ffc8cb4d8d28d1ea806104937b --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs (.../ClosingStructuresCalculationService.cs) (revision 440f228de8eb72ed5be40270b20a46113917333e) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs (.../ClosingStructuresCalculationService.cs) (revision f70611f9af51a6ffc8cb4d8d28d1ea806104937b) @@ -135,7 +135,9 @@ return !messages.Any(); } - private static StructuresClosureCalculationInput CreateStructuresClosureCalculationInput(StructuresCalculation calculation, ClosingStructuresFailureMechanism failureMechanism, FailureMechanismSection failureMechanismSection) + private static StructuresClosureCalculationInput CreateStructuresClosureCalculationInput(StructuresCalculation calculation, + ClosingStructuresFailureMechanism failureMechanism, + FailureMechanismSection failureMechanismSection) { StructuresClosureCalculationInput input; switch (calculation.InputParameters.InflowModelType) Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs =================================================================== diff -u -r440f228de8eb72ed5be40270b20a46113917333e -rf70611f9af51a6ffc8cb4d8d28d1ea806104937b --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision 440f228de8eb72ed5be40270b20a46113917333e) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision f70611f9af51a6ffc8cb4d8d28d1ea806104937b) @@ -408,6 +408,7 @@ Assert.AreEqual(0, calculationInputs.Length); var exception = Assert.Throws(call); Assert.AreEqual("calculation", exception.ParamName); + StringAssert.StartsWith("The value of argument 'calculation' (100) is invalid for Enum type 'ClosingStructureInflowModelType'.", exception.Message); } mockRepository.VerifyAll(); } Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationActivity.cs =================================================================== diff -u -r7e5847c20d3ca698e55690d8abb6d3f9aaffd313 -rf70611f9af51a6ffc8cb4d8d28d1ea806104937b --- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationActivity.cs (.../DesignWaterLevelCalculationActivity.cs) (revision 7e5847c20d3ca698e55690d8abb6d3f9aaffd313) +++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationActivity.cs (.../DesignWaterLevelCalculationActivity.cs) (revision f70611f9af51a6ffc8cb4d8d28d1ea806104937b) @@ -94,8 +94,6 @@ { if (State != ActivityState.Skipped) { - RingtoetsCommonDataSynchronizationService.ClearDesignWaterLevel(hydraulicBoundaryLocation); - calculationService.Calculate( hydraulicBoundaryLocation, hydraulicBoundaryDatabaseFilePath, Index: Ringtoets/Common/src/Ringtoets.Common.Service/HydraRingInputParser.cs =================================================================== diff -u -r3023413fe1c0f6dd469e8d16f3a6ebf25adac5da -rf70611f9af51a6ffc8cb4d8d28d1ea806104937b --- Ringtoets/Common/src/Ringtoets.Common.Service/HydraRingInputParser.cs (.../HydraRingInputParser.cs) (revision 3023413fe1c0f6dd469e8d16f3a6ebf25adac5da) +++ Ringtoets/Common/src/Ringtoets.Common.Service/HydraRingInputParser.cs (.../HydraRingInputParser.cs) (revision f70611f9af51a6ffc8cb4d8d28d1ea806104937b) @@ -28,7 +28,7 @@ { /// /// Helper class to parse the breakwater and foreshore properties of a calculation input object into required objects - /// for performing calculations with HydrarRing. + /// for performing calculations with Hydra-Ring. /// public static class HydraRingInputParser { Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs =================================================================== diff -u -r7e5847c20d3ca698e55690d8abb6d3f9aaffd313 -rf70611f9af51a6ffc8cb4d8d28d1ea806104937b --- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs (.../WaveHeightCalculationActivity.cs) (revision 7e5847c20d3ca698e55690d8abb6d3f9aaffd313) +++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs (.../WaveHeightCalculationActivity.cs) (revision f70611f9af51a6ffc8cb4d8d28d1ea806104937b) @@ -94,8 +94,6 @@ { if (State != ActivityState.Skipped) { - RingtoetsCommonDataSynchronizationService.ClearWaveHeight(hydraulicBoundaryLocation); - calculationService.Calculate( hydraulicBoundaryLocation, hydraulicBoundaryDatabaseFilePath, Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs =================================================================== diff -u -r78d81c5277da2f3f016dcde8ef1de0cb39fd4248 -rf70611f9af51a6ffc8cb4d8d28d1ea806104937b --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 78d81c5277da2f3f016dcde8ef1de0cb39fd4248) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision f70611f9af51a6ffc8cb4d8d28d1ea806104937b) @@ -597,7 +597,7 @@ return builder.AddValidateCalculationItem( context, - ValidateAll, + Validate, ValidateAllDataAvailableAndGetErrorMessageForCalculation) .AddPerformCalculationItem(calculation, context, Calculate, ValidateAllDataAvailableAndGetErrorMessageForCalculation) .AddClearCalculationOutputItem(calculation) @@ -617,7 +617,7 @@ return ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection, context.FailureMechanism); } - private static void ValidateAll(GrassCoverErosionInwardsCalculationContext context) + private static void Validate(GrassCoverErosionInwardsCalculationContext context) { GrassCoverErosionInwardsCalculationService.Validate(context.WrappedData, context.AssessmentSection); } Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -r78d81c5277da2f3f016dcde8ef1de0cb39fd4248 -rf70611f9af51a6ffc8cb4d8d28d1ea806104937b --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 78d81c5277da2f3f016dcde8ef1de0cb39fd4248) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision f70611f9af51a6ffc8cb4d8d28d1ea806104937b) @@ -805,7 +805,7 @@ .AddExportItem() .AddSeparator() .AddValidateCalculationItem(nodeData, - ValidateAll, + Validate, ValidateAllDataAvailableAndGetErrorMessageForCalculation) .AddPerformCalculationItem(calculation, nodeData, PerformCalculation, ValidateAllDataAvailableAndGetErrorMessageForCalculation) .AddClearCalculationOutputItem(calculation) @@ -825,14 +825,9 @@ return ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection); } - private static void ValidateAll(GrassCoverErosionOutwardsWaveConditionsCalculationContext context) + private static void Validate(GrassCoverErosionOutwardsWaveConditionsCalculationContext context) { - ValidateAll( - new[] - { - context.WrappedData - }, - context.AssessmentSection.HydraulicBoundaryDatabase); + GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(context.WrappedData, context.AssessmentSection.HydraulicBoundaryDatabase.FilePath); } private void PerformCalculation(GrassCoverErosionOutwardsWaveConditionsCalculation calculation, Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs =================================================================== diff -u -r86984ca293c30b4f9b47da7825cbae1404fffe08 -rf70611f9af51a6ffc8cb4d8d28d1ea806104937b --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision 86984ca293c30b4f9b47da7825cbae1404fffe08) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision f70611f9af51a6ffc8cb4d8d28d1ea806104937b) @@ -571,7 +571,7 @@ return builder.AddValidateCalculationItem( context, - ValidateAll, + Validate, ValidateAllDataAvailableAndGetErrorMessageForCalculation) .AddPerformCalculationItem(calculation, context, Calculate, ValidateAllDataAvailableAndGetErrorMessageForCalculation) .AddClearCalculationOutputItem(calculation) @@ -591,7 +591,7 @@ return ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection, context.FailureMechanism); } - private static void ValidateAll(HeightStructuresCalculationContext context) + private static void Validate(HeightStructuresCalculationContext context) { HeightStructuresCalculationService.Validate(context.WrappedData, context.AssessmentSection); } Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -r78d81c5277da2f3f016dcde8ef1de0cb39fd4248 -rf70611f9af51a6ffc8cb4d8d28d1ea806104937b --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 78d81c5277da2f3f016dcde8ef1de0cb39fd4248) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision f70611f9af51a6ffc8cb4d8d28d1ea806104937b) @@ -558,7 +558,7 @@ PipingCalculation calculation = nodeData.WrappedData; - return builder.AddValidateCalculationItem(nodeData, ValidateAll) + return builder.AddValidateCalculationItem(nodeData, Validate) .AddPerformCalculationItem(calculation, nodeData, PerformCalculation) .AddClearCalculationOutputItem(calculation) .AddSeparator() @@ -610,7 +610,7 @@ } } - private static void ValidateAll(PipingCalculationScenarioContext context) + private static void Validate(PipingCalculationScenarioContext context) { PipingCalculationService.Validate(context.WrappedData); } Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs =================================================================== diff -u -rb78eb7cbd59f1bd31e72631b67b7e12b5b4477a5 -rf70611f9af51a6ffc8cb4d8d28d1ea806104937b --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision b78eb7cbd59f1bd31e72631b67b7e12b5b4477a5) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision f70611f9af51a6ffc8cb4d8d28d1ea806104937b) @@ -43,7 +43,6 @@ using Ringtoets.StabilityPointStructures.Forms.PropertyClasses; using Ringtoets.StabilityPointStructures.Forms.Views; using Ringtoets.StabilityPointStructures.IO; -using Ringtoets.StabilityPointStructures.Plugin.Properties; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources; Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs =================================================================== diff -u -r78d81c5277da2f3f016dcde8ef1de0cb39fd4248 -rf70611f9af51a6ffc8cb4d8d28d1ea806104937b --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 78d81c5277da2f3f016dcde8ef1de0cb39fd4248) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision f70611f9af51a6ffc8cb4d8d28d1ea806104937b) @@ -500,7 +500,7 @@ .AddExportItem() .AddSeparator() .AddValidateCalculationItem(nodeData, - ValidateAll, + Validate, ValidateAllDataAvailableAndGetErrorMessageForCalculation) .AddPerformCalculationItem(calculation, nodeData, PerformCalculation, ValidateAllDataAvailableAndGetErrorMessageForCalculation) .AddClearCalculationOutputItem(calculation) @@ -515,14 +515,9 @@ .Build(); } - private static void ValidateAll(StabilityStoneCoverWaveConditionsCalculationContext context) + private static void Validate(StabilityStoneCoverWaveConditionsCalculationContext context) { - ValidateAll( - new[] - { - context.WrappedData - }, - context.AssessmentSection.HydraulicBoundaryDatabase); + StabilityStoneCoverWaveConditionsCalculationService.Validate(context.WrappedData, context.AssessmentSection.HydraulicBoundaryDatabase.FilePath); } private void PerformCalculation(StabilityStoneCoverWaveConditionsCalculation calculation, Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -r78d81c5277da2f3f016dcde8ef1de0cb39fd4248 -rf70611f9af51a6ffc8cb4d8d28d1ea806104937b --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 78d81c5277da2f3f016dcde8ef1de0cb39fd4248) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision f70611f9af51a6ffc8cb4d8d28d1ea806104937b) @@ -506,7 +506,7 @@ return builder.AddExportItem() .AddSeparator() .AddValidateCalculationItem(nodeData, - ValidateAll, + Validate, ValidateAllDataAvailableAndGetErrorMessageForCalculation) .AddPerformCalculationItem(calculation, nodeData, PerformCalculation, ValidateAllDataAvailableAndGetErrorMessageForCalculation) .AddClearCalculationOutputItem(calculation) @@ -521,14 +521,9 @@ .Build(); } - private static void ValidateAll(WaveImpactAsphaltCoverWaveConditionsCalculationContext context) + private static void Validate(WaveImpactAsphaltCoverWaveConditionsCalculationContext context) { - ValidateAll( - new[] - { - context.WrappedData - }, - context.AssessmentSection.HydraulicBoundaryDatabase); + WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(context.WrappedData, context.AssessmentSection.HydraulicBoundaryDatabase.FilePath); } private void PerformCalculation(WaveImpactAsphaltCoverWaveConditionsCalculation calculation,