Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -rb7f496624546731a31137ae48d73c92456b1fe1d -re38a7c2baca2872af6319d535c6468133ea31fbc
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs	(.../HeightStructuresFailureMechanismResultViewTest.cs)	(revision b7f496624546731a31137ae48d73c92456b1fe1d)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs	(.../HeightStructuresFailureMechanismResultViewTest.cs)	(revision e38a7c2baca2872af6319d535c6468133ea31fbc)
@@ -19,9 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base.Data;
@@ -32,6 +30,7 @@
 using Ringtoets.Common.Data.Probability;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.Helpers;
+using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Forms.Views;
@@ -72,7 +71,7 @@
         }
 
         [Test]
-        public void Constructor_DataGridViewCorrectlyInitialized()
+        public void GivenFormWithHeightStructuresFailureMechanismResultView_ThenExpectedColumnsAreVisible()
         {
             // Call
             using (ShowFailureMechanismResultsView())
@@ -83,12 +82,14 @@
                 Assert.AreEqual(4, dataGridView.ColumnCount);
                 Assert.IsTrue(dataGridView.Columns[assessmentLayerTwoAIndex].ReadOnly);
 
-                foreach (var column in dataGridView.Columns.OfType<DataGridViewComboBoxColumn>())
-                {
-                    Assert.AreEqual("This", column.ValueMember);
-                    Assert.AreEqual("DisplayName", column.DisplayMember);
-                }
+                Assert.IsInstanceOf<DataGridViewComboBoxColumn>(dataGridView.Columns[assessmentLayerOneIndex]);
+                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[assessmentLayerTwoAIndex]);
+                Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[assessmentLayerThreeIndex]);
 
+                Assert.AreEqual("Toetslaag 1", dataGridView.Columns[assessmentLayerOneIndex].HeaderText);
+                Assert.AreEqual("Toetslaag 2a", dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText);
+                Assert.AreEqual("Toetslaag 3", dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
+
                 Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode);
                 Assert.AreEqual(DataGridViewContentAlignment.MiddleCenter, dataGridView.ColumnHeadersDefaultCellStyle.Alignment);
             }
@@ -162,31 +163,33 @@
                 var cells = rows[0].Cells;
                 Assert.AreEqual(4, cells.Count);
                 Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue);
-                Assert.IsFalse((bool) cells[assessmentLayerOneIndex].FormattedValue);
+                Assert.AreEqual(AssessmentLayerOneState.NotAssessed, cells[assessmentLayerOneIndex].Value);
                 Assert.AreEqual("-", cells[assessmentLayerTwoAIndex].FormattedValue);
                 Assert.AreEqual("-", cells[assessmentLayerThreeIndex].FormattedValue);
 
                 cells = rows[1].Cells;
                 Assert.AreEqual(4, cells.Count);
                 Assert.AreEqual("Section 2", cells[nameColumnIndex].FormattedValue);
-                Assert.IsFalse((bool) cells[assessmentLayerOneIndex].FormattedValue);
+                Assert.AreEqual(AssessmentLayerOneState.NotAssessed, cells[assessmentLayerOneIndex].Value);
                 Assert.AreEqual("-", cells[assessmentLayerTwoAIndex].FormattedValue);
                 Assert.AreEqual("-", cells[assessmentLayerThreeIndex].FormattedValue);
             }
         }
 
         [Test]
