Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityOutwardsResultViewTest.cs
===================================================================
diff -u -r2973c5f790a5131e427bd5f73e2a620044199639 -re38a7c2baca2872af6319d535c6468133ea31fbc
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityOutwardsResultViewTest.cs	(.../MacrostabilityOutwardsResultViewTest.cs)	(revision 2973c5f790a5131e427bd5f73e2a620044199639)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityOutwardsResultViewTest.cs	(.../MacrostabilityOutwardsResultViewTest.cs)	(revision e38a7c2baca2872af6319d535c6468133ea31fbc)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using System.Drawing;
 using System.Windows.Forms;
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
@@ -29,10 +28,9 @@
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.Helpers;
+using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 using Ringtoets.Integration.Forms.Views.SectionResultViews;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
-using CoreCommonBaseResources = Core.Common.Base.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.Test.Views.SectionResultViews
 {
@@ -59,19 +57,13 @@
 
                 Assert.AreEqual(4, dataGridView.ColumnCount);
 
-                Assert.IsInstanceOf<DataGridViewCheckBoxColumn>(dataGridView.Columns[assessmentLayerOneIndex]);
+                Assert.IsInstanceOf<DataGridViewComboBoxColumn>(dataGridView.Columns[assessmentLayerOneIndex]);
                 Assert.IsInstanceOf<DataGridViewTextBoxColumn>(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);
@@ -90,19 +82,30 @@
             {
                 new Point2D(0, 0)
             });
+            var section3 = new FailureMechanismSection("Section 3", new[]
+            {
+                new Point2D(0, 0)
+            });
+
             Random random = new Random(21);
             var result1 = new MacrostabilityOutwardsFailureMechanismSectionResult(section1)
             {
-                AssessmentLayerOne = true,
+                AssessmentLayerOne = AssessmentLayerOneState.Sufficient,
                 AssessmentLayerTwoA = (RoundedDouble) random.NextDouble(),
                 AssessmentLayerThree = (RoundedDouble) random.NextDouble()
             };
             var result2 = new MacrostabilityOutwardsFailureMechanismSectionResult(section2)
             {
-                AssessmentLayerOne = false,
+                AssessmentLayerOne = AssessmentLayerOneState.NotAssessed,
                 AssessmentLayerTwoA = (RoundedDouble) random.NextDouble(),
                 AssessmentLayerThree = (RoundedDouble) random.NextDouble()
             };
+            var result3 = new MacrostabilityOutwardsFailureMechanismSectionResult(section3)
+            {
+                AssessmentLayerOne = AssessmentLayerOneState.NeedsDetailedAssessment,
+                AssessmentLayerTwoA = (RoundedDouble) random.NextDouble(),
+                AssessmentLayerThree = (RoundedDouble) random.NextDouble()
+            };
 
             using (var form = new Form())
             using (var view = new MacrostabilityOutwardsResultView())
@@ -114,13 +117,14 @@
                 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);
@@ -130,8 +134,8 @@
                 Assert.AreEqual(expectedAssessmentLayer2AString1, cells[assessmentLayerTwoAIndex].FormattedValue);
                 Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue);
 
-                AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]);
-                AssertCellIsDisabled(cells[assessmentLayerThreeIndex]);
+                DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]);
+                DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]);
 
                 cells = rows[1].Cells;
                 Assert.AreEqual(4, cells.Count);
@@ -141,13 +145,27 @@
                 Assert.AreEqual(expectedAssessmentLayer2AString2, cells[assessmentLayerTwoAIndex].FormattedValue);
                 Assert.AreEqual(result2.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue);
 
-                AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]);
-                AssertCellIsEnabled(cells[assessmentLayerThreeIndex]);
+                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);
+                var expectedAssessmentLayer2AString3 = ProbabilityFormattingHelper.Format(result3.AssessmentLayerTwoA);
+                Assert.AreEqual(expectedAssessmentLayer2AString3, cells[assessmentLayerTwoAIndex].FormattedValue);
+                Assert.AreEqual(result3.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue);
+
+                DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]);
+                DataGridViewCellTester.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]);
             }
         }
 
         [Test]
-        public void GivenFormWithMacrostabilityOutwardsFailureMechanismResultView_WhenSectionPassesLevel0AndListenersNotified_ThenRowsForSectionBecomesDisabled()
+        [TestCase(AssessmentLayerOneState.NotAssessed)]
+        [TestCase(AssessmentLayerOneState.NeedsDetailedAssessment)]
+        public void GivenFormWithMacrostabilityOutwardsFailureMechanismResultView_WhenSectionPassesLevel0AndListenersNotified_ThenRowsForSectionBecomesDisabled(
+            AssessmentLayerOneState assessmentLayerOneState)
         {
             // Given
             var section = new FailureMechanismSection("Section 1", new[]
@@ -157,7 +175,7 @@
             Random random = new Random(21);
             var result = new MacrostabilityOutwardsFailureMechanismSectionResult(section)
             {
-                AssessmentLayerOne = false,
+                AssessmentLayerOne = assessmentLayerOneState,
                 AssessmentLayerTwoA = (RoundedDouble) random.NextDouble(),
                 AssessmentLayerThree = (RoundedDouble) random.NextDouble()
             };
@@ -173,7 +191,7 @@
                 };
 
                 // When
-                result.AssessmentLayerOne = true;
+                result.AssessmentLayerOne = AssessmentLayerOneState.Sufficient;
                 result.NotifyObservers();
 
                 // Then
@@ -184,8 +202,8 @@
                 var cells = rows[0].Cells;
                 Assert.AreEqual(4, cells.Count);
 
-                AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]);
-                AssertCellIsDisabled(cells[assessmentLayerThreeIndex]);
+                DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]);
+                DataGridViewCellTester.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]);
             }
         }
 
@@ -223,19 +241,5 @@
                 Assert.AreEqual(0, rows.Count);
             }
         }
-
-        private void AssertCellIsDisabled(DataGridViewCell dataGridViewCell)
-        {
-            Assert.AreEqual(true, dataGridViewCell.ReadOnly);
-            Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), dataGridViewCell.Style.ForeColor);
-            Assert.AreEqual(Color.FromKnownColor(KnownColor.DarkGray), dataGridViewCell.Style.BackColor);
-        }
-
-        private void AssertCellIsEnabled(DataGridViewCell dataGridViewCell)
-        {
-            Assert.AreEqual(false, dataGridViewCell.ReadOnly);
-            Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), dataGridViewCell.Style.ForeColor);
-            Assert.AreEqual(Color.FromKnownColor(KnownColor.White), dataGridViewCell.Style.BackColor);
-        }
     }
 }
\ No newline at end of file