Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/DuneErosionResultViewTest.cs
===================================================================
diff -u -r814349430deb526dabf1cd5ac5bd71e0ff3597cb -re38a7c2baca2872af6319d535c6468133ea31fbc
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/DuneErosionResultViewTest.cs	(.../DuneErosionResultViewTest.cs)	(revision 814349430deb526dabf1cd5ac5bd71e0ff3597cb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/DuneErosionResultViewTest.cs	(.../DuneErosionResultViewTest.cs)	(revision e38a7c2baca2872af6319d535c6468133ea31fbc)
@@ -27,9 +27,9 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultViews;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.Test.Views.SectionResultViews
 {
@@ -58,13 +58,13 @@
 
                 Assert.AreEqual(4, dataGridView.ColumnCount);
 
-                Assert.IsInstanceOf<DataGridViewCheckBoxColumn>(dataGridView.Columns[assessmentLayerOneIndex]);
+                Assert.IsInstanceOf<DataGridViewComboBoxColumn>(dataGridView.Columns[assessmentLayerOneIndex]);
                 Assert.IsInstanceOf<DataGridViewComboBoxColumn>(dataGridView.Columns[assessmentLayerTwoAIndex]);
                 Assert.IsInstanceOf<DataGridViewTextBoxColumn>(dataGridView.Columns[assessmentLayerThreeIndex]);
 
-                Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one, dataGridView.Columns[assessmentLayerOneIndex].HeaderText);
-                Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a, dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText);
-                Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three, dataGridView.Columns[assessmentLayerThreeIndex].HeaderText);
+                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);
@@ -83,19 +83,30 @@
             {
                 new Point2D(0, 0)
             });
+            var section3 = new FailureMechanismSection("Section 3", new[]
+            {
+                new Point2D(0, 0)
+            });
+
             Random random = new Random(21);
             var result1 = new DuneErosionFailureMechanismSectionResult(section1)
             {
-                AssessmentLayerOne = true,
+                AssessmentLayerOne = AssessmentLayerOneState.Sufficient,
                 AssessmentLayerTwoA = AssessmentLayerTwoAResult.Failed,
                 AssessmentLayerThree = (RoundedDouble) random.NextDouble()
             };
             var result2 = new DuneErosionFailureMechanismSectionResult(section2)
             {
-                AssessmentLayerOne = true,
+                AssessmentLayerOne = AssessmentLayerOneState.NotAssessed,
                 AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful,
                 AssessmentLayerThree = (RoundedDouble) random.NextDouble()
             };
+            var result3 = new DuneErosionFailureMechanismSectionResult(section3)
+            {
+                AssessmentLayerOne = AssessmentLayerOneState.NeedsDetailedAssessment,
+                AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful,
+                AssessmentLayerThree = (RoundedDouble) random.NextDouble()
+            };
 
             using (var form = new Form())
             using (var view = new DuneErosionResultView())
@@ -107,28 +118,45 @@
                 view.Data = new[]
                 {
                     result1,
-                    result2
+                    result2,
+                    result3
                 };
 
                 // Then
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
                 var rows = dataGridView.Rows;
-                Assert.AreEqual(2, rows.Count);
+                Assert.AreEqual(3, rows.Count);
 
                 var cells = rows[0].Cells;
                 Assert.AreEqual(4, cells.Count);
                 Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue);
-                Assert.IsTrue((bool) cells[assessmentLayerOneIndex].Value);
+                Assert.AreEqual(result1.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value);
                 Assert.AreEqual(result1.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value);
                 Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue);
 
+                DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]);
+                DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]);
+
                 cells = rows[1].Cells;
                 Assert.AreEqual(4, cells.Count);
                 Assert.AreEqual("Section 2", cells[nameColumnIndex].FormattedValue);
-                Assert.IsTrue((bool) cells[assessmentLayerOneIndex].Value);
+                Assert.AreEqual(result2.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value);
                 Assert.AreEqual(result2.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value);
                 Assert.AreEqual(result2.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue);
+
+                DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]);
+                DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]);
+
+                cells = rows[2].Cells;
+                Assert.AreEqual(4, cells.Count);
+                Assert.AreEqual("Section 3", cells[nameColumnIndex].FormattedValue);
+                Assert.AreEqual(result3.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value);
+                Assert.AreEqual(result3.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value);
+                Assert.AreEqual(result3.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue);
+
+                DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]);
+                DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]);
             }
         }