Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs =================================================================== diff -u -rf929dfc072b392b419cd952e527d234ea79890e4 -rbdbeb6758acf92e90161ce96e9b8ea48f5a029f5 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs (.../FailureMechanismContributionViewIntegrationTest.cs) (revision f929dfc072b392b419cd952e527d234ea79890e4) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs (.../FailureMechanismContributionViewIntegrationTest.cs) (revision bdbeb6758acf92e90161ce96e9b8ea48f5a029f5) @@ -28,7 +28,7 @@ using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; -using Ringtoets.Common.Data.Contribution; +using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Integration.Data; using Ringtoets.Integration.Forms.Views; @@ -89,24 +89,24 @@ Assert.IsTrue(dataGridInvalidated, "Expect the DataGridView to be flagged for redrawing."); - AssertDataGridViewDataSource(assessmentSection.FailureMechanismContribution.Distribution, contributionGridView); + AssertDataGridViewDataSource(assessmentSection.GetContributingFailureMechanisms(), contributionGridView, assessmentSection.FailureMechanismContribution.Norm); } mocks.VerifyAll(); } - private static void AssertDataGridViewDataSource(IEnumerable expectedDistributionElements, DataGridView dataGridView) + private static void AssertDataGridViewDataSource(IEnumerable expectedElements, DataGridView dataGridView, double norm) { - FailureMechanismContributionItem[] itemArray = expectedDistributionElements.ToArray(); + IFailureMechanism[] itemArray = expectedElements.ToArray(); Assert.AreEqual(itemArray.Length, dataGridView.RowCount); for (var i = 0; i < itemArray.Length; i++) { - FailureMechanismContributionItem expectedElement = itemArray[i]; + IFailureMechanism expectedElement = itemArray[i]; DataGridViewRow row = dataGridView.Rows[i]; Assert.AreEqual(expectedElement.IsRelevant, row.Cells[isRelevantColumnIndex].Value); - Assert.AreEqual(expectedElement.Assessment, row.Cells[nameColumnIndex].Value); - Assert.AreEqual(expectedElement.AssessmentCode, row.Cells[codeColumnIndex].Value); + Assert.AreEqual(expectedElement.Name, row.Cells[nameColumnIndex].Value); + Assert.AreEqual(expectedElement.Code, row.Cells[codeColumnIndex].Value); Assert.AreEqual(expectedElement.Contribution, row.Cells[contributionColumnIndex].Value); - Assert.AreEqual(expectedElement.ProbabilitySpace, row.Cells[probabilitySpaceColumnIndex].Value); + Assert.AreEqual(100 / (expectedElement.Contribution * norm), row.Cells[probabilitySpaceColumnIndex].Value); } } }