Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/DuneErosionLocationsTestHelper.cs
===================================================================
diff -u -r89547a60aa8be73beada947969a59050eaca5fb6 -rcb4c1f4566b0864909cf3a8e821084a4b2412b04
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/DuneErosionLocationsTestHelper.cs (.../DuneErosionLocationsTestHelper.cs) (revision 89547a60aa8be73beada947969a59050eaca5fb6)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/DuneErosionLocationsTestHelper.cs (.../DuneErosionLocationsTestHelper.cs) (revision cb4c1f4566b0864909cf3a8e821084a4b2412b04)
@@ -37,8 +37,8 @@
/// Gets all the and
/// that have an output within the .
///
- /// The failure mechanism to retrieve the dune erosion location and calculations from.
- /// A collection of all the dune erosion location and calculations that contain an output.
+ /// The failure mechanism to retrieve the dune erosion locations and calculations from.
+ /// A collection of all the dune erosion locations and calculations that contain an output.
/// Thrown when is null.
public static IEnumerable GetAllDuneErosionLocationCalculationsWithOutput(DuneErosionFailureMechanism failureMechanism)
{
@@ -57,22 +57,27 @@
}
///
- /// Asserts if all the dune erosion location and calculations within the
+ /// Asserts if all the dune erosion locations and calculations within the
/// have no outputs.
///
/// The failure mechanism to assert.
/// Thrown when is null.
- /// Thrown when any of the dune erosion location and calculations within the
+ /// Thrown when any of the dune erosion locations and calculations within the
/// contains output.
public static void AssertDuneLocationCalculationsHaveNoOutputs(DuneErosionFailureMechanism failureMechanism)
{
- Assert.True(failureMechanism.DuneLocations.All(dl => dl.Calculation.Output == null));
+ if (failureMechanism == null)
+ {
+ throw new ArgumentNullException(nameof(failureMechanism));
+ }
- Assert.True(failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.All(calc => calc.Output == null));
- Assert.True(failureMechanism.CalculationsForMechanismSpecificSignalingNorm.All(calc => calc.Output == null));
- Assert.True(failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.All(calc => calc.Output == null));
- Assert.True(failureMechanism.CalculationsForLowerLimitNorm.All(calc => calc.Output == null));
- Assert.True(failureMechanism.CalculationsForFactorizedLowerLimitNorm.All(calc => calc.Output == null));
+ Assert.True(failureMechanism.DuneLocations.All(dl => !HasDuneErosionLocationCalculationOutput(dl.Calculation)));
+
+ Assert.True(failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.All(calc => !HasDuneErosionLocationCalculationOutput(calc)));
+ Assert.True(failureMechanism.CalculationsForMechanismSpecificSignalingNorm.All(calc => !HasDuneErosionLocationCalculationOutput(calc)));
+ Assert.True(failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.All(calc => !HasDuneErosionLocationCalculationOutput(calc)));
+ Assert.True(failureMechanism.CalculationsForLowerLimitNorm.All(calc => !HasDuneErosionLocationCalculationOutput(calc)));
+ Assert.True(failureMechanism.CalculationsForFactorizedLowerLimitNorm.All(calc => !HasDuneErosionLocationCalculationOutput(calc)));
}
private static bool HasDuneErosionLocationCalculationOutput(DuneLocationCalculation calculation)