Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/StrengthStabilityLengthwiseConstructionResultViewTest.cs =================================================================== diff -u -r76c2371398aaacdc8ee6b0c8debd722a747519db -r94ca10cc638e4d7ceb513a0eb548e6953f2c97df --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/StrengthStabilityLengthwiseConstructionResultViewTest.cs (.../StrengthStabilityLengthwiseConstructionResultViewTest.cs) (revision 76c2371398aaacdc8ee6b0c8debd722a747519db) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/StrengthStabilityLengthwiseConstructionResultViewTest.cs (.../StrengthStabilityLengthwiseConstructionResultViewTest.cs) (revision 94ca10cc638e4d7ceb513a0eb548e6953f2c97df) @@ -51,14 +51,12 @@ // Then 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); @@ -83,13 +81,11 @@ var result1 = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(section1) { AssessmentLayerOne = true, - AssessmentLayerTwoA = (RoundedDouble) random.NextDouble(), AssessmentLayerThree = (RoundedDouble) random.NextDouble() }; var result2 = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(section2) { AssessmentLayerOne = false, - AssessmentLayerTwoA = (RoundedDouble) random.NextDouble(), AssessmentLayerThree = (RoundedDouble) random.NextDouble() }; @@ -113,23 +109,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(string.Format("{0}", result1.AssessmentLayerTwoA), cells[assessmentLayerTwoAIndex].FormattedValue); 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(string.Format("{0}", result2.AssessmentLayerTwoA), cells[assessmentLayerTwoAIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", result2.AssessmentLayerThree), cells[assessmentLayerThreeIndex].FormattedValue); - AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); } } @@ -147,7 +139,6 @@ var result = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(section) { AssessmentLayerOne = false, - AssessmentLayerTwoA = (RoundedDouble)random.NextDouble(), AssessmentLayerThree = (RoundedDouble)random.NextDouble() }; using (var form = new Form()) @@ -172,9 +163,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]); } } @@ -219,8 +209,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) {