Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismExtensions.cs =================================================================== diff -u -r3bc137619c51529afcab45085ae338e722ff449a -rcff4b928800b2a49ccaaaa49e7c87755d79b0169 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensions.cs) (revision 3bc137619c51529afcab45085ae338e722ff449a) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensions.cs) (revision cff4b928800b2a49ccaaaa49e7c87755d79b0169) @@ -86,7 +86,7 @@ calculations = failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm; break; case NormType.LowerLimit: - calculations = assessmentSection.WaterLevelCalculationsForLowerLimitNorm; + calculations = failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm; break; default: throw new NotSupportedException(); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs =================================================================== diff -u -r2c3c354d3910e788173efc979e04e3701bcdb659 -rcff4b928800b2a49ccaaaa49e7c87755d79b0169 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs) (revision 2c3c354d3910e788173efc979e04e3701bcdb659) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs) (revision cff4b928800b2a49ccaaaa49e7c87755d79b0169) @@ -133,7 +133,7 @@ RoundedDouble normativeAssessmentLevel = failureMechanism.GetNormativeAssessmentLevel(assessmentSection, hydraulicBoundaryLocation); // Assert - Assert.AreEqual(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(0).Output.Result, normativeAssessmentLevel); + Assert.AreEqual(failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.ElementAt(0).Output.Result, normativeAssessmentLevel); } [TestCase(NormType.Signaling)] Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r84e9d27d2d538fcfd5d5a6c1198486b1d37c2058 -rcff4b928800b2a49ccaaaa49e7c87755d79b0169 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 84e9d27d2d538fcfd5d5a6c1198486b1d37c2058) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision cff4b928800b2a49ccaaaa49e7c87755d79b0169) @@ -37,6 +37,7 @@ using Ringtoets.Common.Service.TestUtil; using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.GrassCoverErosionOutwards.Service; +using Ringtoets.GrassCoverErosionOutwards.Util.TestUtil; using Ringtoets.HydraRing.Calculation.Calculator.Factory; using Ringtoets.HydraRing.Calculation.Data; using Ringtoets.HydraRing.Calculation.Data.Input.WaveConditions; @@ -57,11 +58,10 @@ public void Run_CalculationWithInvalidHydraulicBoundaryDatabaseFilePath_DoesNotPerformCalculationAndLogsError() { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - + string invalidFilePath = Path.Combine(testDataPath, "NonExisting.sqlite"); var mockRepository = new MockRepository(); @@ -98,11 +98,10 @@ public void Run_CalculationWithInvalidPreprocessorDirectory_DoesNotPerformCalculationAndLogsError() { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - + assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = "NonExistingPreprocessorDirectory"; @@ -141,11 +140,10 @@ public void Run_Always_SetProgressTexts() { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - + var activity = new GrassCoverErosionOutwardsWaveConditionsCalculationActivity(calculation, validFilePath, failureMechanism, @@ -188,11 +186,10 @@ public void Run_Always_InputPropertiesCorrectlySendToService(BreakWaterType breakWaterType) { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - + calculation.InputParameters.BreakWater.Type = breakWaterType; var activity = new GrassCoverErosionOutwardsWaveConditionsCalculationActivity(calculation, @@ -255,11 +252,10 @@ public void Cancel_WhenPerformingCalculation_CurrentCalculationForWaterLevelCompletesAndSubsequentCalculationsDidNotRun() { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - var activity = new GrassCoverErosionOutwardsWaveConditionsCalculationActivity(calculation, validFilePath, failureMechanism, @@ -309,11 +305,10 @@ public void Run_WhenCanceled_OutputNull() { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - var activity = new GrassCoverErosionOutwardsWaveConditionsCalculationActivity(calculation, validFilePath, failureMechanism, @@ -351,11 +346,10 @@ public void Run_CalculationPerformed_SetsOutput() { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - var activity = new GrassCoverErosionOutwardsWaveConditionsCalculationActivity(calculation, validFilePath, failureMechanism, @@ -392,11 +386,10 @@ public void Run_ErrorInCalculation_ActivityStateFailed(bool endInFailure, string lastErrorFileContent) { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - var calculator = new TestWaveConditionsCosineCalculator { EndInFailure = endInFailure, @@ -434,11 +427,10 @@ public void Run_CalculationFailed_OutputNull(bool endInFailure, string lastErrorFileContent) { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - var activity = new GrassCoverErosionOutwardsWaveConditionsCalculationActivity(calculation, validFilePath, failureMechanism, @@ -476,11 +468,10 @@ public void Run_HydraulicBoundaryDatabaseWithCanUsePreprocessorFalse_CreateWaveConditionsCosineCalculatorAsExpected() { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - var activity = new GrassCoverErosionOutwardsWaveConditionsCalculationActivity(calculation, validFilePath, failureMechanism, @@ -509,11 +500,10 @@ public void Run_HydraulicBoundaryDatabaseWithUsePreprocessorTrue_CreateWaveConditionsCosineCalculatorAsExpected() { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = validPreprocessorDirectory; @@ -546,11 +536,10 @@ public void Run_HydraulicBoundaryDatabaseWithUsePreprocessorFalse_CreateWaveConditionsCosineCalculatorAsExpected() { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = false; assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = "InvalidPreprocessorDirectory"; @@ -579,6 +568,19 @@ mockRepository.VerifyAll(); } + private static GrassCoverErosionOutwardsFailureMechanism CreateFailureMechanismWithHydraulicBoundaryOutput(AssessmentSectionStub assessmentSection) + { + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); + GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( + failureMechanism, + assessmentSection, new[] + { + new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0) + }); + failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(9.3); + return failureMechanism; + } + private static GrassCoverErosionOutwardsWaveConditionsCalculation CreateValidCalculation(HydraulicBoundaryLocation location) { return new GrassCoverErosionOutwardsWaveConditionsCalculation @@ -598,34 +600,19 @@ }; } - private static IAssessmentSection CreateAssessmentSectionWithHydraulicBoundaryOutput() + private static AssessmentSectionStub CreateAssessmentSection() { - var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0); - - var assessmentSection = new AssessmentSectionStub + return new AssessmentSectionStub { FailureMechanismContribution = { NormativeNorm = NormType.LowerLimit }, HydraulicBoundaryDatabase = { - FilePath = validFilePath, - Locations = - { - hydraulicBoundaryLocation - } + FilePath = validFilePath } }; - - assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] - { - hydraulicBoundaryLocation - }); - - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(9.3); - - return assessmentSection; } private static IEnumerable GetWaterLevels(GrassCoverErosionOutwardsWaveConditionsCalculation calculation, Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/Ringtoets.GrassCoverErosionOutwards.Integration.Test.csproj =================================================================== diff -u -r682dfada6e821a0dd7cf3f6be9a2823eb72d9302 -rcff4b928800b2a49ccaaaa49e7c87755d79b0169 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/Ringtoets.GrassCoverErosionOutwards.Integration.Test.csproj (.../Ringtoets.GrassCoverErosionOutwards.Integration.Test.csproj) (revision 682dfada6e821a0dd7cf3f6be9a2823eb72d9302) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/Ringtoets.GrassCoverErosionOutwards.Integration.Test.csproj (.../Ringtoets.GrassCoverErosionOutwards.Integration.Test.csproj) (revision cff4b928800b2a49ccaaaa49e7c87755d79b0169) @@ -104,6 +104,10 @@ {18E9F7C8-3170-4E9D-8D9F-1378225EED90} Ringtoets.GrassCoverErosionOutwards.Service + + {C700ED66-8565-48B2-9A4E-B0D33FB2B26D} + Ringtoets.GrassCoverErosionOutwards.Util.TestUtil + Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r2c3c354d3910e788173efc979e04e3701bcdb659 -rcff4b928800b2a49ccaaaa49e7c87755d79b0169 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 2c3c354d3910e788173efc979e04e3701bcdb659) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision cff4b928800b2a49ccaaaa49e7c87755d79b0169) @@ -373,7 +373,7 @@ var location = new TestHydraulicBoundaryLocation(); var assessmentSection = new AssessmentSectionStub(); - + var parent = new CalculationGroup(); var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation { @@ -727,7 +727,7 @@ Contribution = 5 }; - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + IAssessmentSection assessmentSection = CreateAssessmentSection(); var parent = new CalculationGroup(); var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation @@ -1043,13 +1043,9 @@ public void GivenCalculation_WhenValidating_ThenCalculationValidated(bool validCalculation) { // Given - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = 5 - }; + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); - var parent = new CalculationGroup(); var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation { @@ -1123,13 +1119,9 @@ public void GivenHydraulicBoundaryDatabaseWithCanUsePreprocessorFalse_WhenValidatingCalculation_ThenNoValidationErrorsLogged() { // Given - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = 5 - }; + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); - var parent = new CalculationGroup(); var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation { @@ -1195,13 +1187,9 @@ public void GivenHydraulicBoundaryDatabaseWithUsePreprocessorFalse_WhenValidatingCalculation_ThenNoValidationErrorsLogged() { // Given - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = 5 - }; + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); - assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = false; assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = "InvalidPreprocessorDirectory"; @@ -1271,12 +1259,9 @@ public void GivenHydraulicBoundaryDatabaseWithUsePreprocessorTrue_WhenValidatingCalculation_ThenNoValidationErrorsLogged() { // Given - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = 5 - }; + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = TestHelper.GetScratchPadPath(); @@ -1346,13 +1331,9 @@ public void GivenHydraulicBoundaryDatabaseWithUsePreprocessorTrue_WhenValidatingCalculation_ThenValidationErrorsLogged() { // Given - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = 5 - }; + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); - assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = "InvalidPreprocessorDirectory"; @@ -1599,7 +1580,7 @@ Contribution = 5 }; - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + IAssessmentSection assessmentSection = CreateAssessmentSection(); var parent = new CalculationGroup(); var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation @@ -1649,11 +1630,8 @@ public void GivenValidCalculation_WhenCalculating_ThenCalculationReturnsResult() { // Given - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = 10 - }; - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); var parent = new CalculationGroup(); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); @@ -1720,8 +1698,8 @@ public void GivenCalculationWithoutOutput_ThenClearOutputItemDisabled() { // Given - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - var assessmentSection = mocks.Stub(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); var parent = new CalculationGroup(); var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation @@ -1897,34 +1875,35 @@ mocks.VerifyAll(); } - private IAssessmentSection CreateAssessmentSectionWithHydraulicBoundaryOutput() + private AssessmentSectionStub CreateAssessmentSection() { - var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0); - - var assessmentSection = new AssessmentSectionStub + return new AssessmentSectionStub { FailureMechanismContribution = { NormativeNorm = NormType.LowerLimit }, HydraulicBoundaryDatabase = { - FilePath = validFilePath, - Locations = - { - hydraulicBoundaryLocation - } + FilePath = validFilePath } }; + } - assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + private static GrassCoverErosionOutwardsFailureMechanism CreateFailureMechanismWithHydraulicBoundaryOutput(AssessmentSectionStub assessmentSection) + { + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism { - hydraulicBoundaryLocation - }); - - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(9.3); - - return assessmentSection; + Contribution = 5 + }; + GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( + failureMechanism, + assessmentSection, new[] + { + new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0) + }); + failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(9.3); + return failureMechanism; } private static GrassCoverErosionOutwardsWaveConditionsCalculation GetValidCalculation(HydraulicBoundaryLocation location) Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r2c3c354d3910e788173efc979e04e3701bcdb659 -rcff4b928800b2a49ccaaaa49e7c87755d79b0169 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 2c3c354d3910e788173efc979e04e3701bcdb659) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision cff4b928800b2a49ccaaaa49e7c87755d79b0169) @@ -898,7 +898,8 @@ public void ContextMenuStrip_TwoCalculationsClickOnValidateAllInGroup_ValidationMessagesLogged() { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); var calculationA = new GrassCoverErosionOutwardsWaveConditionsCalculation { @@ -933,10 +934,6 @@ group.Children.Add(calculationA); group.Children.Add(calculationB); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = 5 - }; failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group, @@ -979,7 +976,8 @@ public void ValidateAllViaContextMenuStrip_HydraulicBoundaryDatabaseWithCanUsePreprocessorFalse_NoValidationErrorsLogged() { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation { @@ -999,10 +997,6 @@ var group = new CalculationGroup(); group.Children.Add(calculation); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = 5 - }; failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group, @@ -1043,7 +1037,8 @@ public void ValidateAllViaContextMenuStrip_HydraulicBoundaryDatabaseWithUsePreprocessorFalse_NoValidationErrorsLogged() { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation { @@ -1063,10 +1058,6 @@ var group = new CalculationGroup(); group.Children.Add(calculation); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = 5 - }; failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true; @@ -1111,7 +1102,8 @@ public void ValidateAllViaContextMenuStrip_HydraulicBoundaryDatabaseWithUsePreprocessorTrue_NoValidationErrorsLogged() { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation { @@ -1131,10 +1123,6 @@ var group = new CalculationGroup(); group.Children.Add(calculation); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = 5 - }; failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true; @@ -1179,7 +1167,8 @@ public void ValidateAllViaContextMenuStrip_HydraulicBoundaryDatabaseWithUsePreprocessorTrue_ValidationErrorsLogged() { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation { @@ -1199,10 +1188,6 @@ var group = new CalculationGroup(); group.Children.Add(calculation); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = 5 - }; failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true; @@ -1248,11 +1233,8 @@ public void ContextMenuStrip_TwoCalculationsClickOnCalculateAllInGroup_MessagesLogged() { // Setup - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = 10 - }; - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); var observerA = mocks.StrictMock(); observerA.Expect(o => o.UpdateObserver()); @@ -1940,34 +1922,35 @@ mocks.VerifyAll(); } - private IAssessmentSection CreateAssessmentSectionWithHydraulicBoundaryOutput() + private AssessmentSectionStub CreateAssessmentSection() { - var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0); - - var assessmentSection = new AssessmentSectionStub + return new AssessmentSectionStub { FailureMechanismContribution = { NormativeNorm = NormType.LowerLimit }, HydraulicBoundaryDatabase = { - FilePath = validFilePath, - Locations = - { - hydraulicBoundaryLocation - } + FilePath = validFilePath } }; + } - assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + private static GrassCoverErosionOutwardsFailureMechanism CreateFailureMechanismWithHydraulicBoundaryOutput(AssessmentSectionStub assessmentSection) + { + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism { - hydraulicBoundaryLocation - }); - - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(9.3); - - return assessmentSection; + Contribution = 5 + }; + GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( + failureMechanism, + assessmentSection, new[] + { + new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0) + }); + failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(9.3); + return failureMechanism; } private static GrassCoverErosionOutwardsWaveConditionsCalculation GetValidCalculation(HydraulicBoundaryLocation location) Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -rf7a6a3b0cee4ef5d04d2dc22b3746fedfd4bf3bd -rcff4b928800b2a49ccaaaa49e7c87755d79b0169 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision f7a6a3b0cee4ef5d04d2dc22b3746fedfd4bf3bd) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision cff4b928800b2a49ccaaaa49e7c87755d79b0169) @@ -35,6 +35,7 @@ using Ringtoets.Common.Service; using Ringtoets.Common.Service.TestUtil; using Ringtoets.GrassCoverErosionOutwards.Data; +using Ringtoets.GrassCoverErosionOutwards.Util.TestUtil; using Ringtoets.HydraRing.Calculation.Calculator.Factory; using Ringtoets.HydraRing.Calculation.Data; using Ringtoets.HydraRing.Calculation.Data.Input.WaveConditions; @@ -448,17 +449,13 @@ calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Twice(); mockRepository.ReplayAll(); - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); calculation.InputParameters.ForeshoreProfile = new TestForeshoreProfile(new BreakWater(BreakWaterType.Dam, breakWaterHeight)); calculation.InputParameters.UseBreakWater = false; - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = 20 - }; - using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // Call @@ -504,12 +501,8 @@ calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Twice(); mockRepository.ReplayAll(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = 20 - }; - - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); switch (calculationType) @@ -567,15 +560,11 @@ public void Calculate_Always_InputPropertiesCorrectlySendToCalculator(BreakWaterType breakWaterType) { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); calculation.InputParameters.BreakWater.Type = breakWaterType; - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = 20 - }; - var waveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator(); var mockRepository = new MockRepository(); @@ -628,14 +617,10 @@ public void Calculate_Canceled_HasNoOutput() { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = 20 - }; - var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); mockRepository.ReplayAll(); @@ -662,13 +647,10 @@ public void Calculate_CancelCalculationWithValidInput_CancelsCalculatorAndHasNullOutput() { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = 20 - }; var waveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator(); var mockRepository = new MockRepository(); @@ -699,14 +681,10 @@ public void Calculate_WithValidInput_SetsOutput() { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = 20 - }; - var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(3); @@ -738,14 +716,10 @@ string detailedReport) { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = 20 - }; - var calculatorThatFails = new TestWaveConditionsCosineCalculator { EndInFailure = endInFailure, @@ -828,15 +802,11 @@ string detailedReport) { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); + GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - const double failureMechanismContribution = 20; - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = failureMechanismContribution - }; - var calculatorThatFails = new TestWaveConditionsCosineCalculator { EndInFailure = endInFailure, @@ -896,7 +866,7 @@ Assert.AreEqual(3, waveConditionsOutputs.Length); double targetNorm = CalculateTargetNorm(assessmentSection.FailureMechanismContribution.Norm, - failureMechanismContribution, + failureMechanism.Contribution, failureMechanism.GeneralInput.N); WaveConditionsOutputTestHelper.AssertFailedOutput(waterLevelUpperBoundaryRevetment, targetNorm, @@ -910,14 +880,10 @@ public void Calculate_HydraulicBoundaryDatabaseWithCanUsePreprocessorFalse_ExpectedPreprocessorDirectorySetToCalculator() { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - var grassCoverErosionOutwardsFailureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = 20 - }; - var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(3); @@ -927,7 +893,7 @@ { // Call new GrassCoverErosionOutwardsWaveConditionsCalculationService().Calculate(calculation, - grassCoverErosionOutwardsFailureMechanism, + failureMechanism, assessmentSection, validFilePath); } @@ -940,14 +906,10 @@ public void Calculate_HydraulicBoundaryDatabaseWithUsePreprocessorTrue_ExpectedPreprocessorDirectorySetToCalculator() { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = 20 - }; - var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, validPreprocessorDirectory)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(3); @@ -974,14 +936,10 @@ public void Calculate_HydraulicBoundaryDatabaseWithUsePreprocessorFalse_ExpectedPreprocessorDirectorySetToCalculator() { // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); + AssessmentSectionStub assessmentSection = CreateAssessmentSection(); + GrassCoverErosionOutwardsFailureMechanism failureMechanism = CreateFailureMechanismWithHydraulicBoundaryOutput(assessmentSection); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = 20 - }; - var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty)).Return(new TestWaveConditionsCosineCalculator()).Repeat.Times(3); @@ -1004,34 +962,35 @@ mockRepository.VerifyAll(); } - private static IAssessmentSection CreateAssessmentSectionWithHydraulicBoundaryOutput() + private static AssessmentSectionStub CreateAssessmentSection() { - var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0); - - var assessmentSection = new AssessmentSectionStub + return new AssessmentSectionStub { FailureMechanismContribution = { NormativeNorm = NormType.LowerLimit }, HydraulicBoundaryDatabase = { - FilePath = validFilePath, - Locations = - { - hydraulicBoundaryLocation - } + FilePath = validFilePath } }; + } - assessmentSection.SetHydraulicBoundaryLocationCalculations(new[] + private static GrassCoverErosionOutwardsFailureMechanism CreateFailureMechanismWithHydraulicBoundaryOutput(AssessmentSectionStub assessmentSection) + { + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism { - hydraulicBoundaryLocation - }); - - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(9.3); - - return assessmentSection; + Contribution = 20 + }; + GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( + failureMechanism, + assessmentSection, new[] + { + new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0) + }); + failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(9.3); + return failureMechanism; } private static double CalculateTargetNorm(double norm, double contribution, RoundedDouble N) Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs =================================================================== diff -u -r2c3c354d3910e788173efc979e04e3701bcdb659 -rcff4b928800b2a49ccaaaa49e7c87755d79b0169 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs (.../WaveConditionsInputViewInfoTest.cs) (revision 2c3c354d3910e788173efc979e04e3701bcdb659) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs (.../WaveConditionsInputViewInfoTest.cs) (revision cff4b928800b2a49ccaaaa49e7c87755d79b0169) @@ -530,6 +530,7 @@ hydraulicBoundaryLocation }); + failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(assessmentLevel); assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(assessmentLevel); yield return new TestCaseData( @@ -543,7 +544,7 @@ } }, assessmentSection, - new GrassCoverErosionOutwardsFailureMechanism()), + failureMechanism), assessmentLevel) .SetName("Grass outwards input context");