Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FailureMechanismAssemblyCategoriesBaseProperties.cs
===================================================================
diff -u -r2d8411b48599eb45028ec924641b50ee6edd71c2 -re6944724df4a525632b83d596ca0ae4b2ebc0766
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FailureMechanismAssemblyCategoriesBaseProperties.cs	(.../FailureMechanismAssemblyCategoriesBaseProperties.cs)	(revision 2d8411b48599eb45028ec924641b50ee6edd71c2)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FailureMechanismAssemblyCategoriesBaseProperties.cs	(.../FailureMechanismAssemblyCategoriesBaseProperties.cs)	(revision e6944724df4a525632b83d596ca0ae4b2ebc0766)
@@ -27,10 +27,7 @@
 using Core.Common.Gui.Converters;
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Util.Attributes;
-using Ringtoets.Common.Data.AssemblyTool;
-using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Contribution;
-using Ringtoets.Common.Data.Exceptions;
+using Ringtoets.AssemblyTool.Data;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Forms.Properties;
 
@@ -39,42 +36,42 @@
     /// <summary>
     /// Base ViewModel of the assembly categories in a <see cref="IFailureMechanism"/> for properties panel.
     /// </summary>
-    public abstract class FailureMechanismAssemblyCategoriesBaseProperties : ObjectProperties<IFailureMechanism>
+    public class FailureMechanismAssemblyCategoriesBaseProperties : ObjectProperties<IFailureMechanism>
     {
         private const int failureMechanismAssemblyCategoryPropertyIndex = 1;
         private const int failureMechanismSectionAssemblyCategoryPropertyIndex = 2;
+        private readonly Func<IEnumerable<FailureMechanismAssemblyCategory>> getFailureMechanismAssemblyCategoryFunc;
+        private readonly Func<IEnumerable<FailureMechanismSectionAssemblyCategory>> getFailureMechanismSectionAssemblyCategoryFunc;
 
-        protected readonly IAssessmentSection AssessmentSection;
-        protected readonly Func<double> GetNFunc;
-
         /// <summary>
         /// Creates a new instance of <see cref="FailureMechanismAssemblyCategoriesBaseProperties"/>.
         /// </summary>
         /// <param name="failureMechanism">The failure mechanism to show the properties for.</param>
-        /// <param name="assessmentSection">The assessment section to show the properties for.</param>
-        /// <param name="getNFunc">The function to get the 'N' parameter used to factor in the 'length effect'.</param>
+        /// <param name="getFailureMechanismAssemblyCategoryFunc">The function to get a collection of <see cref="FailureMechanismAssemblyCategory"/>.</param>
+        /// <param name="getFailureMechanismSectionAssemblyCategoryFunc">The function to get a collection of <see cref="FailureMechanismSectionAssemblyCategory"/>.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        protected FailureMechanismAssemblyCategoriesBaseProperties(IFailureMechanism failureMechanism,
-                                                                   IAssessmentSection assessmentSection,
-                                                                   Func<double> getNFunc)
+        public FailureMechanismAssemblyCategoriesBaseProperties(IFailureMechanism failureMechanism,
+                                                                Func<IEnumerable<FailureMechanismAssemblyCategory>> getFailureMechanismAssemblyCategoryFunc,
+                                                                Func<IEnumerable<FailureMechanismSectionAssemblyCategory>> getFailureMechanismSectionAssemblyCategoryFunc)
         {
             if (failureMechanism == null)
             {
                 throw new ArgumentNullException(nameof(failureMechanism));
             }
 
-            if (assessmentSection == null)
+            if (getFailureMechanismAssemblyCategoryFunc == null)
             {
-                throw new ArgumentNullException(nameof(assessmentSection));
+                throw new ArgumentNullException(nameof(getFailureMechanismAssemblyCategoryFunc));
             }
 
-            if (getNFunc == null)
+            if (getFailureMechanismSectionAssemblyCategoryFunc == null)
             {
-                throw new ArgumentNullException(nameof(getNFunc));
+                throw new ArgumentNullException(nameof(getFailureMechanismSectionAssemblyCategoryFunc));
             }
 
-            AssessmentSection = assessmentSection;
-            GetNFunc = getNFunc;
+            this.getFailureMechanismAssemblyCategoryFunc = getFailureMechanismAssemblyCategoryFunc;
+            this.getFailureMechanismSectionAssemblyCategoryFunc = getFailureMechanismSectionAssemblyCategoryFunc;
+
             Data = failureMechanism;
         }
 
@@ -87,7 +84,7 @@
         {
             get
             {
-                return CreateFailureMechanismAssemblyCategories().ToArray();
+                return getFailureMechanismAssemblyCategoryFunc().Select(category => new FailureMechanismAssemblyCategoryProperties(category)).ToArray();
             }
         }
 
