Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresCalculationsView.cs =================================================================== diff -u -r3a9bdc607d09f3c608af661cb261480eb52abe33 -r8e86dff510921345c5330a209b657b7299d5d7fb --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresCalculationsView.cs (.../ClosingStructuresCalculationsView.cs) (revision 3a9bdc607d09f3c608af661cb261480eb52abe33) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresCalculationsView.cs (.../ClosingStructuresCalculationsView.cs) (revision 8e86dff510921345c5330a209b657b7299d5d7fb) @@ -64,9 +64,9 @@ protected override void OnLoad(EventArgs e) { - base.OnLoad(e); - DataGridViewControl.CellFormatting += HandleCellStyling; + + base.OnLoad(e); } protected override void Dispose(bool disposing) Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresCalculationsViewTest.cs =================================================================== diff -u -r7251030b241c883c3832846d42e0c04cc11cf720 -r8e86dff510921345c5330a209b657b7299d5d7fb --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresCalculationsViewTest.cs (.../ClosingStructuresCalculationsViewTest.cs) (revision 7251030b241c883c3832846d42e0c04cc11cf720) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresCalculationsViewTest.cs (.../ClosingStructuresCalculationsViewTest.cs) (revision 8e86dff510921345c5330a209b657b7299d5d7fb) @@ -696,7 +696,7 @@ } [Test] - public void GivenForeshoreProfile_WhenSelectingAnotherForeshoreProfile_ThenCorrectColumnStates() + public void GivenForeshoreProfile_WhenSelectedForeshoreProfileNull_ThenCorrectColumnStates() { // Given var mocks = new MockRepository(); @@ -715,8 +715,8 @@ // Precondition Assert.AreEqual(3, foreshoreProfileComboBox.Items.Count); Assert.AreEqual(false, dataGridView.Rows[0].Cells[useBreakWaterColumnIndex].ReadOnly); - Assert.AreEqual(false, dataGridView.Rows[0].Cells[breakWaterTypeColumnIndex].ReadOnly); - Assert.AreEqual(false, dataGridView.Rows[0].Cells[breakWaterHeightColumnIndex].ReadOnly); + Assert.AreEqual(true, dataGridView.Rows[0].Cells[breakWaterTypeColumnIndex].ReadOnly); + Assert.AreEqual(true, dataGridView.Rows[0].Cells[breakWaterHeightColumnIndex].ReadOnly); // When dataGridView.Rows[0].Cells[foreshoreProfileColumnIndex].Value = new DataGridViewComboBoxItemWrapper(null);