Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs =================================================================== diff -u -r4d2271ee60b40225ccfeb4a8eadc40c7e0fae357 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs (.../HeightStructuresFailureMechanismResultViewTest.cs) (revision 4d2271ee60b40225ccfeb4a8eadc40c7e0fae357) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs (.../HeightStructuresFailureMechanismResultViewTest.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -74,7 +74,7 @@ // Assert var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; - Assert.AreEqual(5, dataGridView.ColumnCount); + Assert.AreEqual(4, dataGridView.ColumnCount); Assert.IsTrue(dataGridView.Columns[assessmentLayerTwoAIndex].ReadOnly); foreach (var column in dataGridView.Columns.OfType()) @@ -155,19 +155,17 @@ 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.IsFalse((bool)cells[assessmentLayerOneIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", 0), cells[assessmentLayerTwoAIndex].FormattedValue); - Assert.AreEqual(string.Format("{0}", 0), cells[assessmentLayerTwoBIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", 0), cells[assessmentLayerThreeIndex].FormattedValue); cells = rows[1].Cells; - Assert.AreEqual(5, cells.Count); + Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 2", cells[nameColumnIndex].FormattedValue); Assert.IsFalse((bool)cells[assessmentLayerOneIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", 0), cells[assessmentLayerTwoAIndex].FormattedValue); - Assert.AreEqual(string.Format("{0}", 0), cells[assessmentLayerTwoBIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", 0), cells[assessmentLayerThreeIndex].FormattedValue); } } @@ -189,52 +187,41 @@ var rows = dataGridView.Rows; var cells = rows[0].Cells; - Assert.AreEqual(5, cells.Count); + Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); var cellAssessmentLayerTwoA = cells[assessmentLayerTwoAIndex]; - var cellAssessmentLayerTwoB = cells[assessmentLayerTwoBIndex]; var cellAssessmentLayerThree = cells[assessmentLayerThreeIndex]; Assert.AreEqual(checkBoxSelected, (bool)cells[assessmentLayerOneIndex].FormattedValue); Assert.AreEqual(string.Format("{0}", 0), cellAssessmentLayerTwoA.FormattedValue); - Assert.AreEqual(string.Format("{0}", 0), cellAssessmentLayerTwoB.FormattedValue); Assert.AreEqual(string.Format("{0}", 0), cellAssessmentLayerThree.FormattedValue); var cellAssessmentLayerTwoABackColor = cellAssessmentLayerTwoA.Style.BackColor; var cellAssessmentLayerTwoAForeColor = cellAssessmentLayerTwoA.Style.ForeColor; - var cellAssessmentLayerTwoBBackColor = cellAssessmentLayerTwoB.Style.BackColor; - var cellAssessmentLayerTwoBForeColor = cellAssessmentLayerTwoB.Style.ForeColor; var cellAssessmentLayerThreeBackColor = cellAssessmentLayerThree.Style.BackColor; var cellAssessmentLayerThreeForeColor = cellAssessmentLayerThree.Style.ForeColor; if (checkBoxSelected) { Assert.AreEqual(Color.FromKnownColor(KnownColor.DarkGray), cellAssessmentLayerTwoABackColor); Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), cellAssessmentLayerTwoAForeColor); - Assert.AreEqual(Color.FromKnownColor(KnownColor.DarkGray), cellAssessmentLayerTwoBBackColor); - Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), cellAssessmentLayerTwoBForeColor); Assert.AreEqual(Color.FromKnownColor(KnownColor.DarkGray), cellAssessmentLayerThreeBackColor); Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), cellAssessmentLayerThreeForeColor); } else { Assert.AreEqual(Color.FromKnownColor(KnownColor.White), cellAssessmentLayerTwoABackColor); Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), cellAssessmentLayerTwoAForeColor); - Assert.AreEqual(Color.FromKnownColor(KnownColor.White), cellAssessmentLayerTwoBBackColor); - Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), cellAssessmentLayerTwoBForeColor); Assert.AreEqual(Color.FromKnownColor(KnownColor.White), cellAssessmentLayerThreeBackColor); Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), cellAssessmentLayerThreeForeColor); } - Assert.AreEqual(checkBoxSelected, cellAssessmentLayerTwoB.ReadOnly); Assert.AreEqual(checkBoxSelected, cellAssessmentLayerThree.ReadOnly); } } [Test] - [TestCase("test", assessmentLayerTwoBIndex)] [TestCase("test", assessmentLayerThreeIndex)] - [TestCase(";/[].,~!@#$%^&*()_-+={}|?", assessmentLayerTwoBIndex)] [TestCase(";/[].,~!@#$%^&*()_-+={}|?", assessmentLayerThreeIndex)] public void FailureMechanismResultView_EditValueInvalid_ShowsErrorTooltip(string newValue, int cellIndex) { @@ -252,10 +239,6 @@ } [Test] - [TestCase("1", assessmentLayerTwoBIndex, "AssessmentLayerTwoB")] - [TestCase("1e-6", assessmentLayerTwoBIndex, "AssessmentLayerTwoB")] - [TestCase("1e+6", assessmentLayerTwoBIndex, "AssessmentLayerTwoB")] - [TestCase("14.3", assessmentLayerTwoBIndex, "AssessmentLayerTwoB")] [TestCase("1", assessmentLayerThreeIndex, "AssessmentLayerThree")] [TestCase("1e-6", assessmentLayerThreeIndex, "AssessmentLayerThree")] [TestCase("1e+6", assessmentLayerThreeIndex, "AssessmentLayerThree")] @@ -312,8 +295,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 HeightStructuresFailureMechanismResultView ShowFullyConfiguredFailureMechanismResultsView() {