Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -r6972dcbadcff546573c765e0ffc0edc865994175 -r52647e3599ba4ba250975f3f81fbfe3f75beb0a0
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision 6972dcbadcff546573c765e0ffc0edc865994175)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision 52647e3599ba4ba250975f3f81fbfe3f75beb0a0)
@@ -133,9 +133,6 @@
     <Compile Include="UITypeEditors\StructureEditor.cs" />
     <Compile Include="Views\CalculatableRow.cs" />
     <Compile Include="Views\FailureMechanismSectionRow.cs" />
-    <Compile Include="Views\FailureMechanismSectionsTable.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
     <Compile Include="Views\FailureMechanismSectionsView.cs">
       <SubType>UserControl</SubType>
     </Compile>
Fisheye: Tag 52647e3599ba4ba250975f3f81fbfe3f75beb0a0 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismSectionsTable.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj
===================================================================
diff -u -r6972dcbadcff546573c765e0ffc0edc865994175 -r52647e3599ba4ba250975f3f81fbfe3f75beb0a0
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision 6972dcbadcff546573c765e0ffc0edc865994175)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision 52647e3599ba4ba250975f3f81fbfe3f75beb0a0)
@@ -131,7 +131,6 @@
     <Compile Include="Views\CalculatableRowTest.cs" />
     <Compile Include="Views\FailureMechanismSectionRowTest.cs" />
     <Compile Include="Views\FailureMechanismSectionsViewTest.cs" />
-    <Compile Include="Views\FailureMechanismSectionsTableTest.cs" />
     <Compile Include="Views\IllustrationPointsFaultTreeControlTest.cs" />
     <Compile Include="Views\IllustrationPointControlItemTest.cs" />
     <Compile Include="Views\IllustrationPointRowTest.cs" />
Fisheye: Tag 52647e3599ba4ba250975f3f81fbfe3f75beb0a0 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionsTableTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionsViewTest.cs
===================================================================
diff -u -re4e314411a1226b821443386d11acbfda2665521 -r52647e3599ba4ba250975f3f81fbfe3f75beb0a0
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionsViewTest.cs	(.../FailureMechanismSectionsViewTest.cs)	(revision e4e314411a1226b821443386d11acbfda2665521)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionsViewTest.cs	(.../FailureMechanismSectionsViewTest.cs)	(revision 52647e3599ba4ba250975f3f81fbfe3f75beb0a0)
@@ -20,9 +20,10 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
-using Core.Common.Base;
+using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using Core.Common.Controls.DataGrid;
 using Core.Common.Controls.Views;
@@ -38,6 +39,9 @@
     [TestFixture]
     public class FailureMechanismSectionsViewTest
     {
+        private const int nameColumnIndex = 0;
+        private const int lengthColumnIndex = 1;
+
         [Test]
         public void Constructor_SectionsNull_ThrowsArgumentNullException()
         {
@@ -68,21 +72,14 @@
         }
 
         [Test]
-        public void Constructor_WithData_CreatesViewAndTableWithData()
+        public void Constructor_ValidParameters_InitializesViewCorrectly()
         {
             // Setup
             var mocks = new MockRepository();
             var failureMechanism = mocks.Stub<IFailureMechanism>();
             mocks.ReplayAll();
 
-            var random = new Random(39);
-            var sections = new[]
-            {
-                new FailureMechanismSection("a", new[]
-                {
-                    new Point2D(random.NextDouble(), random.NextDouble())
-                })
-            };
+            IEnumerable<FailureMechanismSection> sections = Enumerable.Empty<FailureMechanismSection>();
 
             // Call
             using (var view = new FailureMechanismSectionsView(sections, failureMechanism))
@@ -91,92 +88,117 @@
                 Assert.IsInstanceOf<UserControl>(view);
                 Assert.IsInstanceOf<IView>(view);
                 Assert.IsNull(view.Data);
-                Assert.AreEqual(1, view.Controls.Count);
                 Assert.AreSame(failureMechanism, view.FailureMechanism);
+                Assert.AreEqual(1, view.Controls.Count);
 
                 DataGridViewControl sectionsTable = GetSectionsTable(view);
                 Assert.NotNull(sectionsTable);
                 Assert.AreEqual(DockStyle.Fill, sectionsTable.Dock);
-                Assert.AreEqual(1, sectionsTable.Rows.Count);
+
+                DataGridViewColumn nameColumn = sectionsTable.GetColumnFromIndex(nameColumnIndex);
+                Assert.AreEqual("Vaknaam", nameColumn.HeaderText);
+                DataGridViewColumn lengthColumn = sectionsTable.GetColumnFromIndex(lengthColumnIndex);
+                Assert.AreEqual("Lengte* [m]", lengthColumn.HeaderText);
+
+                Assert.Throws<ArgumentOutOfRangeException>(() => sectionsTable.GetColumnFromIndex(lengthColumnIndex + 1));
             }
 
             mocks.VerifyAll();
         }
 
         [Test]
