Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/ArbitraryProbabilityFailureMechanismResultViewTest.cs =================================================================== diff -u -rb9d20365707e77623054f96f0c8b544e86658e67 -rf5a2d607a5b8053b232c1f3ad572a0acba6a4e3a --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/ArbitraryProbabilityFailureMechanismResultViewTest.cs (.../ArbitraryProbabilityFailureMechanismResultViewTest.cs) (revision b9d20365707e77623054f96f0c8b544e86658e67) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/ArbitraryProbabilityFailureMechanismResultViewTest.cs (.../ArbitraryProbabilityFailureMechanismResultViewTest.cs) (revision f5a2d607a5b8053b232c1f3ad572a0acba6a4e3a) @@ -51,11 +51,10 @@ // Then 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( @@ -67,10 +66,6 @@ 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 ); @@ -98,14 +93,12 @@ { AssessmentLayerOne = true, AssessmentLayerTwoA = (RoundedDouble) random.NextDouble(), - AssessmentLayerTwoB = (RoundedDouble) random.NextDouble(), AssessmentLayerThree = (RoundedDouble) random.NextDouble() }; var result2 = new ArbitraryProbabilityFailureMechanismSectionResult(section2) { AssessmentLayerOne = false, AssessmentLayerTwoA = (RoundedDouble) random.NextDouble(), - AssessmentLayerTwoB = (RoundedDouble) random.NextDouble(), AssessmentLayerThree = (RoundedDouble) random.NextDouble() }; @@ -129,7 +122,7 @@ 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); var expectedAssessmentLayer2AValue1 = (RoundedDouble) (1/result1.AssessmentLayerTwoA); @@ -138,15 +131,13 @@ expectedAssessmentLayer2AValue1 ); Assert.AreEqual(expectedAssessmentLayer2AString1, cells[assessmentLayerTwoAIndex].FormattedValue); - 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); var expectedAssessmentLayer2AValue2 = (RoundedDouble)(1 / result2.AssessmentLayerTwoA); @@ -155,11 +146,9 @@ expectedAssessmentLayer2AValue2 ); Assert.AreEqual(expectedAssessmentLayer2AString2, cells[assessmentLayerTwoAIndex].FormattedValue); - 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]); } } @@ -178,7 +167,6 @@ { AssessmentLayerOne = false, AssessmentLayerTwoA = (RoundedDouble)random.NextDouble(), - AssessmentLayerTwoB = (RoundedDouble)random.NextDouble(), AssessmentLayerThree = (RoundedDouble)random.NextDouble() }; using (var form = new Form()) @@ -203,10 +191,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]); } } @@ -252,8 +239,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) {