Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/FailureMechanismContributionTest.cs =================================================================== diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r86a9c649a9ce7ae7d2371e900ba722faa6a8448c --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/FailureMechanismContributionTest.cs (.../FailureMechanismContributionTest.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/FailureMechanismContributionTest.cs (.../FailureMechanismContributionTest.cs) (revision 86a9c649a9ce7ae7d2371e900ba722faa6a8448c) @@ -35,12 +35,12 @@ [TestFixture] public class FailureMechanismContributionTest { - private MockRepository mockRepository; + private MockRepository mocks; [SetUp] public void SetUp() { - mockRepository = new MockRepository(); + mocks = new MockRepository(); } [Test] @@ -139,6 +139,8 @@ Assert.IsTrue(otherFailureMechanismItem.IsAlwaysRelevant); Assert.IsTrue(otherFailureMechanismItem.IsRelevant); Assert.AreEqual(norm, result.Norm); + Assert.AreEqual(norm, result.SignalingNorm); + Assert.AreEqual(norm, result.LowerLimitNorm); } [Test] @@ -162,7 +164,7 @@ { string name = string.Format(namePrefixFormat, i); int contribution = random.Next(1, 100); - var failureMechanism = mockRepository.StrictMock(); + var failureMechanism = mocks.StrictMock(); failureMechanism.Expect(fm => fm.Name).Return(name); failureMechanism.Expect(fm => fm.Contribution).Return(contribution).Repeat.Twice(); @@ -174,7 +176,7 @@ failureMechanismNames.Add("Overig"); failureMechanismContributions.Add(otherContribution); - mockRepository.ReplayAll(); + mocks.ReplayAll(); // Call var result = new FailureMechanismContribution(failureMechanisms, otherContribution, norm); @@ -188,7 +190,7 @@ IEnumerable expectedIsAlwaysRelevant = Enumerable.Repeat(false, failureMechanismCount) .Concat(Enumerable.Repeat(true, 1)); CollectionAssert.AreEqual(expectedIsAlwaysRelevant, result.Distribution.Select(d => d.IsAlwaysRelevant)); - mockRepository.VerifyAll(); + mocks.VerifyAll(); } [Test] @@ -267,7 +269,6 @@ const double contribution3 = 23.45; const double contribution4 = 67.89; - var mocks = new MockRepository(); var failureMechanism1 = mocks.Stub(); failureMechanism1.Contribution = contribution1; failureMechanism1.Stub(fm => fm.Name).Return(name1); @@ -368,9 +369,9 @@ const double norm = 1.0 / 20000; const double newNorm = 1.0 / 30000; - var failureMechanism = mockRepository.Stub(); + var failureMechanism = mocks.Stub(); - mockRepository.ReplayAll(); + mocks.ReplayAll(); var failureMechanismContribution = new FailureMechanismContribution(new[] { @@ -382,7 +383,7 @@ // Assert Assert.AreEqual(Enumerable.Repeat(newNorm, 2), failureMechanismContribution.Distribution.Select(d => d.Norm)); - mockRepository.VerifyAll(); + mocks.VerifyAll(); } private static void AssertFailureProbabilitySpace(double newOtherContribution, double norm, double probabilitySpace)