Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionTest.cs =================================================================== diff -u -r20bb156dfc129b1602ddbcddc73c0806807f19ab -r7ddd944b70d252ae493bba48ea9b31c01634082d --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision 20bb156dfc129b1602ddbcddc73c0806807f19ab) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision 7ddd944b70d252ae493bba48ea9b31c01634082d) @@ -28,9 +28,6 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Contribution; using Ringtoets.Common.Data.FailureMechanism; -using Ringtoets.GrassCoverErosionInwards.Data; -using Ringtoets.Integration.Data.StandAlone; -using Ringtoets.Piping.Data; using RingtoetsIntegrationResources = Ringtoets.Integration.Data.Properties.Resources; namespace Ringtoets.Integration.Data.Test @@ -91,7 +88,7 @@ duneErosionName, otherName }; - + var codes = new[] { pipingCode, @@ -151,6 +148,8 @@ Assert.AreEqual(30000.0, section.PipingFailureMechanism.NormProbabilityInput.Norm); Assert.AreEqual(double.NaN, section.PipingFailureMechanism.NormProbabilityInput.SectionLength); + Assert.AreEqual(30000.0, section.HeightStructures.NormProbabilityInput.Norm); + Assert.AreEqual(sum, section.FailureMechanismContribution.Distribution.Sum(d => d.Contribution)); } @@ -254,25 +253,6 @@ Assert.AreEqual(expectedNorm, otherContributionItem.ProbabilitySpace); } - private IFailureMechanism[] GetExpectedContributingFailureMechanisms(AssessmentSection section) - { - return new IFailureMechanism[] - { - section.PipingFailureMechanism, - section.GrassCoverErosionInwards, - section.MacrostabilityInwards, - section.StabilityStoneCover, - section.WaveImpactAsphaltCover, - section.GrassCoverErosionOutwards, - section.GrassCoverSlipOffOutwards, - section.HeightStructures, - section.ClosingStructure, - section.PipingStructure, - section.StrengthStabilityPointConstruction, - section.DuneErosion, - }; - } - [Test] [TestCase(AssessmentSectionComposition.Dike)] [TestCase(AssessmentSectionComposition.Dune)] @@ -347,6 +327,25 @@ Assert.AreEqual(double.NaN, assessmentSection.PipingFailureMechanism.NormProbabilityInput.SectionLength); } + private IFailureMechanism[] GetExpectedContributingFailureMechanisms(AssessmentSection section) + { + return new IFailureMechanism[] + { + section.PipingFailureMechanism, + section.GrassCoverErosionInwards, + section.MacrostabilityInwards, + section.StabilityStoneCover, + section.WaveImpactAsphaltCover, + section.GrassCoverErosionOutwards, + section.GrassCoverSlipOffOutwards, + section.HeightStructures, + section.ClosingStructure, + section.PipingStructure, + section.StrengthStabilityPointConstruction, + section.DuneErosion, + }; + } + private void AssertExpectedContributions(AssessmentSectionComposition composition, AssessmentSection assessmentSection) { double[] contributions = GetContributionsArray(composition);