Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil.Test/TestDataGeneratorTest.cs =================================================================== diff -u -rde7935d9c083905997851deebdf22b1aa3a6220e -rda17f8a510f0b6865dddd4c43b911f53e8421b9e --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil.Test/TestDataGeneratorTest.cs (.../TestDataGeneratorTest.cs) (revision de7935d9c083905997851deebdf22b1aa3a6220e) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil.Test/TestDataGeneratorTest.cs (.../TestDataGeneratorTest.cs) (revision da17f8a510f0b6865dddd4c43b911f53e8421b9e) @@ -56,7 +56,7 @@ // Assert Assert.AreEqual(AssessmentSectionComposition.Dike, assessmentSection.Composition); AssertFailureMechanismsHaveAllPossibleCalculationConfigurations(assessmentSection); - AssertHydraulicBoundaryLocationOutput(assessmentSection, true); + AssertHydraulicBoundaryOutput(assessmentSection, true); DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.GetFailureMechanisms() .OfType() @@ -78,7 +78,7 @@ // Assert Assert.AreEqual(composition, assessmentSection.Composition); AssertFailureMechanismsHaveAllPossibleCalculationConfigurations(assessmentSection); - AssertHydraulicBoundaryLocationOutput(assessmentSection, true); + AssertHydraulicBoundaryOutput(assessmentSection, true); DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.GetFailureMechanisms() .OfType() @@ -96,7 +96,7 @@ // Assert Assert.AreEqual(AssessmentSectionComposition.Dike, assessmentSection.Composition); AssertFailureMechanismsHaveAllPossibleCalculationConfigurations(assessmentSection); - AssertHydraulicBoundaryLocationOutput(assessmentSection, false); + AssertHydraulicBoundaryOutput(assessmentSection, false); Assert.True(assessmentSection.DuneErosion.DuneLocations.All(dl => dl.Calculation.Output == null)); } @@ -113,7 +113,7 @@ // Assert Assert.AreEqual(composition, assessmentSection.Composition); AssertFailureMechanismsHaveAllPossibleCalculationConfigurations(assessmentSection); - AssertHydraulicBoundaryLocationOutput(assessmentSection, false); + AssertHydraulicBoundaryOutput(assessmentSection, false); Assert.True(assessmentSection.DuneErosion.DuneLocations.All(dl => dl.Calculation.Output == null)); } @@ -127,7 +127,7 @@ Assert.AreEqual(AssessmentSectionComposition.Dike, assessmentSection.Composition); AssertFailureMechanismsHaveAllCalculationConfigurationsWithoutCalculationOutputs(assessmentSection); Assert.False(assessmentSection.GetFailureMechanisms().SelectMany(fm => fm.Calculations).All(calc => calc.HasOutput)); - AssertHydraulicBoundaryLocationOutput(assessmentSection, true); + AssertHydraulicBoundaryOutput(assessmentSection, true); DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.GetFailureMechanisms() .OfType() @@ -150,7 +150,7 @@ Assert.AreEqual(composition, assessmentSection.Composition); AssertFailureMechanismsHaveAllCalculationConfigurationsWithoutCalculationOutputs(assessmentSection); Assert.False(assessmentSection.GetFailureMechanisms().SelectMany(fm => fm.Calculations).All(calc => calc.HasOutput)); - AssertHydraulicBoundaryLocationOutput(assessmentSection, true); + AssertHydraulicBoundaryOutput(assessmentSection, true); DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.GetFailureMechanisms() .OfType() @@ -159,16 +159,16 @@ AssertDuneErosionFailureMechanismCalculationConfigurationsWithOutputs(duneErosionFailureMechanism); } - private static void AssertHydraulicBoundaryLocationOutput(AssessmentSection assessmentSection, bool hasOutput) + private static void AssertHydraulicBoundaryOutput(AssessmentSection assessmentSection, bool hasOutput) { - Assert.IsTrue(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.All(c => !c.HasOutput)); - Assert.IsTrue(assessmentSection.WaterLevelCalculationsForSignalingNorm.All(c => !c.HasOutput)); - Assert.IsTrue(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.All(c => !c.HasOutput)); - Assert.IsTrue(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm.All(c => !c.HasOutput)); - Assert.IsTrue(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm.All(c => !c.HasOutput)); - Assert.IsTrue(assessmentSection.WaveHeightCalculationsForSignalingNorm.All(c => !c.HasOutput)); - Assert.IsTrue(assessmentSection.WaveHeightCalculationsForLowerLimitNorm.All(c => !c.HasOutput)); - Assert.IsTrue(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm.All(c => !c.HasOutput)); + Assert.IsTrue(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.All(c => c.HasOutput == hasOutput)); + Assert.IsTrue(assessmentSection.WaterLevelCalculationsForSignalingNorm.All(c => c.HasOutput == hasOutput)); + Assert.IsTrue(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.All(c => c.HasOutput == hasOutput)); + Assert.IsTrue(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm.All(c => c.HasOutput == hasOutput)); + Assert.IsTrue(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm.All(c => c.HasOutput == hasOutput)); + Assert.IsTrue(assessmentSection.WaveHeightCalculationsForSignalingNorm.All(c => c.HasOutput == hasOutput)); + Assert.IsTrue(assessmentSection.WaveHeightCalculationsForLowerLimitNorm.All(c => c.HasOutput == hasOutput)); + Assert.IsTrue(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm.All(c => c.HasOutput == hasOutput)); foreach (HydraulicBoundaryLocation location in assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations) {