Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs =================================================================== diff -u -r72a88039f44f5aaa309780a3f572f2ad2433a8dc -r87eb4d4bbcd9f5f224a87484c53f9ff095d6819e --- Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs (.../RingtoetsDataSynchronizationService.cs) (revision 72a88039f44f5aaa309780a3f572f2ad2433a8dc) +++ Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs (.../RingtoetsDataSynchronizationService.cs) (revision 87eb4d4bbcd9f5f224a87484c53f9ff095d6819e) @@ -155,7 +155,7 @@ /// /// Clears the output of all calculations of the given . /// - /// The failure mechanisms that contains the calculations. + /// The failure mechanisms that contain the calculations. /// An of calculations that are affected by clearing the output. /// Thrown when is null. public static IEnumerable ClearFailureMechanismCalculationOutputs(IEnumerable failureMechanisms) @@ -229,12 +229,13 @@ } /// - /// Clears the hydraulic boundary location calculation output that is contained within specific failure mechanisms of the - /// and within it. + /// Clears the hydraulic boundary location calculation output that is contained + /// within specific failure mechanisms of the . /// - /// The which contains the failure mechanisms. + /// The which contains the hydraulic boundary + /// location calculations and failure mechanisms at stake. /// All objects affected by the operation. - /// Thrown when any parameter is null. + /// Thrown when is null. public static IEnumerable ClearHydraulicBoundaryLocationCalculationOutput(IAssessmentSection assessmentSection) { if (assessmentSection == null) @@ -275,7 +276,7 @@ } /// - /// Clears the hydraulic boundary location calculation output that is contained within specific . + /// Clears the hydraulic boundary location calculation output that is contained within . /// /// The failure mechanisms to clear the hydraulic boundary location calculation output for. /// All objects affected by the operation. Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs =================================================================== diff -u -r89547a60aa8be73beada947969a59050eaca5fb6 -r87eb4d4bbcd9f5f224a87484c53f9ff095d6819e --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs (.../AssessmentSectionCompositionChangeHandlerTest.cs) (revision 89547a60aa8be73beada947969a59050eaca5fb6) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs (.../AssessmentSectionCompositionChangeHandlerTest.cs) (revision 87eb4d4bbcd9f5f224a87484c53f9ff095d6819e) @@ -218,7 +218,7 @@ Assert.True(calculationsWithOutput.All(c => c.HasOutput), "All calculations that had output still have them."); - Assert.True(duneLocationCalculationsWithOutput.All(calc => calc.Output != null)); + Assert.True(duneLocationCalculationsWithOutput.All(HasDuneErosionLocationCalculationOutput)); Assert.True(hydraulicBoundaryLocationCalculationsWithOutput.All(calc => calc.HasOutput)); CollectionAssert.IsEmpty(affectedObjects); @@ -598,7 +598,7 @@ #endregion - #region Dune Erosion Failure Mechanism Helpers + #region Dune Erosion failure mechanism Helpers private static IEnumerable GetAllAffectedDuneErosionLocationCalculations(DuneErosionFailureMechanism failureMechanism) { Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs =================================================================== diff -u -re57e79927485e44d681b0617f17bada42dbfb862 -r87eb4d4bbcd9f5f224a87484c53f9ff095d6819e --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs (.../FailureMechanismContributionNormChangeHandlerTest.cs) (revision e57e79927485e44d681b0617f17bada42dbfb862) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs (.../FailureMechanismContributionNormChangeHandlerTest.cs) (revision 87eb4d4bbcd9f5f224a87484c53f9ff095d6819e) @@ -143,7 +143,7 @@ .Concat(assessmentSection.WaveHeightCalculationsForLowerLimitNorm) .Concat(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm) .Concat(GetAllAffectedGrassCoverErosionOutwardsHydraulicBoundaryLocationCalculations(assessmentSection.GrassCoverErosionOutwards)) - .Concat(GetAllAffectedDuneErosionLocationCalculations(assessmentSection.DuneErosion)) + .Concat(GetAllAffectedDuneLocationCalculations(assessmentSection.DuneErosion)) .Concat(new IObservable[] { assessmentSection.FailureMechanismContribution @@ -196,7 +196,7 @@ .Concat(assessmentSection.WaveHeightCalculationsForLowerLimitNorm) .Concat(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm) .Concat(GetAllAffectedGrassCoverErosionOutwardsHydraulicBoundaryLocationCalculations(assessmentSection.GrassCoverErosionOutwards)) - .Concat(GetAllAffectedDuneErosionLocationCalculations(assessmentSection.DuneErosion)) + .Concat(GetAllAffectedDuneLocationCalculations(assessmentSection.DuneErosion)) .Concat(new IObservable[] { assessmentSection.FailureMechanismContribution @@ -339,7 +339,7 @@ return GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationCalculationsWithOutput(failureMechanism); } - private static IEnumerable GetAllAffectedDuneErosionLocationCalculations(DuneErosionFailureMechanism failureMechanism) + private static IEnumerable GetAllAffectedDuneLocationCalculations(DuneErosionFailureMechanism failureMechanism) { return DuneErosionLocationsTestHelper.GetAllDuneErosionLocationCalculationsWithOutput(failureMechanism); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs =================================================================== diff -u -re57e79927485e44d681b0617f17bada42dbfb862 -r87eb4d4bbcd9f5f224a87484c53f9ff095d6819e --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision e57e79927485e44d681b0617f17bada42dbfb862) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision 87eb4d4bbcd9f5f224a87484c53f9ff095d6819e) @@ -274,9 +274,10 @@ } }; - assessmentSection.DuneErosion.SetDuneLocations(new [] + DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.DuneErosion; + duneErosionFailureMechanism.SetDuneLocations(new[] { - duneLocation1, + duneLocation1, duneLocation2 }); @@ -339,7 +340,19 @@ grassHydraulicBoundaryLocationCalculation5.Output = new TestHydraulicBoundaryLocationCalculationOutput(); grassHydraulicBoundaryLocationCalculation6.Output = new TestHydraulicBoundaryLocationCalculationOutput(); - var expectedAffectedItems = new List + DuneLocationCalculation duneLocationCalculation1 = duneErosionFailureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.First(c => ReferenceEquals(c.DuneLocation, duneLocation1)); + DuneLocationCalculation duneLocationCalculation2 = duneErosionFailureMechanism.CalculationsForMechanismSpecificSignalingNorm.First(c => ReferenceEquals(c.DuneLocation, duneLocation1)); + DuneLocationCalculation duneLocationCalculation3 = duneErosionFailureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.First(c => ReferenceEquals(c.DuneLocation, duneLocation1)); + DuneLocationCalculation duneLocationCalculation4 = duneErosionFailureMechanism.CalculationsForLowerLimitNorm.First(c => ReferenceEquals(c.DuneLocation, duneLocation1)); + DuneLocationCalculation duneLocationCalculation5 = duneErosionFailureMechanism.CalculationsForFactorizedLowerLimitNorm.First(c => ReferenceEquals(c.DuneLocation, duneLocation1)); + + duneLocationCalculation1.Output = new TestDuneLocationCalculationOutput(); + duneLocationCalculation2.Output = new TestDuneLocationCalculationOutput(); + duneLocationCalculation3.Output = new TestDuneLocationCalculationOutput(); + duneLocationCalculation4.Output = new TestDuneLocationCalculationOutput(); + duneLocationCalculation5.Output = new TestDuneLocationCalculationOutput(); + + var expectedAffectedItems = new IObservable[] { hydraulicBoundaryLocationCalculation1, hydraulicBoundaryLocationCalculation2, @@ -355,7 +368,12 @@ grassHydraulicBoundaryLocationCalculation4, grassHydraulicBoundaryLocationCalculation5, grassHydraulicBoundaryLocationCalculation6, - duneLocation1 + duneLocation1, + duneLocationCalculation1, + duneLocationCalculation2, + duneLocationCalculation3, + duneLocationCalculation4, + duneLocationCalculation5 }; // Call @@ -380,6 +398,11 @@ Assert.IsFalse(grassHydraulicBoundaryLocationCalculation6.HasOutput); Assert.IsNull(duneLocation1.Calculation.Output); + Assert.IsNull(duneLocationCalculation1.Output); + Assert.IsNull(duneLocationCalculation2.Output); + Assert.IsNull(duneLocationCalculation3.Output); + Assert.IsNull(duneLocationCalculation4.Output); + Assert.IsNull(duneLocationCalculation5.Output); } [Test]