Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SimpleFailureMechanismResultViewTest.cs =================================================================== diff -u -r565199265c3608d4242ffeecb4e5ec1731e1dc84 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SimpleFailureMechanismResultViewTest.cs (.../SimpleFailureMechanismResultViewTest.cs) (revision 565199265c3608d4242ffeecb4e5ec1731e1dc84) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SimpleFailureMechanismResultViewTest.cs (.../SimpleFailureMechanismResultViewTest.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -53,16 +53,14 @@ // Assert var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; - Assert.AreEqual(5, dataGridView.ColumnCount); + Assert.AreEqual(4, dataGridView.ColumnCount); Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerOneIndex]); Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerTwoAIndex]); - Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerTwoBIndex]); 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_two_b, dataGridView.Columns[assessmentLayerTwoBIndex].HeaderText); Assert.AreEqual(Resources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText); Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode); @@ -88,14 +86,12 @@ { AssessmentLayerOne = true, AssessmentLayerTwoA = AssessmentLayerTwoAResult.Failed, - AssessmentLayerTwoB = (RoundedDouble) random.NextDouble(), AssessmentLayerThree = (RoundedDouble) random.NextDouble() }; var result2 = new SimpleFailureMechanismSectionResult(section2) { AssessmentLayerOne = false, AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful, - AssessmentLayerTwoB = (RoundedDouble) random.NextDouble(), AssessmentLayerThree = (RoundedDouble) random.NextDouble() }; @@ -120,27 +116,23 @@ Assert.AreEqual(2, rows.Count); var cells = rows[0].Cells; - Assert.AreEqual(5, cells.Count); + Assert.AreEqual(4, 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.AssessmentLayerTwoB), cells[assessmentLayerTwoBIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", result1.AssessmentLayerThree), cells[assessmentLayerThreeIndex].FormattedValue); AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - AssertCellIsDisabled(cells[assessmentLayerTwoBIndex]); AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); cells = rows[1].Cells; - Assert.AreEqual(5, cells.Count); + Assert.AreEqual(4, 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.AssessmentLayerTwoB), cells[assessmentLayerTwoBIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", result2.AssessmentLayerThree), cells[assessmentLayerThreeIndex].FormattedValue); AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - AssertCellIsEnabled(cells[assessmentLayerTwoBIndex]); AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); } } @@ -159,7 +151,6 @@ { AssessmentLayerOne = false, AssessmentLayerTwoA = AssessmentLayerTwoAResult.Failed, - AssessmentLayerTwoB = (RoundedDouble) random.NextDouble(), AssessmentLayerThree = (RoundedDouble) random.NextDouble() }; using (var form = new Form()) @@ -184,10 +175,9 @@ Assert.AreEqual(1, rows.Count); var cells = rows[0].Cells; - Assert.AreEqual(5, cells.Count); + Assert.AreEqual(4, cells.Count); AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - AssertCellIsDisabled(cells[assessmentLayerTwoBIndex]); AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); } } @@ -233,8 +223,7 @@ private const int nameColumnIndex = 0; private const int assessmentLayerOneIndex = 1; private const int assessmentLayerTwoAIndex = 2; - private const int assessmentLayerTwoBIndex = 3; - private const int assessmentLayerThreeIndex = 4; + private const int assessmentLayerThreeIndex = 3; private void AssertCellIsDisabled(DataGridViewCell dataGridViewCell) {