-        public void GivenViewWithSections_WhenSectionsUpdated_ThenDataTableUpdated()
+        public void Constructor_WithoutSections_CreatesViewWithTableEmpty()
         {
-            // Given
+            // Setup
             var mocks = new MockRepository();
-            var observer = mocks.StrictMock<IObserver>();
-            observer.Expect(o => o.UpdateObserver());
+            var failureMechanism = mocks.Stub<IFailureMechanism>();
             mocks.ReplayAll();
 
-            var failureMechanism = new TestFailureMechanism();
-            failureMechanism.AddSection(new FailureMechanismSection("A", new[]
+            IEnumerable<FailureMechanismSection> sections = Enumerable.Empty<FailureMechanismSection>();
+
+            // Call
+            using (var view = new FailureMechanismSectionsView(sections, failureMechanism))
             {
-                new Point2D(0.0, 0.0)
-            }));
+                // Assert
+                CollectionAssert.IsEmpty(GetSectionsTable(view).Rows);
+            }
 
-            using (var view = new FailureMechanismSectionsView(failureMechanism.Sections, failureMechanism))
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void Constructor_WithSections_CreatesViewWithTableCorrectlyFilled()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var failureMechanism = mocks.Stub<IFailureMechanism>();
+            mocks.ReplayAll();
+
+            var sections = new[]
             {
+                CreateFailureMechanismSection("a"),
+                CreateFailureMechanismSection("b"),
+                CreateFailureMechanismSection("c")
+            };
+
+            // Call
+            using (var view = new FailureMechanismSectionsView(sections, failureMechanism))
+            {
+                // Assert
                 DataGridViewControl sectionsTable = GetSectionsTable(view);
-                failureMechanism.Attach(observer);
 
-                // Precondition
-                Assert.AreEqual(1, sectionsTable.Rows.Count);
+                Assert.AreEqual(sections.Length, sectionsTable.Rows.Count);
 
-                // When
-                failureMechanism.AddSection(new FailureMechanismSection("A", new[]
+                for (var i = 0; i < sectionsTable.Rows.Count; i++)
                 {
-                    new Point2D(0.0, 0.0)
-                }));
-                failureMechanism.NotifyObservers();
+                    FailureMechanismSection section = sections[i];
+                    DataGridViewCellCollection rowCells = sectionsTable.Rows[i].Cells;
 
-                // Then
-                Assert.AreEqual(2, sectionsTable.Rows.Count);
+                    Assert.AreEqual(section.Name, rowCells[nameColumnIndex].Value);
+
+                    var sectionLength = (RoundedDouble) rowCells[lengthColumnIndex].Value;
+                    Assert.AreEqual(section.Length, sectionLength, sectionLength.GetAccuracy());
+                }
             }
 
             mocks.VerifyAll();
         }
 
         [Test]
-        public void GivenViewWithSections_WhenSectionsCleared_ThenDataTableCleared()
+        public void GivenViewWithSections_WhenSectionsUpdated_ThenTableUpdated()
         {
             // Given
-            var mocks = new MockRepository();
-            var observer = mocks.StrictMock<IObserver>();
-            observer.Expect(o => o.UpdateObserver());
-            mocks.ReplayAll();
-
             var failureMechanism = new TestFailureMechanism();
-            failureMechanism.AddSection(new FailureMechanismSection("A", new[]
-            {
-                new Point2D(0.0, 0.0)
-            }));
+            failureMechanism.AddSection(CreateFailureMechanismSection("a"));
 
             using (var view = new FailureMechanismSectionsView(failureMechanism.Sections, failureMechanism))
             {
                 DataGridViewControl sectionsTable = GetSectionsTable(view);
-                failureMechanism.Attach(observer);
 
                 // Precondition
                 Assert.AreEqual(1, sectionsTable.Rows.Count);
 
                 // When
-                failureMechanism.ClearAllSections();
+                failureMechanism.AddSection(CreateFailureMechanismSection("b"));
                 failureMechanism.NotifyObservers();
 
                 // Then
-                Assert.AreEqual(0, sectionsTable.Rows.Count);
+                Assert.AreEqual(2, sectionsTable.Rows.Count);
             }
-
-            mocks.VerifyAll();
         }
 
         private static DataGridViewControl GetSectionsTable(FailureMechanismSectionsView view)
         {
             return ControlTestHelper.GetControls<DataGridViewControl>(view, "failureMechanismSectionsTable").Single();
         }
+
+        private static FailureMechanismSection CreateFailureMechanismSection(string name)
+        {
+            var random = new Random(39);
+            return new FailureMechanismSection(name, new[]
+            {
+                new Point2D(random.NextDouble(), random.NextDouble())
+            });
+        }
     }
 }
\ No newline at end of file