@@ -100,31 +97,8 @@
         {
             get
             {
-                return CreateFailureMechanismSectionAssemblyCategories().ToArray();
+                return getFailureMechanismSectionAssemblyCategoryFunc().Select(category => new FailureMechanismSectionAssemblyCategoryProperties(category)).ToArray();
             }
         }
-
-        /// <summary>
-        /// Creates the collection of <see cref="FailureMechanismSectionAssemblyCategoryProperties"/> for the
-        /// <see cref="IFailureMechanism"/> in <see cref="Data"/>.
-        /// </summary>
-        /// <returns>A collection of <see cref="FailureMechanismSectionAssemblyCategoryProperties"/>.</returns>
-        protected abstract IEnumerable<FailureMechanismSectionAssemblyCategoryProperties> CreateFailureMechanismSectionAssemblyCategories();
-
-        /// <summary>
-        /// Creates the collection of <see cref="FailureMechanismAssemblyCategoryProperties"/> for the
-        /// <see cref="IFailureMechanism"/> in <see cref="Data"/>.
-        /// </summary>
-        /// <returns>A collection of <see cref="FailureMechanismAssemblyCategoryProperties"/>.</returns>
-        /// <exception cref="AssemblyException">Thrown when an error occurred while creating the categories.</exception>
-        private IEnumerable<FailureMechanismAssemblyCategoryProperties> CreateFailureMechanismAssemblyCategories()
-        {
-            FailureMechanismContribution failureMechanismContribution = AssessmentSection.FailureMechanismContribution;
-            return AssemblyToolCategoriesFactory.CreateFailureMechanismAssemblyCategories(failureMechanismContribution.SignalingNorm,
-                                                                                          failureMechanismContribution.LowerLimitNorm,
-                                                                                          data.Contribution,
-                                                                                          GetNFunc())
-                                                .Select(category => new FailureMechanismAssemblyCategoryProperties(category));
-        }
     }
 }
\ No newline at end of file
Fisheye: Tag e6944724df4a525632b83d596ca0ae4b2ebc0766 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FailureMechanismAssemblyCategoriesProperties.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e6944724df4a525632b83d596ca0ae4b2ebc0766 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/GeotechnicalFailureMechanismAssemblyCategoriesProperties.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -rbed9a78467c584c41edfdeadd4dce27b9e23d1ae -re6944724df4a525632b83d596ca0ae4b2ebc0766
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision bed9a78467c584c41edfdeadd4dce27b9e23d1ae)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj	(.../Ringtoets.Common.Forms.csproj)	(revision e6944724df4a525632b83d596ca0ae4b2ebc0766)
@@ -96,8 +96,6 @@
     <Compile Include="PropertyClasses\DesignVariableProperties.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionAssemblyCategoryProperties.cs" />
     <Compile Include="PropertyClasses\FailureMechanismAssemblyCategoryProperties.cs" />
-    <Compile Include="PropertyClasses\FailureMechanismAssemblyCategoriesProperties.cs" />
-    <Compile Include="PropertyClasses\GeotechnicalFailureMechanismAssemblyCategoriesProperties.cs" />
     <Compile Include="PropertyClasses\FailureMechanismAssemblyCategoriesBaseProperties.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionProbabilityAssessmentProperties.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionsProbabilityAssessmentProperties.cs" />
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismAssemblyCategoriesBasePropertiesTest.cs
===================================================================
diff -u -r2d8411b48599eb45028ec924641b50ee6edd71c2 -re6944724df4a525632b83d596ca0ae4b2ebc0766
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismAssemblyCategoriesBasePropertiesTest.cs	(.../FailureMechanismAssemblyCategoriesBasePropertiesTest.cs)	(revision 2d8411b48599eb45028ec924641b50ee6edd71c2)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismAssemblyCategoriesBasePropertiesTest.cs	(.../FailureMechanismAssemblyCategoriesBasePropertiesTest.cs)	(revision e6944724df4a525632b83d596ca0ae4b2ebc0766)
@@ -28,12 +28,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.AssemblyTool.Data;
-using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators;
-using Ringtoets.Common.Data.AssemblyTool;
-using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.Common.Forms.TestUtil;
 
@@ -45,107 +40,82 @@
         [Test]
         public void Constructor_FailureMechanismNull_ThrowsArgumentNullException()
         {
-            // Setup
-            var mocks = new MockRepository();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
-
             // Call
-            TestDelegate call = () => new TestFailureMechanismAssemblyCategoriesProperties(null,
-                                                                                           assessmentSection,
-                                                                                           () => 0.01);
+            TestDelegate call = () => new FailureMechanismAssemblyCategoriesBaseProperties(null,
+                                                                                           GetFailureMechanismAssemblyCategory,
+                                                                                           GetFailureMechanismSectionAssemblyCategory);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
             Assert.AreEqual("failureMechanism", exception.ParamName);
-            mocks.VerifyAll();
         }
 
         [Test]
