Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingGuiPluginTest.cs
===================================================================
diff -u -r86e717a5477d55d1c4351f2857a1d76e220a3ab4 -r1c01ea681887e96b5b80fb7d23680a4eeac9bd50
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingGuiPluginTest.cs	(.../PipingGuiPluginTest.cs)	(revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingGuiPluginTest.cs	(.../PipingGuiPluginTest.cs)	(revision 1c01ea681887e96b5b80fb7d23680a4eeac9bd50)
@@ -9,6 +9,8 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
+
+using Ringtoets.Common.Data;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.Forms.PropertyClasses;
@@ -59,11 +61,23 @@
             using (var guiPlugin = new PipingGuiPlugin())
             {
                 // call
+                var mocks = new MockRepository();
+                var assessmentSection = mocks.Stub<AssessmentSectionBase>();
+                mocks.ReplayAll();
+
                 PropertyInfo[] propertyInfos = guiPlugin.GetPropertyInfos().ToArray();
 
                 // assert
-                Assert.AreEqual(6, propertyInfos.Length);
+                Assert.AreEqual(7, propertyInfos.Length);
 
+                var pipingFailureMechanism = new PipingFailureMechanism();
+                var pipingFailureMechanismContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSection);
+                var pipingFailureMechanismContextProperties = propertyInfos.Single(pi => pi.DataType == typeof(PipingFailureMechanismContext));
+                Assert.AreEqual(typeof(GeneralPipingInputProperties), pipingFailureMechanismContextProperties.PropertyObjectType);
+                Assert.IsNull(pipingFailureMechanismContextProperties.AdditionalDataCheck);
+                Assert.AreSame(pipingFailureMechanism.GeneralInput, pipingFailureMechanismContextProperties.GetObjectPropertiesData(pipingFailureMechanismContext));
+                Assert.IsNull(pipingFailureMechanismContextProperties.AfterCreate);
+
                 var pipingCalculationContextProperties = propertyInfos.Single(pi => pi.DataType == typeof(PipingCalculationContext));
                 Assert.AreEqual(typeof(PipingCalculationContextProperties), pipingCalculationContextProperties.PropertyObjectType);
                 Assert.IsNull(pipingCalculationContextProperties.AdditionalDataCheck);
@@ -99,6 +113,8 @@
                 Assert.IsNull(pipingSoilProfileProperties.AdditionalDataCheck);
                 Assert.IsNull(pipingSoilProfileProperties.GetObjectPropertiesData);
                 Assert.IsNull(pipingSoilProfileProperties.AfterCreate);
+
+                mocks.VerifyAll();
             }
         }