Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -r41864fb27f6bb9d542e5775f998f6802c4b42247 -r7abe4893334f5a612e5d73862987516ea281a802
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismResultViewInfoTest.cs	(.../HeightStructuresFailureMechanismResultViewInfoTest.cs)	(revision 41864fb27f6bb9d542e5775f998f6802c4b42247)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismResultViewInfoTest.cs	(.../HeightStructuresFailureMechanismResultViewInfoTest.cs)	(revision 7abe4893334f5a612e5d73862987516ea281a802)
@@ -22,6 +22,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Plugin;
 using Core.Common.TestUtil;
 using NUnit.Framework;
@@ -114,17 +115,16 @@
         {
             // Setup
             var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(new IFailureMechanism[0]);
+            mocks.ReplayAll();
+
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var view = new HeightStructuresFailureMechanismResultView
+            var view = new HeightStructuresFailureMechanismResultView(assessmentSection)
             {
                 Data = failureMechanism.SectionResults
             };
 
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(new IFailureMechanism[0]);
-
-            mocks.ReplayAll();
-
             // Call
             bool closeForData = info.CloseForData(view, assessmentSection);
 
@@ -139,21 +139,20 @@
             // Setup
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            var failureMechanism = new HeightStructuresFailureMechanism();
             var otherFailureMechanism = mocks.Stub<FailureMechanismBase>("N", "C");
-
-            var view = new HeightStructuresFailureMechanismResultView
-            {
-                Data = failureMechanism.SectionResults
-            };
-
             assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(new[]
             {
                 otherFailureMechanism
             });
-
             mocks.ReplayAll();
 
+            var failureMechanism = new HeightStructuresFailureMechanism();
+
+            var view = new HeightStructuresFailureMechanismResultView(assessmentSection)
+            {
+                Data = failureMechanism.SectionResults
+            };
+
             // Call
             bool closeForData = info.CloseForData(view, assessmentSection);
 
@@ -166,22 +165,22 @@
         public void CloseForData_ViewCorrespondingToRemovedAssessmentSection_ReturnsTrue()
         {
             // Setup
-            var mocks = new MockRepository();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
             var failureMechanism = new HeightStructuresFailureMechanism();
 
-            var view = new HeightStructuresFailureMechanismResultView
-            {
-                Data = failureMechanism.SectionResults
-            };
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
             assessmentSection.Stub(asm => asm.GetFailureMechanisms()).Return(new IFailureMechanism[]
             {
                 new HeightStructuresFailureMechanism(),
                 failureMechanism
             });
-
             mocks.ReplayAll();
 
+            var view = new HeightStructuresFailureMechanismResultView(assessmentSection)
+            {
+                Data = failureMechanism.SectionResults
+            };
+
             // Call
             bool closeForData = info.CloseForData(view, assessmentSection);
 
@@ -194,9 +193,13 @@
         public void CloseForData_ViewCorrespondingToRemovedFailureMechanism_ReturnsTrue()
         {
             // Setup
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
             var failureMechanism = new HeightStructuresFailureMechanism();
 
-            var view = new HeightStructuresFailureMechanismResultView
+            var view = new HeightStructuresFailureMechanismResultView(assessmentSection)
             {
                 Data = failureMechanism.SectionResults
             };
@@ -206,15 +209,20 @@
 
             // Assert
             Assert.IsTrue(closeForData);
+            mocks.VerifyAll();
         }
 
         [Test]
         public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanism_ReturnsFalse()
         {
             // Setup
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
             var failureMechanism = new HeightStructuresFailureMechanism();
 
-            var view = new HeightStructuresFailureMechanismResultView
+            var view = new HeightStructuresFailureMechanismResultView(assessmentSection)
             {
                 Data = failureMechanism.SectionResults
             };
@@ -224,6 +232,7 @@
 
             // Assert
             Assert.IsFalse(closeForData);
+            mocks.VerifyAll();
         }
 
         [Test]
@@ -237,7 +246,7 @@
             var failureMechanism = new HeightStructuresFailureMechanism();
             var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSection);
 
-            var view = new HeightStructuresFailureMechanismResultView
+            var view = new HeightStructuresFailureMechanismResultView(assessmentSection)
             {
                 Data = failureMechanism.SectionResults
             };
@@ -259,7 +268,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var view = new HeightStructuresFailureMechanismResultView
+            var view = new HeightStructuresFailureMechanismResultView(assessmentSection)
             {
                 Data = failureMechanism.SectionResults
             };
@@ -281,7 +290,7 @@
             var failureMechanism = new HeightStructuresFailureMechanism();
 
             var mocks = new MockRepository();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();            
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
             var view = mocks.StrictMock<HeightStructuresFailureMechanismResultView>();
             view.Expect(v => v.FailureMechanism = failureMechanism);
             mocks.ReplayAll();
@@ -295,5 +304,26 @@
             // Assert
             mocks.VerifyAll();
         }
+
+        [Test]
+        public void CreateInstance_Always_ReturnsView()
+        {
+            // Setup
+            var failureMechanism = new HeightStructuresFailureMechanism();
+
+            var mocks = new MockRepository();
+            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
+
+            var context = new ProbabilityFailureMechanismSectionResultContext<HeightStructuresFailureMechanismSectionResult>(failureMechanism.SectionResults,
+                                                                                                                             failureMechanism,
+                                                                                                                             assessmentSection);
+
+            // Call
+            IView view = info.CreateInstance(context);
+
+            // Assert
+            Assert.IsInstanceOf<HeightStructuresFailureMechanismResultView>(view);
+            mocks.VerifyAll();
+        }
     }
 }
\ No newline at end of file