Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/DuneErosionFailureMechanismPropertyChangeHandler.cs =================================================================== diff -u -r42e0759081ece99db15765b49891acf205c78932 -rcea1f2491818434e4a7030a2e059bc74aa3e0116 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/DuneErosionFailureMechanismPropertyChangeHandler.cs (.../DuneErosionFailureMechanismPropertyChangeHandler.cs) (revision 42e0759081ece99db15765b49891acf205c78932) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/DuneErosionFailureMechanismPropertyChangeHandler.cs (.../DuneErosionFailureMechanismPropertyChangeHandler.cs) (revision cea1f2491818434e4a7030a2e059bc74aa3e0116) @@ -57,7 +57,7 @@ protected override IEnumerable PropertyChanged(DuneErosionFailureMechanism failureMechanism) { return DuneErosionDataSynchronizationService.ClearDuneLocationOutput(failureMechanism.DuneLocations) - .Concat(DuneErosionDataSynchronizationService.ClearDuneCalculationOutputs(failureMechanism)); + .Concat(DuneErosionDataSynchronizationService.ClearDuneLocationCalculationOutputs(failureMechanism)); } private static bool HasOutput(DuneLocationCalculation calculation) Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionDataSynchronizationService.cs =================================================================== diff -u -r42e0759081ece99db15765b49891acf205c78932 -rcea1f2491818434e4a7030a2e059bc74aa3e0116 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionDataSynchronizationService.cs (.../DuneErosionDataSynchronizationService.cs) (revision 42e0759081ece99db15765b49891acf205c78932) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionDataSynchronizationService.cs (.../DuneErosionDataSynchronizationService.cs) (revision cea1f2491818434e4a7030a2e059bc74aa3e0116) @@ -122,7 +122,7 @@ /// The failure mechanism for which the output of the calculations needs to be cleared. /// All objects changed during the clear. /// Thrown when is null. - public static IEnumerable ClearDuneCalculationOutputs(DuneErosionFailureMechanism failureMechanism) + public static IEnumerable ClearDuneLocationCalculationOutputs(DuneErosionFailureMechanism failureMechanism) { if (failureMechanism == null) { Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionDataSynchronizationServiceTest.cs =================================================================== diff -u -rec1e4f62c58b26f210abb351704a1772f29cf006 -rcea1f2491818434e4a7030a2e059bc74aa3e0116 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionDataSynchronizationServiceTest.cs (.../DuneErosionDataSynchronizationServiceTest.cs) (revision ec1e4f62c58b26f210abb351704a1772f29cf006) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionDataSynchronizationServiceTest.cs (.../DuneErosionDataSynchronizationServiceTest.cs) (revision cea1f2491818434e4a7030a2e059bc74aa3e0116) @@ -257,18 +257,18 @@ } [Test] - public void ClearDuneCalculationOutputs_FailureMechanismNull_ThrowsArgumentNullException() + public void ClearDuneLocationCalculationOutputs_FailureMechanismNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => DuneErosionDataSynchronizationService.ClearDuneCalculationOutputs(null); + TestDelegate call = () => DuneErosionDataSynchronizationService.ClearDuneLocationCalculationOutputs(null); // Assert var exception = Assert.Throws(call); Assert.AreEqual("failureMechanism", exception.ParamName); } [Test] - public void ClearDuneCalculationOutputs_CalculationsWithOutput_OutputClearedAndAffectedItemsReturned() + public void ClearDuneLocationCalculationOutputs_CalculationsWithOutput_OutputClearedAndAffectedItemsReturned() { // Setup var duneLocations = new[] @@ -290,7 +290,7 @@ DuneLocationCalculationsTestHelper.GetAllDuneLocationCalculationsWithOutput(failureMechanism); // Call - IEnumerable affected = DuneErosionDataSynchronizationService.ClearDuneCalculationOutputs(failureMechanism); + IEnumerable affected = DuneErosionDataSynchronizationService.ClearDuneLocationCalculationOutputs(failureMechanism); // Assert CollectionAssert.AreEquivalent(expectedAffectedCalculations, affected); Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs =================================================================== diff -u -r87eb4d4bbcd9f5f224a87484c53f9ff095d6819e -rcea1f2491818434e4a7030a2e059bc74aa3e0116 --- Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs (.../RingtoetsDataSynchronizationService.cs) (revision 87eb4d4bbcd9f5f224a87484c53f9ff095d6819e) +++ Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs (.../RingtoetsDataSynchronizationService.cs) (revision cea1f2491818434e4a7030a2e059bc74aa3e0116) @@ -303,7 +303,7 @@ { IEnumerable affectedDuneLocations = DuneErosionDataSynchronizationService.ClearDuneLocationOutput(duneErosionFailureMechanism.DuneLocations) - .Concat(DuneErosionDataSynchronizationService.ClearDuneCalculationOutputs(duneErosionFailureMechanism)); + .Concat(DuneErosionDataSynchronizationService.ClearDuneLocationCalculationOutputs(duneErosionFailureMechanism)); changedObservables.AddRange(affectedDuneLocations); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs =================================================================== diff -u -rec1e4f62c58b26f210abb351704a1772f29cf006 -rcea1f2491818434e4a7030a2e059bc74aa3e0116 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs (.../AssessmentSectionCompositionChangeHandlerTest.cs) (revision ec1e4f62c58b26f210abb351704a1772f29cf006) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs (.../AssessmentSectionCompositionChangeHandlerTest.cs) (revision cea1f2491818434e4a7030a2e059bc74aa3e0116) @@ -198,11 +198,11 @@ DuneLocationCalculation[] duneLocationCalculationsWithOutput = assessmentSection.DuneErosion.DuneLocations.Select(loc => loc.Calculation) .Where(calc => calc.Output != null) - .Concat(assessmentSection.DuneErosion.CalculationsForMechanismSpecificFactorizedSignalingNorm.Where(HasDuneErosionLocationCalculationOutput)) - .Concat(assessmentSection.DuneErosion.CalculationsForMechanismSpecificSignalingNorm.Where(HasDuneErosionLocationCalculationOutput)) - .Concat(assessmentSection.DuneErosion.CalculationsForMechanismSpecificLowerLimitNorm.Where(HasDuneErosionLocationCalculationOutput)) - .Concat(assessmentSection.DuneErosion.CalculationsForLowerLimitNorm.Where(HasDuneErosionLocationCalculationOutput)) - .Concat(assessmentSection.DuneErosion.CalculationsForFactorizedLowerLimitNorm.Where(HasDuneErosionLocationCalculationOutput)) + .Concat(assessmentSection.DuneErosion.CalculationsForMechanismSpecificFactorizedSignalingNorm.Where(HasDuneLocationCalculationOutput)) + .Concat(assessmentSection.DuneErosion.CalculationsForMechanismSpecificSignalingNorm.Where(HasDuneLocationCalculationOutput)) + .Concat(assessmentSection.DuneErosion.CalculationsForMechanismSpecificLowerLimitNorm.Where(HasDuneLocationCalculationOutput)) + .Concat(assessmentSection.DuneErosion.CalculationsForLowerLimitNorm.Where(HasDuneLocationCalculationOutput)) + .Concat(assessmentSection.DuneErosion.CalculationsForFactorizedLowerLimitNorm.Where(HasDuneLocationCalculationOutput)) .ToArray(); GrassCoverErosionOutwardsFailureMechanism failureMechanism = assessmentSection.GrassCoverErosionOutwards; @@ -218,7 +218,7 @@ Assert.True(calculationsWithOutput.All(c => c.HasOutput), "All calculations that had output still have them."); - Assert.True(duneLocationCalculationsWithOutput.All(HasDuneErosionLocationCalculationOutput)); + Assert.True(duneLocationCalculationsWithOutput.All(HasDuneLocationCalculationOutput)); Assert.True(hydraulicBoundaryLocationCalculationsWithOutput.All(calc => calc.HasOutput)); CollectionAssert.IsEmpty(affectedObjects); @@ -245,7 +245,7 @@ GrassCoverErosionOutwardsFailureMechanism grassCoverErosionOutwardsFailureMechanism = assessmentSection.GrassCoverErosionOutwards; DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.DuneErosion; - IEnumerable expectedAffectedObjects = GetAllAffectedDuneErosionLocationCalculations(duneErosionFailureMechanism) + IEnumerable expectedAffectedObjects = GetAllAffectedDuneLocationCalculations(duneErosionFailureMechanism) .Concat(GetAllAffectedGrassCoverErosionOutwardsCalculations(grassCoverErosionOutwardsFailureMechanism)) .Concat(new IObservable[] { @@ -305,7 +305,7 @@ GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationCalculationsWithOutput(grassCoverErosionOutwardsFailureMechanism); DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.DuneErosion; - IEnumerable expectedAffectedObjects = GetAllAffectedDuneErosionLocationCalculations(duneErosionFailureMechanism) + IEnumerable expectedAffectedObjects = GetAllAffectedDuneLocationCalculations(duneErosionFailureMechanism) .Concat(new IObservable[] { assessmentSection @@ -349,7 +349,7 @@ GrassCoverErosionOutwardsFailureMechanism grassCoverErosionOutwardsFailureMechanism = assessmentSection.GrassCoverErosionOutwards; DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.DuneErosion; IEnumerable expectedAffectedObjects = - GetAllAffectedDuneErosionLocationCalculations(duneErosionFailureMechanism) + GetAllAffectedDuneLocationCalculations(duneErosionFailureMechanism) .Concat(GetAllAffectedGrassCoverErosionOutwardsCalculations(grassCoverErosionOutwardsFailureMechanism)) .Concat(new IObservable[] { @@ -397,7 +397,7 @@ DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.DuneErosion; IEnumerable expectedAffectedObjects = - GetAllAffectedDuneErosionLocationCalculations(duneErosionFailureMechanism).Concat(new IObservable[] + GetAllAffectedDuneLocationCalculations(duneErosionFailureMechanism).Concat(new IObservable[] { assessmentSection }) @@ -600,12 +600,12 @@ #region Dune Erosion failure mechanism Helpers - private static IEnumerable GetAllAffectedDuneErosionLocationCalculations(DuneErosionFailureMechanism failureMechanism) + private static IEnumerable GetAllAffectedDuneLocationCalculations(DuneErosionFailureMechanism failureMechanism) { return DuneLocationCalculationsTestHelper.GetAllDuneLocationCalculationsWithOutput(failureMechanism); } - private static bool HasDuneErosionLocationCalculationOutput(DuneLocationCalculation calculation) + private static bool HasDuneLocationCalculationOutput(DuneLocationCalculation calculation) { return calculation.Output != null; }