Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -r3178e116f5e59e03078d465efeb303c5e232c7bf -r3e93a96d301c2a3171f68bddd01a0436ebcf74c4
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailureMechanismResultViewInfoTest.cs	(.../ClosingStructuresFailureMechanismResultViewInfoTest.cs)	(revision 3178e116f5e59e03078d465efeb303c5e232c7bf)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ViewInfos/ClosingStructuresFailureMechanismResultViewInfoTest.cs	(.../ClosingStructuresFailureMechanismResultViewInfoTest.cs)	(revision 3e93a96d301c2a3171f68bddd01a0436ebcf74c4)
@@ -31,8 +31,8 @@
 using Ringtoets.ClosingStructures.Forms.PresentationObjects;
 using Ringtoets.ClosingStructures.Forms.Views;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.PresentationObjects;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
@@ -43,47 +43,58 @@
     {
         private MockRepository mocks;
         private ViewInfo info;
+        private ClosingStructuresPlugin plugin;
 
         [SetUp]
         public void SetUp()
         {
             mocks = new MockRepository();
-            using (var plugin = new ClosingStructuresPlugin())
-            {
-                info = plugin.GetViewInfos().First(tni => tni.ViewType == typeof(ClosingStructuresFailureMechanismResultView));
-            }
+            plugin = new ClosingStructuresPlugin();
+            info = plugin.GetViewInfos().First(tni => tni.ViewType == typeof(ClosingStructuresFailureMechanismResultView));
         }
 
+        [TearDown]
+        public void TearDown()
+        {
+            plugin.Dispose();
+        }
+
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Assert
-            Assert.AreEqual(typeof(FailureMechanismSectionResultContext<ClosingStructuresFailureMechanismSectionResult>), info.DataType);
+            Assert.AreEqual(typeof(ProbabilityFailureMechanismSectionResultContext<ClosingStructuresFailureMechanismSectionResult>), info.DataType);
             Assert.AreEqual(typeof(IEnumerable<ClosingStructuresFailureMechanismSectionResult>), info.ViewDataType);
         }
 
         [Test]
         public void GetViewData_Always_ReturnsWrappedFailureMechanismResult()
         {
             // Setup
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            mocks.ReplayAll();
+
             var failureMechanism = new ClosingStructuresFailureMechanism();
-            var context = new FailureMechanismSectionResultContext<ClosingStructuresFailureMechanismSectionResult>(failureMechanism.SectionResults, failureMechanism);
+            var context = new ProbabilityFailureMechanismSectionResultContext<ClosingStructuresFailureMechanismSectionResult>(failureMechanism.SectionResults, failureMechanism,
+                                                                                                                              assessmentSection);
 
             // Call
             object viewData = info.GetViewData(context);
 
             // Assert
             Assert.AreSame(failureMechanism.SectionResults, viewData);
+            mocks.VerifyAll();
         }
 
         [Test]
         public void GetViewName_Always_ReturnsViewName()
         {
             // Setup
-            var failureMechanism = new ClosingStructuresFailureMechanism();
             var view = mocks.StrictMock<ClosingStructuresFailureMechanismResultView>();
             mocks.ReplayAll();
 
+            var failureMechanism = new ClosingStructuresFailureMechanism();
+
             // Call
             string viewName = info.GetViewName(view, failureMechanism.SectionResults);
 
@@ -93,36 +104,6 @@
         }
 
         [Test]
-        public void ViewType_Always_ReturnsViewType()
-        {
-            // Call
-            Type viewType = info.ViewType;
-
-            // Assert
-            Assert.AreEqual(typeof(ClosingStructuresFailureMechanismResultView), viewType);
-        }
-
-        [Test]
-        public void DataType_Always_ReturnsDataType()
-        {
-            // Call
-            Type dataType = info.DataType;
-
-            // Assert
-            Assert.AreEqual(typeof(FailureMechanismSectionResultContext<ClosingStructuresFailureMechanismSectionResult>), dataType);
-        }
-
-        [Test]
-        public void ViewDataType_Always_ReturnsViewDataType()
-        {
-            // Call
-            Type viewDataType = info.ViewDataType;
-
-            // Assert
-            Assert.AreEqual(typeof(IEnumerable<ClosingStructuresFailureMechanismSectionResult>), viewDataType);
-        }
-
-        [Test]
         public void Image_Always_ReturnsFailureMechanismSectionResultIcon()
         {
             // Call
@@ -264,6 +245,7 @@
                 // Assert
                 Assert.IsTrue(closeForData);
             }
+
             mocks.VerifyAll();
         }
 
@@ -288,6 +270,7 @@
                 // Assert
                 Assert.IsFalse(closeForData);
             }
+
             mocks.VerifyAll();
         }
 
@@ -296,10 +279,14 @@
         {
             // Setup
             var failureMechanism = new ClosingStructuresFailureMechanism();
+
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
             var view = mocks.StrictMock<ClosingStructuresFailureMechanismResultView>();
-            var context = new FailureMechanismSectionResultContext<ClosingStructuresFailureMechanismSectionResult>(failureMechanism.SectionResults, failureMechanism);
             view.Expect(v => v.FailureMechanism = failureMechanism);
             mocks.ReplayAll();
+            
+            var context = new ProbabilityFailureMechanismSectionResultContext<ClosingStructuresFailureMechanismSectionResult>(failureMechanism.SectionResults, failureMechanism,
+                                                                                                                              assessmentSection);
 
             // Call
             info.AfterCreate(view, context);