Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/FailureMechanismAssemblyControlTest.cs
===================================================================
diff -u -r96e729865d3978156ee7d869c1f45f51dae51bcd -rce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/FailureMechanismAssemblyControlTest.cs	(.../FailureMechanismAssemblyControlTest.cs)	(revision 96e729865d3978156ee7d869c1f45f51dae51bcd)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/FailureMechanismAssemblyControlTest.cs	(.../FailureMechanismAssemblyControlTest.cs)	(revision ce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using System.Drawing;
 using System.Windows.Forms;
 using Core.Common.TestUtil;
 using Core.Common.Util;
@@ -29,7 +28,6 @@
 using Ringtoets.AssemblyTool.Data;
 using Ringtoets.Common.Forms.Controls;
 using Ringtoets.Common.Forms.Helpers;
-using Ringtoets.Common.Forms.Properties;
 using Ringtoets.Common.Forms.TypeConverters;
 
 namespace Ringtoets.Common.Forms.Test.Controls
@@ -45,30 +43,7 @@
 
             // Assert
             Assert.AreEqual(2, resultControl.Controls.Count);
-            Assert.IsInstanceOf<AssemblyResultControl>(resultControl);
-            Assert.IsTrue(resultControl.AutoSize);
-            Assert.AreEqual(DockStyle.Left, resultControl.Dock);
-
-            TableLayoutPanel groupPanel = GetGroupPanel(resultControl);
-            Assert.AreEqual(1, groupPanel.ColumnCount);
-            Assert.AreEqual(1, groupPanel.RowCount);
-
-            var groupLabel = (BorderedLabel) groupPanel.GetControlFromPosition(0, 0);
-            Assert.IsTrue(groupLabel.AutoSize);
-            Assert.AreEqual(DockStyle.Fill, groupLabel.Dock);
-            Assert.AreEqual(new Padding(5, 0, 5, 0), groupLabel.Padding);
-
-            var errorProvider = TypeUtils.GetField<ErrorProvider>(resultControl, "ErrorProvider");
-            TestHelper.AssertImagesAreEqual(Resources.ErrorIcon.ToBitmap(), errorProvider.Icon.ToBitmap());
-
-            TableLayoutPanel probabilityPanel = GetProbabilityPanel(resultControl);
-            Assert.AreEqual(1, probabilityPanel.ColumnCount);
-            Assert.AreEqual(1, probabilityPanel.RowCount);
-
-            var probabilityLabel = (BorderedLabel) probabilityPanel.GetControlFromPosition(0, 0);
-            Assert.IsTrue(probabilityLabel.AutoSize);
-            Assert.AreEqual(DockStyle.Left, probabilityLabel.Dock);
-            Assert.AreEqual(new Padding(5, 0, 5, 0), probabilityLabel.Padding);
+            Assert.IsInstanceOf<AssemblyResultWithProbabilityControl>(resultControl);
         }
 
         [Test]
@@ -98,8 +73,8 @@
             resultControl.SetAssemblyResult(assembly);
 
             // Assert
-            Control groupLabel = GetGroupPanel(resultControl).GetControlFromPosition(0, 0);
-            Control probabilityLabel = GetProbabilityPanel(resultControl).GetControlFromPosition(0, 0);
+            Control groupLabel = TypeUtils.GetField<TableLayoutPanel>(resultControl, "GroupPanel").GetControlFromPosition(0, 0);
+            Control probabilityLabel = TypeUtils.GetField<TableLayoutPanel>(resultControl, "probabilityPanel").GetControlFromPosition(0, 0);
 
             Assert.AreEqual(new EnumDisplayWrapper<FailureMechanismAssemblyCategoryGroup>(assembly.Group).DisplayName,
                             groupLabel.Text);
@@ -109,50 +84,5 @@
             Assert.AreEqual(new NoProbabilityValueDoubleConverter().ConvertToString(assembly.Probability),
                             probabilityLabel.Text);
         }
-
-        [Test]
-        public void SetError_ErrorNull_ThrowsArgumentNullException()
-        {
-            // Setup
-            var resultControl = new FailureMechanismAssemblyControl();
-
-            // Call
-            TestDelegate test = () => resultControl.SetError(null);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(test);
-            Assert.AreEqual("error", exception.ParamName);
-        }
-
-        [Test]
-        public void SetError_WithError_SetsErrorOnControl()
-        {
-            // Setup
-            const string error = "random error 123";
-            var resultControl = new FailureMechanismAssemblyControl();
-
-            // Call
-            resultControl.SetError(error);
-
-            // Assert
-            var errorProvider = TypeUtils.GetField<ErrorProvider>(resultControl, "ErrorProvider");
-            Assert.AreEqual(error, errorProvider.GetError(resultControl));
-
-            Control groupLabel = GetGroupPanel(resultControl).GetControlFromPosition(0, 0);
-            Control probabilityLabel = GetProbabilityPanel(resultControl).GetControlFromPosition(0, 0);
-            Assert.IsEmpty(groupLabel.Text);
-            Assert.AreEqual(Color.White, groupLabel.BackColor);
-            Assert.AreEqual("-", probabilityLabel.Text);
-        }
-
-        private static TableLayoutPanel GetProbabilityPanel(FailureMechanismAssemblyControl resultControl)
-        {
-            return TypeUtils.GetField<TableLayoutPanel>(resultControl, "probabilityPanel");
-        }
-
-        private static TableLayoutPanel GetGroupPanel(FailureMechanismAssemblyControl resultControl)
-        {
-            return TypeUtils.GetField<TableLayoutPanel>(resultControl, "GroupPanel");
-        }
     }
 }
\ No newline at end of file