Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/AssessmentSectionHelperTest.cs =================================================================== diff -u -rdcc94dbcc481ef9f6f83308b82096f85f9cb6f01 -rf432893149ee8f4e74d4c21f082974fb89916150 --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/AssessmentSectionHelperTest.cs (.../AssessmentSectionHelperTest.cs) (revision dcc94dbcc481ef9f6f83308b82096f85f9cb6f01) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/AssessmentSectionHelperTest.cs (.../AssessmentSectionHelperTest.cs) (revision f432893149ee8f4e74d4c21f082974fb89916150) @@ -24,6 +24,7 @@ using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Common.Data.Contribution; using Ringtoets.Common.Data.Hydraulics; namespace Ringtoets.Common.Data.TestUtil.Test @@ -57,7 +58,6 @@ { failureMechanism }, assessmentSection.GetFailureMechanisms()); - Assert.AreEqual(1.0 / 10, assessmentSection.FailureMechanismContribution.Norm); Assert.AreEqual(1.0 / 10, assessmentSection.FailureMechanismContribution.LowerLimitNorm); Assert.AreEqual(1.0 / 30000, assessmentSection.FailureMechanismContribution.SignalingNorm); mocks.VerifyAll(); @@ -90,9 +90,11 @@ { failureMechanism }, assessmentSection.GetFailureMechanisms()); - Assert.AreEqual(1.0 / 10, assessmentSection.FailureMechanismContribution.Norm); - Assert.AreEqual(1.0 / 10, assessmentSection.FailureMechanismContribution.LowerLimitNorm); - Assert.AreEqual(1.0 / 30000, assessmentSection.FailureMechanismContribution.SignalingNorm); + + FailureMechanismContribution contribution = assessmentSection.FailureMechanismContribution; + Assert.AreEqual(1.0 / 10, contribution.LowerLimitNorm); + Assert.AreEqual(1.0 / 30000, contribution.SignalingNorm); + Assert.AreEqual(NormType.LowerLimit, contribution.NormativeNorm); mocks.VerifyAll(); } @@ -114,9 +116,11 @@ { failureMechanism }, assessmentSection.GetFailureMechanisms()); - Assert.AreEqual(1.0 / 10, assessmentSection.FailureMechanismContribution.Norm); - Assert.AreEqual(1.0 / 10, assessmentSection.FailureMechanismContribution.LowerLimitNorm); - Assert.AreEqual(1.0 / 30000, assessmentSection.FailureMechanismContribution.SignalingNorm); + + FailureMechanismContribution contribution = assessmentSection.FailureMechanismContribution; + Assert.AreEqual(1.0 / 10, contribution.LowerLimitNorm); + Assert.AreEqual(1.0 / 30000, contribution.SignalingNorm); + Assert.AreEqual(NormType.LowerLimit, contribution.NormativeNorm); mocks.VerifyAll(); } @@ -134,9 +138,11 @@ Assert.AreEqual("21", assessmentSection.Id); Assert.IsNull(assessmentSection.HydraulicBoundaryDatabase); CollectionAssert.IsEmpty(assessmentSection.GetFailureMechanisms()); - Assert.AreEqual(1.0 / 10, assessmentSection.FailureMechanismContribution.Norm); - Assert.AreEqual(1.0 / 10, assessmentSection.FailureMechanismContribution.LowerLimitNorm); - Assert.AreEqual(1.0 / 30000, assessmentSection.FailureMechanismContribution.SignalingNorm); + + FailureMechanismContribution contribution = assessmentSection.FailureMechanismContribution; + Assert.AreEqual(1.0 / 10, contribution.LowerLimitNorm); + Assert.AreEqual(1.0 / 30000, contribution.SignalingNorm); + Assert.AreEqual(NormType.LowerLimit, contribution.NormativeNorm); mocks.VerifyAll(); } }