Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultPerSectionView.cs =================================================================== diff -u -r764e091fd9cde60228960a6ba3e3736e4e4fd7bd -r0dd252090f721cdb4bd831fe473d698d2ddac82c --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultPerSectionView.cs (.../AssemblyResultPerSectionView.cs) (revision 764e091fd9cde60228960a6ba3e3736e4e4fd7bd) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultPerSectionView.cs (.../AssemblyResultPerSectionView.cs) (revision 0dd252090f721cdb4bd831fe473d698d2ddac82c) @@ -191,14 +191,14 @@ SetSpecificFailurePathTextBoxColumns(); SetDataSource(); - + dataGridViewControl.CellFormatting += HandleCellStyling; } private void RefreshAssemblyResults_Click(object sender, EventArgs e) { dataGridViewControl.CellFormatting -= HandleCellStyling; - + refreshAssemblyResultsButton.Enabled = false; dataGridViewControl.ClearColumns(); InitializeDataGridView(); Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionViewTest.cs =================================================================== diff -u -r764e091fd9cde60228960a6ba3e3736e4e4fd7bd -r0dd252090f721cdb4bd831fe473d698d2ddac82c --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionViewTest.cs (.../AssemblyResultPerSectionViewTest.cs) (revision 764e091fd9cde60228960a6ba3e3736e4e4fd7bd) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionViewTest.cs (.../AssemblyResultPerSectionViewTest.cs) (revision 0dd252090f721cdb4bd831fe473d698d2ddac82c) @@ -184,9 +184,26 @@ AssertColumn(dataGridViewColumns[specificFailurePath2ColumnIndex], "NIEUW"); } } + + [Test] + public void GivenFormWithAssemblyResultPerSectionView_ThenExpectedFailurePathCellData() + { + // Given + using (new AssemblyToolCalculatorFactoryConfig()) + using (ShowAssemblyResultPerSectionView()) + { + DataGridView dataGridView = GetDataGridView(); + object actualFirstFailurePathValue = dataGridView.Rows[0].Cells[specificFailurePath1ColumnIndex].FormattedValue; + object actualSecondFailurePathValue = dataGridView.Rows[0].Cells[specificFailurePath2ColumnIndex].FormattedValue; + + // Then + Assert.AreEqual("D", actualFirstFailurePathValue); + Assert.AreEqual("D", actualSecondFailurePathValue); + } + } [Test] - public void GivenFormWithAssemblyResultPerSectionView_WhenSpecificFailurePathAdded_ThenAdditionalColumnAdded() + public void GivenFormWithAssemblyResultPerSectionView_WhenSpecificFailurePathAdded_ThenColumnAdded() { // Given var random = new Random(21); @@ -200,7 +217,7 @@ AssessmentSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedAssessmentSectionAssemblyCalculator; // Precondition - var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + DataGridView dataGridView = GetDataGridView(); Assert.AreEqual(expectedColumnCount, dataGridView.ColumnCount); ButtonTester buttonTester = GetRefreshAssemblyResultButtonTester(); @@ -222,7 +239,7 @@ } [Test] - public void GivenFormWithAssemblyResultPerSectionView_WhenSpecificFailurePathRemoved_ThenAdditionalColumnRemoved() + public void GivenFormWithAssemblyResultPerSectionView_WhenSpecificFailurePathRemoved_ThenColumnRemoved() { // Given var random = new Random(21); @@ -233,7 +250,7 @@ using (ShowAssemblyResultPerSectionView(assessmentSection)) { // Precondition - var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + DataGridView dataGridView = GetDataGridView(); Assert.AreEqual(expectedColumnCount, dataGridView.ColumnCount); ButtonTester buttonTester = GetRefreshAssemblyResultButtonTester();