Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingScenariosViewInfoTest.cs
===================================================================
diff -u -r72855f408ad900220c30e399d15854ca7562d4f2 -r171eda478707e1f059c568074c7be10ecc93abb8
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingScenariosViewInfoTest.cs	(.../PipingScenariosViewInfoTest.cs)	(revision 72855f408ad900220c30e399d15854ca7562d4f2)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingScenariosViewInfoTest.cs	(.../PipingScenariosViewInfoTest.cs)	(revision 171eda478707e1f059c568074c7be10ecc93abb8)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System.Linq;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Plugin;
 using Core.Common.TestUtil;
 using NUnit.Framework;
@@ -68,63 +69,80 @@
         public void GetViewData_Always_ReturnsWrappedCalculationGroup()
         {
             // Setup
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
             var pipingFailureMechanism = new PipingFailureMechanism();
             var pipingCalculationsGroup = new CalculationGroup();
-            var pipingScenariosContext = new PipingScenariosContext(pipingCalculationsGroup, pipingFailureMechanism);
+            var pipingScenariosContext = new PipingScenariosContext(pipingCalculationsGroup, pipingFailureMechanism, assessmentSection);
 
             // Call
             object viewData = info.GetViewData(pipingScenariosContext);
 
             // Assert
             Assert.AreSame(pipingCalculationsGroup, viewData);
+            mocks.VerifyAll();
         }
 
         [Test]
         public void GetViewName_Always_ReturnsScenarios()
         {
             // Setup
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
             var pipingCalculationsGroup = new CalculationGroup
             {
                 Name = "Test"
             };
 
-            using (var view = new PipingScenariosView())
+            using (var view = new PipingScenariosView(assessmentSection))
             {
                 // Call
                 string viewName = info.GetViewName(view, pipingCalculationsGroup);
 
                 // Assert
                 Assert.AreEqual("Scenario's", viewName);
             }
+
+            mocks.VerifyAll();
         }
 
         [Test]
         public void AdditionalDataCheck_PipingScenariosContextWithPipingFailureMechanismParent_ReturnsTrue()
         {
             // Setup
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
             var pipingFailureMechanism = new PipingFailureMechanism();
-            var pipingScenariosContext = new PipingScenariosContext(pipingFailureMechanism.CalculationsGroup, pipingFailureMechanism);
+            var pipingScenariosContext = new PipingScenariosContext(pipingFailureMechanism.CalculationsGroup, pipingFailureMechanism, assessmentSection);
 
             // Call
             bool additionalDataCheck = info.AdditionalDataCheck(pipingScenariosContext);
 
             // Assert
             Assert.IsTrue(additionalDataCheck);
+            mocks.VerifyAll();
         }
 
         [Test]
         public void AdditionalDataCheck_PipingScenariosContextWithoutPipingFailureMechanismParent_ReturnsFalse()
         {
             // Setup
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
             var pipingFailureMechanism = new PipingFailureMechanism();
             var pipingCalculationsGroup = new CalculationGroup();
-            var pipingScenariosContext = new PipingScenariosContext(pipingCalculationsGroup, pipingFailureMechanism);
+            var pipingScenariosContext = new PipingScenariosContext(pipingCalculationsGroup, pipingFailureMechanism, assessmentSection);
 
             // Call
             bool additionalDataCheck = info.AdditionalDataCheck(pipingScenariosContext);
 
             // Assert
             Assert.IsFalse(additionalDataCheck);
+            mocks.VerifyAll();
         }
 
         [Test]
@@ -138,7 +156,7 @@
 
             mocks.ReplayAll();
 
-            using (var view = new PipingScenariosView
+            using (var view = new PipingScenariosView(assessmentSection)
             {
                 Data = pipingCalculationsGroup
             })
@@ -149,6 +167,7 @@
                 // Assert
                 Assert.IsFalse(closeForData);
             }
+
             mocks.VerifyAll();
         }
 
@@ -167,7 +186,7 @@
 
             mocks.ReplayAll();
 