-        [TestCase(true)]
-        [TestCase(false)]
-        public void FailureMechanismResultsView_ChangeCheckBox_DataGridViewCorrectlySyncedAndStylingSet(bool checkBoxSelected)
+        [TestCase(AssessmentLayerOneState.NotAssessed)]
+        [TestCase(AssessmentLayerOneState.NeedsDetailedAssessment)]
+        [TestCase(AssessmentLayerOneState.Sufficient)]
+        public void FailureMechanismResultsView_ChangeAssessmentLayerOneState_DataGridViewCorrectlySyncedAndStylingSet(
+            AssessmentLayerOneState assessmentLayerOneState)
         {
             // Setup
             using (ShowFullyConfiguredFailureMechanismResultsView())
             {
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
                 // Call
-                dataGridView.Rows[0].Cells[assessmentLayerOneIndex].Value = checkBoxSelected;
+                dataGridView.Rows[0].Cells[assessmentLayerOneIndex].Value = assessmentLayerOneState;
 
                 // Assert
                 var rows = dataGridView.Rows;
@@ -198,32 +201,25 @@
                 var cellAssessmentLayerThree = cells[assessmentLayerThreeIndex];
                 DataGridViewCell dataGridViewCell = cells[assessmentLayerOneIndex];
 
-                Assert.AreEqual(checkBoxSelected, (bool) dataGridViewCell.FormattedValue);
+                Assert.AreEqual(assessmentLayerOneState, cells[assessmentLayerOneIndex].Value);
                 Assert.AreEqual("-", cellAssessmentLayerTwoA.FormattedValue);
                 Assert.AreEqual("-", cellAssessmentLayerThree.FormattedValue);
                 Assert.IsEmpty(dataGridViewCell.ErrorText);
 
-                var cellAssessmentLayerTwoABackColor = cellAssessmentLayerTwoA.Style.BackColor;
-                var cellAssessmentLayerTwoAForeColor = cellAssessmentLayerTwoA.Style.ForeColor;
-                var cellAssessmentLayerThreeBackColor = cellAssessmentLayerThree.Style.BackColor;
-                var cellAssessmentLayerThreeForeColor = cellAssessmentLayerThree.Style.ForeColor;
-
-                if (checkBoxSelected)
+                if (assessmentLayerOneState == AssessmentLayerOneState.Sufficient)
                 {
-                    Assert.AreEqual(Color.FromKnownColor(KnownColor.DarkGray), cellAssessmentLayerTwoABackColor);
-                    Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), cellAssessmentLayerTwoAForeColor);
-                    Assert.AreEqual(Color.FromKnownColor(KnownColor.DarkGray), cellAssessmentLayerThreeBackColor);
-                    Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), cellAssessmentLayerThreeForeColor);
+                    DataGridViewCellTester.AssertCellIsDisabled(cellAssessmentLayerTwoA);
+                    DataGridViewCellTester.AssertCellIsDisabled(cellAssessmentLayerThree);
+
+                    Assert.IsTrue(cellAssessmentLayerThree.ReadOnly);
                 }
                 else
                 {
-                    Assert.AreEqual(Color.FromKnownColor(KnownColor.White), cellAssessmentLayerTwoABackColor);
-                    Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), cellAssessmentLayerTwoAForeColor);
-                    Assert.AreEqual(Color.FromKnownColor(KnownColor.White), cellAssessmentLayerThreeBackColor);
-                    Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), cellAssessmentLayerThreeForeColor);
-                }
+                    DataGridViewCellTester.AssertCellIsEnabled(cellAssessmentLayerTwoA, true);
+                    DataGridViewCellTester.AssertCellIsEnabled(cellAssessmentLayerThree);
 
-                Assert.AreEqual(checkBoxSelected, cellAssessmentLayerThree.ReadOnly);
+                    Assert.IsFalse(cellAssessmentLayerThree.ReadOnly);
+                }
             }
         }
 
@@ -450,32 +446,6 @@
             }
         }
 
-        [Test]
-        public void FailureMechanismResultView_EditValueDirtyStateChangedEventFired_ValueCommittedCellInEditMode()
-        {
-            // Setup
-            using (HeightStructuresFailureMechanismResultView view = ShowFullyConfiguredFailureMechanismResultsView())
-            {
-                var sections = (List<HeightStructuresFailureMechanismSectionResult>) view.Data;
-                sections[0].AssessmentLayerOne = false;
-
-                var gridTester = new ControlTester("dataGridView");
-                var dataGridView = (DataGridView) gridTester.TheObject;
-                var dataGridViewCell = dataGridView.Rows[0].Cells[assessmentLayerOneIndex];
-
-                dataGridView.CurrentCell = dataGridViewCell;
-                dataGridView.BeginEdit(false);
-                gridTester.FireEvent("KeyUp", new KeyEventArgs(Keys.Space));
-
-                // Call
-                gridTester.FireEvent("CurrentCellDirtyStateChanged", EventArgs.Empty);
-
-                // Assert
-                Assert.IsTrue(dataGridViewCell.IsInEditMode);
-                Assert.IsTrue(sections[0].AssessmentLayerOne);
-            }
-        }
-
         private static FailureMechanismSection CreateSimpleFailureMechanismSection()
         {
             var section = new FailureMechanismSection("A",