-        public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
+        public void Constructor_GetFailureMechanismAssemblyCategoryFuncNull_ThrowsArgumentNullException()
         {
             // Setup
             var mocks = new MockRepository();
             var failureMechanism = mocks.Stub<IFailureMechanism>();
             mocks.ReplayAll();
 
             // Call
-            TestDelegate call = () => new TestFailureMechanismAssemblyCategoriesProperties(failureMechanism,
+            TestDelegate call = () => new FailureMechanismAssemblyCategoriesBaseProperties(failureMechanism,
                                                                                            null,
-                                                                                           () => 0.01);
+                                                                                           GetFailureMechanismSectionAssemblyCategory);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("assessmentSection", exception.ParamName);
+            Assert.AreEqual("getFailureMechanismAssemblyCategoryFunc", exception.ParamName);
             mocks.VerifyAll();
         }
 
         [Test]
-        public void Constructor_GetNFuncNull_ThrowsArgumentNullException()
+        public void Constructor_GetFailureMechanismSectionAssemblyCategoryFuncNull_ThrowsArgumentNullException()
         {
             // Setup
             var mocks = new MockRepository();
             var failureMechanism = mocks.Stub<IFailureMechanism>();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
             // Call
-            TestDelegate call = () => new TestFailureMechanismAssemblyCategoriesProperties(failureMechanism,
-                                                                                           assessmentSection,
+            TestDelegate call = () => new FailureMechanismAssemblyCategoriesBaseProperties(failureMechanism,
+                                                                                           GetFailureMechanismAssemblyCategory,
                                                                                            null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("getNFunc", exception.ParamName);
+            Assert.AreEqual("getFailureMechanismSectionAssemblyCategoryFunc", exception.ParamName);
             mocks.VerifyAll();
         }
 
         [Test]
         public void Constructor_ValidParameters_ExpectedValues()
         {
             // Setup
-            const double n = 1.0;
-
             var mocks = new MockRepository();
             var failureMechanism = mocks.Stub<IFailureMechanism>();
-            failureMechanism.Contribution = 5;
-            var assessmentSection = new AssessmentSectionStub();
             mocks.ReplayAll();
 
-            using (new AssemblyToolCalculatorFactoryConfig())
-            {
-                // Call
-                var properties = new TestFailureMechanismAssemblyCategoriesProperties(failureMechanism,
-                                                                                      assessmentSection,
-                                                                                      () => n);
+            // Call
+            var properties = new FailureMechanismAssemblyCategoriesBaseProperties(failureMechanism,
+                                                                                  GetFailureMechanismAssemblyCategory,
+                                                                                  GetFailureMechanismSectionAssemblyCategory);
 
-                // Assert
-                Assert.IsInstanceOf<ObjectProperties<IFailureMechanism>>(properties);
-                Assert.AreSame(failureMechanism, properties.Data);
+            // Assert
+            Assert.IsInstanceOf<ObjectProperties<IFailureMechanism>>(properties);
+            Assert.AreSame(failureMechanism, properties.Data);
 
-                TestHelper.AssertTypeConverter<TestFailureMechanismAssemblyCategoriesProperties, ExpandableArrayConverter>(
-                    nameof(TestFailureMechanismAssemblyCategoriesProperties.FailureMechanismAssemblyCategories));
-                TestHelper.AssertTypeConverter<TestFailureMechanismAssemblyCategoriesProperties, ExpandableArrayConverter>(
-                    nameof(TestFailureMechanismAssemblyCategoriesProperties.FailureMechanismSectionAssemblyCategories));
+            TestHelper.AssertTypeConverter<FailureMechanismAssemblyCategoriesBaseProperties, ExpandableArrayConverter>(
+                nameof(FailureMechanismAssemblyCategoriesBaseProperties.FailureMechanismAssemblyCategories));
+            TestHelper.AssertTypeConverter<FailureMechanismAssemblyCategoriesBaseProperties, ExpandableArrayConverter>(
+                nameof(FailureMechanismAssemblyCategoriesBaseProperties.FailureMechanismSectionAssemblyCategories));
 
-                FailureMechanismContribution failureMechanismContribution = assessmentSection.FailureMechanismContribution;
-                IEnumerable<FailureMechanismAssemblyCategory> expectedFailureMechanismCategories =
-                    AssemblyToolCategoriesFactory.CreateFailureMechanismAssemblyCategories(
-                        failureMechanismContribution.SignalingNorm,
-                        failureMechanismContribution.LowerLimitNorm,
-                        failureMechanism.Contribution,
-                        n);
+            AssemblyCategoryPropertiesTestHelper.AssertFailureMechanismAssemblyCategoryProperties(
+                GetFailureMechanismAssemblyCategory(),
+                GetFailureMechanismSectionAssemblyCategory(),
+                properties);
 
-                AssemblyCategoryPropertiesTestHelper.AssertFailureMechanismAssemblyCategoryProperties(
-                    expectedFailureMechanismCategories,
-                    new[]
-                    {
-                        new FailureMechanismSectionAssemblyCategory(0.0, 1.0, FailureMechanismSectionAssemblyCategoryGroup.IIIv)
-                    },
-                    properties);
-
-                mocks.VerifyAll();
-            }
+            mocks.VerifyAll();
         }
 
         [Test]
@@ -154,13 +124,12 @@
             // Setup
             var mocks = new MockRepository();
             var failureMechanism = mocks.Stub<IFailureMechanism>();
-            var assessmentSection = new AssessmentSectionStub();
             mocks.ReplayAll();
 
             // Call
-            var properties = new TestFailureMechanismAssemblyCategoriesProperties(failureMechanism,
-                                                                                  assessmentSection,
-                                                                                  () => 0.01);
+            var properties = new FailureMechanismAssemblyCategoriesBaseProperties(failureMechanism,
+                                                                                  GetFailureMechanismAssemblyCategory,
+                                                                                  GetFailureMechanismSectionAssemblyCategory);
             // Assert
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
             Assert.AreEqual(2, dynamicProperties.Count);
@@ -184,19 +153,18 @@
             mocks.VerifyAll();
         }
 
-        private class TestFailureMechanismAssemblyCategoriesProperties : FailureMechanismAssemblyCategoriesBaseProperties
+        private IEnumerable<FailureMechanismSectionAssemblyCategory> GetFailureMechanismSectionAssemblyCategory()
         {
-            public TestFailureMechanismAssemblyCategoriesProperties(IFailureMechanism failureMechanism, IAssessmentSection assessmentSection, Func<double> getNFunc)
-                : base(failureMechanism, assessmentSection, getNFunc) {}
+            var random = new Random(21);
 
-            protected override IEnumerable<FailureMechanismSectionAssemblyCategoryProperties> CreateFailureMechanismSectionAssemblyCategories()
-            {
-                return new[]
-                {
-                    new FailureMechanismSectionAssemblyCategoryProperties(
-                        new FailureMechanismSectionAssemblyCategory(0.0, 1.0, FailureMechanismSectionAssemblyCategoryGroup.IIIv))
-                };
-            }
+            yield return new FailureMechanismSectionAssemblyCategory(random.NextDouble(), random.NextDouble(), random.NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>());
         }
+
+        private IEnumerable<FailureMechanismAssemblyCategory> GetFailureMechanismAssemblyCategory()
+        {
+            var random = new Random(21);
+
+            yield return new FailureMechanismAssemblyCategory(random.NextDouble(), random.NextDouble(), random.NextEnumValue<FailureMechanismAssemblyCategoryGroup>());
+        }
     }
 }