-            using (var view = new PipingScenariosView
+            using (var view = new PipingScenariosView(assessmentSection)
             {
                 Data = pipingCalculationsGroup
             })
@@ -178,6 +197,7 @@
                 // Assert
                 Assert.IsFalse(closeForData);
             }
+
             mocks.VerifyAll();
         }
 
@@ -195,7 +215,7 @@
 
             mocks.ReplayAll();
 
-            using (var view = new PipingScenariosView
+            using (var view = new PipingScenariosView(assessmentSection)
             {
                 Data = pipingFailureMechanism.CalculationsGroup
             })
@@ -206,14 +226,18 @@
                 // Assert
                 Assert.IsTrue(closeForData);
             }
+
             mocks.VerifyAll();
         }
 
         [Test]
         public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanism_ReturnsFalse()
         {
             // Setup
-            using (var view = new PipingScenariosView
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            using (var view = new PipingScenariosView(assessmentSection)
             {
                 Data = new CalculationGroup()
             })
@@ -226,15 +250,20 @@
                 // Assert
                 Assert.IsFalse(closeForData);
             }
+
+            mocks.VerifyAll();
         }
 
         [Test]
         public void CloseForData_ViewCorrespondingToRemovedFailureMechanism_ReturnsTrue()
         {
             // Setup
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
             var failureMechanism = new PipingFailureMechanism();
 
-            using (var view = new PipingScenariosView
+            using (var view = new PipingScenariosView(assessmentSection)
             {
                 Data = failureMechanism.CalculationsGroup
             })
@@ -245,6 +274,8 @@
                 // Assert
                 Assert.IsTrue(closeForData);
             }
+
+            mocks.VerifyAll();
         }
 
         [Test]
@@ -257,7 +288,7 @@
             var failureMechanism = new PipingFailureMechanism();
             var failureMechanismContext = new PipingFailureMechanismContext(new PipingFailureMechanism(), assessmentSection);
 
-            using (var view = new PipingScenariosView
+            using (var view = new PipingScenariosView(assessmentSection)
             {
                 Data = failureMechanism.CalculationsGroup
             })
@@ -268,6 +299,7 @@
                 // Assert
                 Assert.IsFalse(closeForData);
             }
+
             mocks.VerifyAll();
         }
 
@@ -281,7 +313,7 @@
             var failureMechanism = new PipingFailureMechanism();
             var failureMechanismContext = new PipingFailureMechanismContext(failureMechanism, assessmentSection);
 
-            using (var view = new PipingScenariosView
+            using (var view = new PipingScenariosView(assessmentSection)
             {
                 Data = failureMechanism.CalculationsGroup
             })
@@ -292,25 +324,50 @@
                 // Assert
                 Assert.IsTrue(closeForData);
             }
+
             mocks.VerifyAll();
         }
 
         [Test]
         public void AfterCreate_Always_SetsSpecificPropertiesToView()
         {
             // Setup
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
             var pipingFailureMechanism = new PipingFailureMechanism();
             var pipingCalculationsGroup = new CalculationGroup();
-            var pipingScenariosContext = new PipingScenariosContext(pipingCalculationsGroup, pipingFailureMechanism);
+            var pipingScenariosContext = new PipingScenariosContext(pipingCalculationsGroup, pipingFailureMechanism, assessmentSection);
 
-            using (var view = new PipingScenariosView())
+            using (var view = new PipingScenariosView(assessmentSection))
             {
                 // Call
                 info.AfterCreate(view, pipingScenariosContext);
 
                 // Assert
                 Assert.AreSame(pipingFailureMechanism, view.PipingFailureMechanism);
             }
+
+            mocks.VerifyAll();
         }
+
+        [Test]
+        public void CreateInstance_Always_ReturnsView()
+        {
+            // Setup
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
+            var failureMechanism = new PipingFailureMechanism();
+            var calculationsGroup = new CalculationGroup();
+            var context = new PipingScenariosContext(calculationsGroup, failureMechanism, assessmentSection);
+
+            // Call
+            IView view = info.CreateInstance(context);
+            
+            // Assert
+            Assert.IsInstanceOf<PipingScenariosView>(view);
+            mocks.VerifyAll();
+        }
     }
 }
\ No newline at end of file