Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/FailureMechanismContributionTest.cs =================================================================== diff -u -r74817f4dbb43aa0346f8b839e59370f786c5d452 -recf136a787efcd5d3f171f8aee8930f84a89e80a --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/FailureMechanismContributionTest.cs (.../FailureMechanismContributionTest.cs) (revision 74817f4dbb43aa0346f8b839e59370f786c5d452) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/FailureMechanismContributionTest.cs (.../FailureMechanismContributionTest.cs) (revision ecf136a787efcd5d3f171f8aee8930f84a89e80a) @@ -82,7 +82,7 @@ [TestCase(0)] [TestCase(-1)] [TestCase(-200)] - public void Constructor_WithInvalidNorm_ThrowsArgumentException(int norm) + public void Constructor_WithInvalidNorm_ThrowsArgumentOutOfRangeException(int norm) { // Setup var random = new Random(21); @@ -183,7 +183,7 @@ CollectionAssert.AreEqual(failureMechanismNames, result.Distribution.Select(d => d.Assessment)); CollectionAssert.AreEqual(failureMechanismContributions, result.Distribution.Select(d => d.Contribution)); - CollectionAssert.AreEqual(failureMechanismContributions.Select(c => (norm/c)*100), result.Distribution.Select(d => d.ProbabilitySpace)); + CollectionAssert.AreEqual(failureMechanismContributions.Select(c => (1.0/norm/c)*100), result.Distribution.Select(d => d.ProbabilitySpace)); var expectedIsAlwaysRelevant = Enumerable.Repeat(false, failureMechanismCount) .Concat(Enumerable.Repeat(true, 1)); CollectionAssert.AreEqual(expectedIsAlwaysRelevant, result.Distribution.Select(d => d.IsAlwaysRelevant)); @@ -197,13 +197,13 @@ public void UpdateContributions_NoFailureMechanismsAndValidOtherContribution_UpdateDistribution(double newOtherContribution) { // Setup - IEnumerable failuireMechanisms = Enumerable.Empty(); + IEnumerable failureMechanisms = Enumerable.Empty(); const int norm = 30000; - var failureMechanismContribution = new FailureMechanismContribution(failuireMechanisms, 12.34, norm); + var failureMechanismContribution = new FailureMechanismContribution(failureMechanisms, 12.34, norm); // Call - failureMechanismContribution.UpdateContributions(failuireMechanisms, newOtherContribution); + failureMechanismContribution.UpdateContributions(failureMechanisms, newOtherContribution); // Assert Assert.AreEqual(1, failureMechanismContribution.Distribution.Count()); @@ -238,20 +238,20 @@ failureMechanism4.Stub(fm => fm.Name).Return(name4); mocks.ReplayAll(); - List failuireMechanisms = new List + List failureMechanisms = new List { failureMechanism1, failureMechanism2 }; const int norm = 30000; const double otherContribution = 12.34; - var failureMechanismContribution = new FailureMechanismContribution(failuireMechanisms, otherContribution, norm); + var failureMechanismContribution = new FailureMechanismContribution(failureMechanisms, otherContribution, norm); // Change failureMechanisms after construction of FailureMechanismContribution: - failuireMechanisms.RemoveAt(1); - failuireMechanisms.Add(failureMechanism3); - failuireMechanisms.Add(failureMechanism4); + failureMechanisms.RemoveAt(1); + failureMechanisms.Add(failureMechanism3); + failureMechanisms.Add(failureMechanism4); // Precondition Assert.AreEqual(3, failureMechanismContribution.Distribution.Count()); @@ -271,7 +271,7 @@ CollectionAssert.AreEqual(originalContributionValues, failureMechanismContribution.Distribution.Select(d => d.Contribution)); // Call - failureMechanismContribution.UpdateContributions(failuireMechanisms, newOtherContribution); + failureMechanismContribution.UpdateContributions(failureMechanisms, newOtherContribution); // Assert Assert.AreEqual(4, failureMechanismContribution.Distribution.Count()); @@ -302,8 +302,8 @@ // Setup var random = new Random(21); var otherContribution = random.Next(1, 100); - var norm = 20000; - var newNorm = 30000; + const double norm = 1.0/20000; + const double newNorm = 1.0 / 30000; var failureMechanism = mockRepository.Stub(); @@ -322,9 +322,9 @@ mockRepository.VerifyAll(); } - private void AssertFailureProbabilitySpace(double newOtherContribution, int norm, double probabilitySpace) + private static void AssertFailureProbabilitySpace(double newOtherContribution, int norm, double probabilitySpace) { - double expectedProbabilitySpace = (norm/newOtherContribution)*100.0; + double expectedProbabilitySpace = (1.0/norm/newOtherContribution)*100.0; Assert.AreEqual(expectedProbabilitySpace, probabilitySpace); } }