Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/DuneLocationsTestHelper.cs =================================================================== diff -u -re9ffbddef7cf414f44668847e1610cecc9429fb7 -r63592451403fb2e50a44741bdb1cb09cb8bfbcb4 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/DuneLocationsTestHelper.cs (.../DuneLocationsTestHelper.cs) (revision e9ffbddef7cf414f44668847e1610cecc9429fb7) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/DuneLocationsTestHelper.cs (.../DuneLocationsTestHelper.cs) (revision 63592451403fb2e50a44741bdb1cb09cb8bfbcb4) @@ -28,17 +28,15 @@ namespace Ringtoets.DuneErosion.Data.TestUtil { /// - /// Test helper for dealing with dune locations and calculations in - /// . + /// Test helper for dealing with dune location calculations in . /// public static class DuneLocationsTestHelper { /// - /// Gets all the and - /// that have an output within the . + /// Gets all the dune location calculations within the that have an output. /// - /// The failure mechanism to retrieve the dune locations and calculations from. - /// A collection of all the dune locations and calculations that contain an output. + /// The failure mechanism to retrieve the dune location calculations from. + /// A collection of all dune location calculations that contain an output. /// Thrown when is null. public static IEnumerable GetAllDuneLocationCalculationsWithOutput(DuneErosionFailureMechanism failureMechanism) { @@ -47,8 +45,7 @@ throw new ArgumentNullException(nameof(failureMechanism)); } - return failureMechanism.DuneLocations.Where(loc => loc.Calculation.Output != null).Cast() - .Concat(failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.Where(HasDuneLocationCalculationOutput)) + return failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.Where(HasDuneLocationCalculationOutput) .Concat(failureMechanism.CalculationsForMechanismSpecificSignalingNorm.Where(HasDuneLocationCalculationOutput)) .Concat(failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.Where(HasDuneLocationCalculationOutput)) .Concat(failureMechanism.CalculationsForLowerLimitNorm.Where(HasDuneLocationCalculationOutput)) @@ -57,12 +54,11 @@ } /// - /// Asserts if all the dune locations and calculations within the - /// have no outputs. + /// Asserts if all the dune location calculations within the have no output. /// /// The failure mechanism to assert. /// Thrown when is null. - /// Thrown when any of the dune locations and calculations within the + /// Thrown when any of the dune location calculations within the /// contains output. public static void AssertDuneLocationCalculationsHaveNoOutputs(DuneErosionFailureMechanism failureMechanism) { @@ -71,8 +67,6 @@ throw new ArgumentNullException(nameof(failureMechanism)); } - Assert.True(failureMechanism.DuneLocations.All(dl => !HasDuneLocationCalculationOutput(dl.Calculation))); - Assert.True(failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.All(calc => !HasDuneLocationCalculationOutput(calc))); Assert.True(failureMechanism.CalculationsForMechanismSpecificSignalingNorm.All(calc => !HasDuneLocationCalculationOutput(calc))); Assert.True(failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.All(calc => !HasDuneLocationCalculationOutput(calc))); @@ -81,7 +75,7 @@ } /// - /// Sets dummy dune location calculation output for all dune location calculations within . + /// Sets dummy output for all dune location calculations within . /// /// The failure mechanism to set the dune location calculation outputs for. /// Thrown when is null.