Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -r08864bba0658cfabadff39a42013580b5bbb0447 -r290fe157361c0f00acae1d091d671e1a1559acba --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs) (revision 08864bba0658cfabadff39a42013580b5bbb0447) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs) (revision 290fe157361c0f00acae1d091d671e1a1559acba) @@ -22,7 +22,7 @@ using System.Windows.Forms; using NUnit.Extensions.Forms; using NUnit.Framework; -using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.AssemblyTool.Forms; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.Views; using Ringtoets.Common.Primitives; @@ -35,9 +35,14 @@ public class GrassCoverErosionOutwardsFailureMechanismResultViewTest { private const int nameColumnIndex = 0; - private const int simpleAssessmentIndex = 1; - private const int assessmentLayerTwoAIndex = 2; - private const int assessmentLayerThreeIndex = 3; + private const int simpleAssessmentResultIndex = 1; + private const int detailedAssessmentResultForFactorizedSignalingNormIndex = 2; + private const int detailedAssessmentResultForSignalingNormIndex = 3; + private const int detailedAssessmentResultForMechanismSpecificLowerLimitNormIndex = 4; + private const int detailedAssessmentResultForLowerLimitNormIndex = 5; + private const int detailedAssessmentResultForFactorizedLowerLimitNormIndex = 6; + private const int tailorMadeResultIndex = 7; + private const int columnCount = 8; [Test] public void Constructor_ExpectedValues() @@ -74,15 +79,24 @@ // Then var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; - Assert.AreEqual(4, dataGridView.ColumnCount); + Assert.AreEqual(columnCount, dataGridView.ColumnCount); - Assert.IsInstanceOf(dataGridView.Columns[simpleAssessmentIndex]); - Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerTwoAIndex]); - Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerThreeIndex]); + Assert.IsInstanceOf(dataGridView.Columns[nameColumnIndex]); + Assert.IsInstanceOf(dataGridView.Columns[simpleAssessmentResultIndex]); + Assert.IsInstanceOf(dataGridView.Columns[detailedAssessmentResultForFactorizedSignalingNormIndex]); + Assert.IsInstanceOf(dataGridView.Columns[detailedAssessmentResultForSignalingNormIndex]); + Assert.IsInstanceOf(dataGridView.Columns[detailedAssessmentResultForMechanismSpecificLowerLimitNormIndex]); + Assert.IsInstanceOf(dataGridView.Columns[detailedAssessmentResultForLowerLimitNormIndex]); + Assert.IsInstanceOf(dataGridView.Columns[detailedAssessmentResultForFactorizedLowerLimitNormIndex]); + Assert.IsInstanceOf(dataGridView.Columns[tailorMadeResultIndex]); - Assert.AreEqual("Eenvoudige toets", dataGridView.Columns[simpleAssessmentIndex].HeaderText); - Assert.AreEqual("Gedetailleerde toets per vak", dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText); - Assert.AreEqual("Toets op maat", dataGridView.Columns[assessmentLayerThreeIndex].HeaderText); + Assert.AreEqual("Eenvoudige toets", dataGridView.Columns[simpleAssessmentResultIndex].HeaderText); + Assert.AreEqual("Gedetailleerde toets\r\nper vak\r\nCat. Iv - IIv", dataGridView.Columns[detailedAssessmentResultForFactorizedSignalingNormIndex].HeaderText); + Assert.AreEqual("Gedetailleerde toets\r\nper vak\r\nCat. IIv - IIIv", dataGridView.Columns[detailedAssessmentResultForSignalingNormIndex].HeaderText); + Assert.AreEqual("Gedetailleerde toets\r\nper vak\r\nCat. IIIv - IVv", dataGridView.Columns[detailedAssessmentResultForMechanismSpecificLowerLimitNormIndex].HeaderText); + Assert.AreEqual("Gedetailleerde toets\r\nper vak\r\nCat. IVv - Vv", dataGridView.Columns[detailedAssessmentResultForLowerLimitNormIndex].HeaderText); + Assert.AreEqual("Gedetailleerde toets\r\nper vak\r\nCat. Vv - VIv", dataGridView.Columns[detailedAssessmentResultForFactorizedLowerLimitNormIndex].HeaderText); + Assert.AreEqual("Toets op maat", dataGridView.Columns[tailorMadeResultIndex].HeaderText); Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode); Assert.AreEqual(DataGridViewContentAlignment.MiddleCenter, dataGridView.ColumnHeadersDefaultCellStyle.Alignment); @@ -110,11 +124,14 @@ Assert.AreEqual(1, rows.Count); DataGridViewCellCollection cells = rows[0].Cells; - Assert.AreEqual(4, cells.Count); + Assert.AreEqual(columnCount, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); - Assert.AreEqual(SimpleAssessmentResultType.None, cells[simpleAssessmentIndex].Value); - Assert.AreEqual(AssessmentLayerTwoAResult.NotCalculated, cells[assessmentLayerTwoAIndex].Value); - Assert.AreEqual("-", cells[assessmentLayerThreeIndex].FormattedValue); + Assert.AreEqual(DetailedAssessmentResultType.None, cells[detailedAssessmentResultForFactorizedSignalingNormIndex].Value); + Assert.AreEqual(DetailedAssessmentResultType.None, cells[detailedAssessmentResultForSignalingNormIndex].Value); + Assert.AreEqual(DetailedAssessmentResultType.None, cells[detailedAssessmentResultForMechanismSpecificLowerLimitNormIndex].Value); + Assert.AreEqual(DetailedAssessmentResultType.None, cells[detailedAssessmentResultForLowerLimitNormIndex].Value); + Assert.AreEqual(DetailedAssessmentResultType.None, cells[detailedAssessmentResultForFactorizedLowerLimitNormIndex].Value); + Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroup.None, cells[tailorMadeResultIndex].Value); } } }