\ No newline at end of file
Fisheye: Tag e6944724df4a525632b83d596ca0ae4b2ebc0766 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FailureMechanismAssemblyCategoriesPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e6944724df4a525632b83d596ca0ae4b2ebc0766 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/GeotechnicalFailureMechanismAssemblyCategoriesPropertiesTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj
===================================================================
diff -u -rbed9a78467c584c41edfdeadd4dce27b9e23d1ae -re6944724df4a525632b83d596ca0ae4b2ebc0766
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision bed9a78467c584c41edfdeadd4dce27b9e23d1ae)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj	(.../Ringtoets.Common.Forms.Test.csproj)	(revision e6944724df4a525632b83d596ca0ae4b2ebc0766)
@@ -98,8 +98,6 @@
     <Compile Include="PropertyClasses\DesignVariablePropertiesTest.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionAssemblyCategoryPropertiesTest.cs" />
     <Compile Include="PropertyClasses\FailureMechanismAssemblyCategoryPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\FailureMechanismAssemblyCategoriesPropertiesTest.cs" />
-    <Compile Include="PropertyClasses\GeotechnicalFailureMechanismAssemblyCategoriesPropertiesTest.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionProbabilityAssessmentPropertiesTest.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionPropertiesTest.cs" />
     <Compile Include="PropertyClasses\FailureMechanismSectionsProbabilityAssessmentPropertiesTest.cs" />