Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/TechnicalInnovationResultViewTest.cs =================================================================== diff -u -r08a279166007321b0ae0f2f15a2f13c191952e1b -r94ca10cc638e4d7ceb513a0eb548e6953f2c97df --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/TechnicalInnovationResultViewTest.cs (.../TechnicalInnovationResultViewTest.cs) (revision 08a279166007321b0ae0f2f15a2f13c191952e1b) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/TechnicalInnovationResultViewTest.cs (.../TechnicalInnovationResultViewTest.cs) (revision 94ca10cc638e4d7ceb513a0eb548e6953f2c97df) @@ -53,14 +53,12 @@ // Assert var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; - Assert.AreEqual(4, dataGridView.ColumnCount); + Assert.AreEqual(3, dataGridView.ColumnCount); Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerOneIndex]); - Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerTwoAIndex]); Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerThreeIndex]); Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, dataGridView.Columns[assessmentLayerOneIndex].HeaderText); - Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText); Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText); Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode); @@ -85,13 +83,11 @@ var result1 = new TechnicalInnovationFailureMechanismSectionResult(section1) { AssessmentLayerOne = true, - AssessmentLayerTwoA = AssessmentLayerTwoAResult.Failed, AssessmentLayerThree = (RoundedDouble) random.NextDouble() }; var result2 = new TechnicalInnovationFailureMechanismSectionResult(section2) { AssessmentLayerOne = false, - AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful, AssessmentLayerThree = (RoundedDouble) random.NextDouble() }; @@ -116,23 +112,19 @@ Assert.AreEqual(2, rows.Count); var cells = rows[0].Cells; - Assert.AreEqual(4, cells.Count); + Assert.AreEqual(3, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(result1.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); - Assert.AreEqual(result1.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(string.Format("{0}", result1.AssessmentLayerThree), cells[assessmentLayerThreeIndex].FormattedValue); - AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); cells = rows[1].Cells; - Assert.AreEqual(4, cells.Count); + Assert.AreEqual(3, cells.Count); Assert.AreEqual("Section 2", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(result2.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); - Assert.AreEqual(result2.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); Assert.AreEqual(string.Format("{0}", result2.AssessmentLayerThree), cells[assessmentLayerThreeIndex].FormattedValue); - AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); } } @@ -150,7 +142,6 @@ var result = new TechnicalInnovationFailureMechanismSectionResult(section) { AssessmentLayerOne = false, - AssessmentLayerTwoA = AssessmentLayerTwoAResult.Failed, AssessmentLayerThree = (RoundedDouble) random.NextDouble() }; using (var form = new Form()) @@ -175,9 +166,8 @@ Assert.AreEqual(1, rows.Count); var cells = rows[0].Cells; - Assert.AreEqual(4, cells.Count); + Assert.AreEqual(3, cells.Count); - AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); } } @@ -222,8 +212,7 @@ private const int nameColumnIndex = 0; private const int assessmentLayerOneIndex = 1; - private const int assessmentLayerTwoAIndex = 2; - private const int assessmentLayerThreeIndex = 3; + private const int assessmentLayerThreeIndex = 2; private void AssertCellIsDisabled(DataGridViewCell dataGridViewCell) {