Fisheye: Tag 432b46a640176168e7bbb391c08f25fc76b877b7 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/GrassCoverSlipOffInwardsAssemblyMapDataFeaturesFactory.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 432b46a640176168e7bbb391c08f25fc76b877b7 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/GrassCoverSlipOffOutwardsAssemblyMapDataFeaturesFactory.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 432b46a640176168e7bbb391c08f25fc76b877b7 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/MicrostabilityAssemblyMapDataFeaturesFactory.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 432b46a640176168e7bbb391c08f25fc76b877b7 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/PipingStructureAssemblyMapDataFeaturesFactory.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 432b46a640176168e7bbb391c08f25fc76b877b7 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/WaterPressureAsphaltCoverAssemblyMapDataFeaturesFactory.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismWithDetailedAssessmentView.cs
===================================================================
diff -u -r959e36fe7429c4b54ccd4b197fce3fa2b89bda88 -r432b46a640176168e7bbb391c08f25fc76b877b7
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismWithDetailedAssessmentView.cs	(.../FailureMechanismWithDetailedAssessmentView.cs)	(revision 959e36fe7429c4b54ccd4b197fce3fa2b89bda88)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismWithDetailedAssessmentView.cs	(.../FailureMechanismWithDetailedAssessmentView.cs)	(revision 432b46a640176168e7bbb391c08f25fc76b877b7)
@@ -24,8 +24,8 @@
 using System.Windows.Forms;
 using Core.Common.Base;
 using Core.Components.Gis.Data;
-using Core.Components.Gis.Features;
 using Core.Components.Gis.Forms;
+using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Forms.Factories;
@@ -37,15 +37,13 @@
     /// This class is a view showing map data for a failure mechanism with a detailed assessment.
     /// </summary>
     public partial class FailureMechanismWithDetailedAssessmentView<TFailureMechanism, TSectionResult> : UserControl, IMapView
-        where TFailureMechanism : IHasSectionResults<TSectionResult>
-        where TSectionResult : FailureMechanismSectionResultOld
+        where TFailureMechanism : IHasSectionResults<FailureMechanismSectionResultOld, TSectionResult>
+        where TSectionResult : FailureMechanismSectionResult
     {
-        private readonly Func<IEnumerable<MapFeature>> getSimpleAssemblyFeaturesFunc;
-        private readonly Func<IEnumerable<MapFeature>> getDetailedAssemblyFeaturesFunc;
-        private readonly Func<IEnumerable<MapFeature>> getTailorMadeAssemblyFeaturesFunc;
-        private readonly Func<IEnumerable<MapFeature>> getCombinedAssemblyFeaturesFunc;
+        private readonly Func<TSectionResult, FailureMechanismSectionAssemblyResult> performAssemblyFunc;
 
         private HydraulicBoundaryLocationsMapLayer hydraulicBoundaryLocationsMapLayer;
+        private NonCalculatableFailureMechanismSectionResultsMapLayer<TSectionResult> assemblyResultMapLayer;
 
         private MapDataCollection mapDataCollection;
         private MapLineData referenceLineMapData;
@@ -54,37 +52,20 @@
         private MapPointData sectionsStartPointMapData;
         private MapPointData sectionsEndPointMapData;
 
-        private MapLineData simpleAssemblyMapData;
-        private MapLineData detailedAssemblyMapData;
-        private MapLineData tailorMadeAssemblyMapData;
-        private MapLineData combinedAssemblyMapData;
-
         private Observer failureMechanismObserver;
         private Observer assessmentSectionObserver;
         private Observer referenceLineObserver;
 
-        private RecursiveObserver<IObservableEnumerable<TSectionResult>, TSectionResult> sectionResultObserver;
-
         /// <summary>
         /// Creates a new instance of <see cref="FailureMechanismWithDetailedAssessmentView{TFailureMechanism, TSectionResult}"/>.
         /// </summary>
         /// <param name="failureMechanism">The failure mechanism to show the data for.</param>
         /// <param name="assessmentSection">The assessment section to show the data for.</param>
-        /// <param name="getSimpleAssemblyFeaturesFunc">The <see cref="Func{T}"/> that returns a collection of <see cref="MapFeature"/> representing
-        /// the simple assembly results for this failure mechanism.</param>
-        /// <param name="getDetailedAssemblyFeaturesFunc">The <see cref="Func{T}"/> that returns a collection of <see cref="MapFeature"/> representing
-        /// the detailed assembly results for this failure mechanism.</param>
-        /// <param name="getTailorMadeAssemblyFeaturesFunc">The <see cref="Func{T}"/> that returns a collection of <see cref="MapFeature"/> representing
-        /// the tailor made assembly results for this failure mechanism.</param>
-        /// <param name="getCombinedAssemblyFeaturesFunc">The <see cref="Func{T}"/> that returns a collection of <see cref="MapFeature"/> representing
-        /// the combined assembly results for this failure mechanism.</param>
+        /// <param name="performAssemblyFunc">The <see cref="Func{T1,TResult}"/> used to assemble the result of a section result.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public FailureMechanismWithDetailedAssessmentView(TFailureMechanism failureMechanism,
-                                                          IAssessmentSection assessmentSection,
-                                                          Func<IEnumerable<MapFeature>> getSimpleAssemblyFeaturesFunc,
-                                                          Func<IEnumerable<MapFeature>> getDetailedAssemblyFeaturesFunc,
-                                                          Func<IEnumerable<MapFeature>> getTailorMadeAssemblyFeaturesFunc,
-                                                          Func<IEnumerable<MapFeature>> getCombinedAssemblyFeaturesFunc)
+        public FailureMechanismWithDetailedAssessmentView(
+            TFailureMechanism failureMechanism, IAssessmentSection assessmentSection,
+            Func<TSectionResult, FailureMechanismSectionAssemblyResult> performAssemblyFunc)
         {
             if (failureMechanism == null)
             {
@@ -96,35 +77,16 @@
                 throw new ArgumentNullException(nameof(assessmentSection));
             }
 
-            if (getSimpleAssemblyFeaturesFunc == null)
+            if (performAssemblyFunc == null)
             {
-                throw new ArgumentNullException(nameof(getSimpleAssemblyFeaturesFunc));
+                throw new ArgumentNullException(nameof(performAssemblyFunc));
             }
 
-            if (getDetailedAssemblyFeaturesFunc == null)
-            {
-                throw new ArgumentNullException(nameof(getDetailedAssemblyFeaturesFunc));
-            }
-
-            if (getTailorMadeAssemblyFeaturesFunc == null)
-            {
-                throw new ArgumentNullException(nameof(getTailorMadeAssemblyFeaturesFunc));
-            }
-
-            if (getCombinedAssemblyFeaturesFunc == null)
-            {
-                throw new ArgumentNullException(nameof(getCombinedAssemblyFeaturesFunc));
-            }
-
-            this.getSimpleAssemblyFeaturesFunc = getSimpleAssemblyFeaturesFunc;
-            this.getDetailedAssemblyFeaturesFunc = getDetailedAssemblyFeaturesFunc;
-            this.getTailorMadeAssemblyFeaturesFunc = getTailorMadeAssemblyFeaturesFunc;
-            this.getCombinedAssemblyFeaturesFunc = getCombinedAssemblyFeaturesFunc;
-
             InitializeComponent();
 
             FailureMechanism = failureMechanism;
             AssessmentSection = assessmentSection;
+            this.performAssemblyFunc = performAssemblyFunc;
 
             CreateObservers();
 
@@ -145,21 +107,15 @@
 
         public object Data { get; set; }
 
-        public IMapControl Map
-        {
-            get
-            {
-                return riskeerMapControl.MapControl;
-            }
-        }
+        public IMapControl Map => riskeerMapControl.MapControl;
 
         protected override void Dispose(bool disposing)
         {
             failureMechanismObserver.Dispose();
             assessmentSectionObserver.Dispose();
             referenceLineObserver.Dispose();
             hydraulicBoundaryLocationsMapLayer.Dispose();
-            sectionResultObserver.Dispose();
+            assemblyResultMapLayer.Dispose();
 
             if (disposing)
             {
@@ -180,11 +136,8 @@
             sectionsStartPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsStartPointMapData();
             sectionsEndPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsEndPointMapData();
 
-            MapDataCollection assemblyMapDataCollection = AssemblyMapDataFactory.CreateAssemblyMapDataCollection();
-            tailorMadeAssemblyMapData = AssemblyMapDataFactory.CreateTailorMadeAssemblyMapData();
-            detailedAssemblyMapData = AssemblyMapDataFactory.CreateDetailedAssemblyMapData();
-            simpleAssemblyMapData = AssemblyMapDataFactory.CreateSimpleAssemblyMapData();
-            combinedAssemblyMapData = AssemblyMapDataFactory.CreateCombinedAssemblyMapData();
+            assemblyResultMapLayer = new NonCalculatableFailureMechanismSectionResultsMapLayer<TSectionResult>(
+                FailureMechanism, performAssemblyFunc);
 
             mapDataCollection.Add(referenceLineMapData);
 
@@ -193,12 +146,7 @@
             sectionsMapDataCollection.Add(sectionsEndPointMapData);
             mapDataCollection.Add(sectionsMapDataCollection);
 
-            assemblyMapDataCollection.Add(tailorMadeAssemblyMapData);
-            assemblyMapDataCollection.Add(detailedAssemblyMapData);
-            assemblyMapDataCollection.Add(simpleAssemblyMapData);
-            assemblyMapDataCollection.Add(combinedAssemblyMapData);
-            mapDataCollection.Add(assemblyMapDataCollection);
-
+            mapDataCollection.Add(assemblyResultMapLayer.MapData);
             mapDataCollection.Add(hydraulicBoundaryLocationsMapLayer.MapData);
         }
 
@@ -216,41 +164,14 @@
             {
                 Observable = AssessmentSection.ReferenceLine
             };
-
-            sectionResultObserver = new RecursiveObserver<IObservableEnumerable<TSectionResult>, TSectionResult>(UpdateAssemblyMapData, sr => sr)
-            {
-                Observable = FailureMechanism.SectionResultsOld
-            };
         }
 
         private void SetAllMapDataFeatures()
         {
             SetReferenceLineMapData();
             SetSectionsMapData();
-            UpdateAssemblyMapData();
         }
 
-        #region Assembly MapData
-
-        private void UpdateAssemblyMapData()
-        {
-            SetAssemblyMapData();
-            simpleAssemblyMapData.NotifyObservers();
-            detailedAssemblyMapData.NotifyObservers();
-            tailorMadeAssemblyMapData.NotifyObservers();
-            combinedAssemblyMapData.NotifyObservers();
-        }
-
-        private void SetAssemblyMapData()
-        {
-            simpleAssemblyMapData.Features = getSimpleAssemblyFeaturesFunc();
-            detailedAssemblyMapData.Features = getDetailedAssemblyFeaturesFunc();
-            tailorMadeAssemblyMapData.Features = getTailorMadeAssemblyFeaturesFunc();
-            combinedAssemblyMapData.Features = getCombinedAssemblyFeaturesFunc();
-        }
-
-        #endregion
-
         #region AssessmentSection MapData
 
         private void UpdateReferenceLineMapData()
@@ -275,8 +196,6 @@
             sectionsMapData.NotifyObservers();
             sectionsStartPointMapData.NotifyObservers();
             sectionsEndPointMapData.NotifyObservers();
-
-            UpdateAssemblyMapData();
         }
 
         private void SetSectionsMapData()
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -r28eb5cbe63e6fe992d25a4856fbd1564ca657236 -r432b46a640176168e7bbb391c08f25fc76b877b7
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 28eb5cbe63e6fe992d25a4856fbd1564ca657236)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 432b46a640176168e7bbb391c08f25fc76b877b7)
@@ -41,8 +41,10 @@
 using Core.Gui.Helpers;
 using Core.Gui.Plugin;
 using log4net;
+using Riskeer.AssemblyTool.Data;
 using Riskeer.ClosingStructures.Forms.PresentationObjects;
 using Riskeer.Common.Data;
+using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.DikeProfiles;
@@ -78,9 +80,7 @@
 using Riskeer.Integration.Data.FailurePath;
 using Riskeer.Integration.Data.StandAlone;
 using Riskeer.Integration.Data.StandAlone.AssemblyFactories;
-using Riskeer.Integration.Data.StandAlone.SectionResults;
 using Riskeer.Integration.Forms.Dialogs;
-using Riskeer.Integration.Forms.Factories;
 using Riskeer.Integration.Forms.Merge;
 using Riskeer.Integration.Forms.PresentationObjects;
 using Riskeer.Integration.Forms.PresentationObjects.StandAlone;
@@ -397,49 +397,20 @@
                 CloseForData = CloseAssessmentSectionViewForData
             };
 
-            yield return CreateFailureMechanismWithDetailedAssessmentViewInfo<MicrostabilityFailurePathContext, MicrostabilityFailureMechanism, MicrostabilityFailureMechanismSectionResultOld>(
-                context => new FailureMechanismWithDetailedAssessmentView<MicrostabilityFailureMechanism, MicrostabilityFailureMechanismSectionResultOld>(
-                    context.WrappedData,
-                    context.Parent,
-                    () => MicrostabilityAssemblyMapDataFeaturesFactory.CreateSimpleAssemblyFeatures(context.WrappedData),
-                    () => MicrostabilityAssemblyMapDataFeaturesFactory.CreateDetailedAssemblyFeatures(context.WrappedData),
-                    () => MicrostabilityAssemblyMapDataFeaturesFactory.CreateTailorMadeAssemblyFeatures(context.WrappedData),
-                    () => MicrostabilityAssemblyMapDataFeaturesFactory.CreateCombinedAssemblyFeatures(context.WrappedData)));
+            yield return CreateFailureMechanismWithDetailedAssessmentViewInfo<MicrostabilityFailurePathContext, MicrostabilityFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(
+                (context, sr) => StandAloneFailureMechanismAssemblyFactory.AssembleSection(sr, context.WrappedData, context.Parent));
 
-            yield return CreateFailureMechanismWithDetailedAssessmentViewInfo<GrassCoverSlipOffOutwardsFailurePathContext, GrassCoverSlipOffOutwardsFailureMechanism, GrassCoverSlipOffOutwardsFailureMechanismSectionResultOld>(
-                context => new FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffOutwardsFailureMechanism, GrassCoverSlipOffOutwardsFailureMechanismSectionResultOld>(
-                    context.WrappedData,
-                    context.Parent,
-                    () => GrassCoverSlipOffOutwardsAssemblyMapDataFeaturesFactory.CreateSimpleAssemblyFeatures(context.WrappedData),
-                    () => GrassCoverSlipOffOutwardsAssemblyMapDataFeaturesFactory.CreateDetailedAssemblyFeatures(context.WrappedData),
-                    () => GrassCoverSlipOffOutwardsAssemblyMapDataFeaturesFactory.CreateTailorMadeAssemblyFeatures(context.WrappedData),
-                    () => GrassCoverSlipOffOutwardsAssemblyMapDataFeaturesFactory.CreateCombinedAssemblyFeatures(context.WrappedData)));
+            yield return CreateFailureMechanismWithDetailedAssessmentViewInfo<GrassCoverSlipOffOutwardsFailurePathContext, GrassCoverSlipOffOutwardsFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(
+                (context, sr) => StandAloneFailureMechanismAssemblyFactory.AssembleSection(sr, context.WrappedData, context.Parent));
 
-            yield return CreateFailureMechanismWithDetailedAssessmentViewInfo<GrassCoverSlipOffInwardsFailurePathContext, GrassCoverSlipOffInwardsFailureMechanism, GrassCoverSlipOffInwardsFailureMechanismSectionResultOld>(
-                context => new FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffInwardsFailureMechanism, GrassCoverSlipOffInwardsFailureMechanismSectionResultOld>(
-                    context.WrappedData,
-                    context.Parent,
-                    () => GrassCoverSlipOffInwardsAssemblyMapDataFeaturesFactory.CreateSimpleAssemblyFeatures(context.WrappedData),
-                    () => GrassCoverSlipOffInwardsAssemblyMapDataFeaturesFactory.CreateDetailedAssemblyFeatures(context.WrappedData),
-                    () => GrassCoverSlipOffInwardsAssemblyMapDataFeaturesFactory.CreateTailorMadeAssemblyFeatures(context.WrappedData),
-                    () => GrassCoverSlipOffInwardsAssemblyMapDataFeaturesFactory.CreateCombinedAssemblyFeatures(context.WrappedData)));
+            yield return CreateFailureMechanismWithDetailedAssessmentViewInfo<GrassCoverSlipOffInwardsFailurePathContext, GrassCoverSlipOffInwardsFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(
+                (context, sr) => StandAloneFailureMechanismAssemblyFactory.AssembleSection(sr, context.WrappedData, context.Parent));
 
-            yield return CreateFailureMechanismWithDetailedAssessmentViewInfo<PipingStructureFailurePathContext, PipingStructureFailureMechanism, PipingStructureFailureMechanismSectionResultOld>(
-                context => new FailureMechanismWithDetailedAssessmentView<PipingStructureFailureMechanism, PipingStructureFailureMechanismSectionResultOld>(
-                    context.WrappedData,
-                    context.Parent,
-                    () => PipingStructureAssemblyMapDataFeaturesFactory.CreateSimpleAssemblyFeatures(context.WrappedData),
-                    () => PipingStructureAssemblyMapDataFeaturesFactory.CreateDetailedAssemblyFeatures(context.WrappedData),
-                    () => PipingStructureAssemblyMapDataFeaturesFactory.CreateTailorMadeAssemblyFeatures(context.WrappedData),
-                    () => PipingStructureAssemblyMapDataFeaturesFactory.CreateCombinedAssemblyFeatures(context.WrappedData)));
+            yield return CreateFailureMechanismWithDetailedAssessmentViewInfo<PipingStructureFailurePathContext, PipingStructureFailureMechanism, NonAdoptableFailureMechanismSectionResult>(
+                (context, sr) => FailureMechanismSectionAssemblyResultFactory.AssembleSection(sr, context.Parent));
 
-            yield return CreateFailureMechanismWithoutDetailedAssessmentViewInfo<WaterPressureAsphaltCoverFailurePathContext, WaterPressureAsphaltCoverFailureMechanism, WaterPressureAsphaltCoverFailureMechanismSectionResultOld>(
-                context => new FailureMechanismWithoutDetailedAssessmentView<WaterPressureAsphaltCoverFailureMechanism, WaterPressureAsphaltCoverFailureMechanismSectionResultOld>(
-                    context.WrappedData,
-                    context.Parent,
-                    () => WaterPressureAsphaltCoverAssemblyMapDataFeaturesFactory.CreateSimpleAssemblyFeatures(context.WrappedData),
-                    () => WaterPressureAsphaltCoverAssemblyMapDataFeaturesFactory.CreateTailorMadeAssemblyFeatures(context.WrappedData),
-                    () => WaterPressureAsphaltCoverAssemblyMapDataFeaturesFactory.CreateCombinedAssemblyFeatures(context.WrappedData)));
+            yield return CreateFailureMechanismWithDetailedAssessmentViewInfo<WaterPressureAsphaltCoverFailurePathContext, WaterPressureAsphaltCoverFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(
+                (context, sr) => StandAloneFailureMechanismAssemblyFactory.AssembleSection(sr, context.WrappedData, context.Parent));
 
             yield return CreateFailureMechanismResultViewInfo<GrassCoverSlipOffInwardsFailureMechanismSectionResultContext, GrassCoverSlipOffInwardsFailureMechanism>(
                 fm => fm.GeneralInput.N, fm => fm.GeneralInput.ApplyLengthEffectInSection);
@@ -1417,10 +1388,9 @@
         #region FailureMechanismWithDetailedAssessmentView ViewInfo
 
         private ViewInfo<TFailureMechanismContext, TFailureMechanism, FailureMechanismWithDetailedAssessmentView<TFailureMechanism, TSectionResult>> CreateFailureMechanismWithDetailedAssessmentViewInfo<
-            TFailureMechanismContext, TFailureMechanism, TSectionResult>(
-            Func<TFailureMechanismContext, FailureMechanismWithDetailedAssessmentView<TFailureMechanism, TSectionResult>> createInstanceFunc)
-            where TSectionResult : FailureMechanismSectionResultOld
-            where TFailureMechanism : FailureMechanismBase, IHasSectionResults<TSectionResult>
+            TFailureMechanismContext, TFailureMechanism, TSectionResult>(Func<TFailureMechanismContext, TSectionResult, FailureMechanismSectionAssemblyResult> performAssemblyFunc)
+            where TSectionResult : FailureMechanismSectionResult
+            where TFailureMechanism : FailureMechanismBase, IHasSectionResults<FailureMechanismSectionResultOld, TSectionResult>
             where TFailureMechanismContext : IFailurePathContext<TFailureMechanism>
         {
             return new RiskeerViewInfo<TFailureMechanismContext, TFailureMechanism,
@@ -1429,7 +1399,8 @@
                 GetViewName = (view, context) => context.WrappedData.Name,
                 CloseForData = (view, dataToCloseFor) => ReferenceEquals(view.AssessmentSection, dataToCloseFor),
                 AdditionalDataCheck = context => context.WrappedData.InAssembly,
-                CreateInstance = createInstanceFunc
+                CreateInstance = context => new FailureMechanismWithDetailedAssessmentView<TFailureMechanism, TSectionResult>(
+                    context.WrappedData, context.Parent, sr => performAssemblyFunc(context, sr))
             };
         }
 
Fisheye: Tag 432b46a640176168e7bbb391c08f25fc76b877b7 refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/GrassCoverSlipOffInwardsAssemblyMapDataFeaturesFactoryTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 432b46a640176168e7bbb391c08f25fc76b877b7 refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/GrassCoverSlipOffOutwardsAssemblyMapDataFeaturesFactoryTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 432b46a640176168e7bbb391c08f25fc76b877b7 refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/MicrostabilityAssemblyMapDataFeaturesFactoryTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 432b46a640176168e7bbb391c08f25fc76b877b7 refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/PipingStructureAssemblyMapDataFeaturesFactoryTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 432b46a640176168e7bbb391c08f25fc76b877b7 refers to a dead (removed) revision in file `Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/WaterPressureAsphaltCoverAssemblyMapDataFeaturesFactoryTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/FailureMechanismWithDetailedAssessmentViewTest.cs
===================================================================
diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -r432b46a640176168e7bbb391c08f25fc76b877b7
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/FailureMechanismWithDetailedAssessmentViewTest.cs	(.../FailureMechanismWithDetailedAssessmentViewTest.cs)	(revision dfd2e82406d3cafb83004a065b3ea1f943ced729)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/FailureMechanismWithDetailedAssessmentViewTest.cs	(.../FailureMechanismWithDetailedAssessmentViewTest.cs)	(revision 432b46a640176168e7bbb391c08f25fc76b877b7)
@@ -25,12 +25,13 @@
 using System.Windows.Forms;
 using Core.Common.Base;
 using Core.Common.Base.Geometry;
+using Core.Common.TestUtil;
 using Core.Components.Gis.Data;
-using Core.Components.Gis.Features;
 using Core.Components.Gis.Forms;
-using Core.Components.Gis.Geometries;
 using NUnit.Framework;
 using Rhino.Mocks;
+using Riskeer.AssemblyTool.Data;
+using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.Hydraulics;
@@ -53,18 +54,9 @@
         private const int sectionsStartPointIndex = 1;
         private const int sectionsEndPointIndex = 2;
 
-        private const int tailorMadeAssemblyIndex = 0;
-        private const int detailedAssemblyIndex = 1;
-        private const int simpleAssemblyIndex = 2;
-        private const int combinedAssemblyIndex = 3;
-
         private const int sectionsObserverIndex = 1;
         private const int sectionsStartPointObserverIndex = 2;
         private const int sectionsEndPointObserverIndex = 3;
-        private const int simpleAssemblyObserverIndex = 4;
-        private const int detailedAssemblyObserverIndex = 5;
-        private const int tailorMadeAssemblyObserverIndex = 6;
-        private const int combinedAssemblyObserverIndex = 7;
 
         [Test]
         public void Constructor_ExpectedValues()
@@ -74,8 +66,7 @@
             var assessmentSection = new AssessmentSectionStub();
 
             // Call
-            using (FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld>, FailureMechanismSectionResultOld> view =
-                CreateView(failureMechanism, assessmentSection))
+            using (FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>, FailureMechanismSectionResult> view = CreateView(failureMechanism, assessmentSection))
             {
                 // Assert
                 Assert.IsInstanceOf<UserControl>(view);
@@ -101,16 +92,11 @@
             mocks.ReplayAll();
 
             // Call
-            TestDelegate call = () => new FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld>, FailureMechanismSectionResultOld>(
-                null,
-                assessmentSection,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>);
+            void Call() => new FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>, FailureMechanismSectionResult>(
+                null, assessmentSection, sr => null);
 
             // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
             Assert.AreEqual("failureMechanism", exception.ParamName);
             mocks.VerifyAll();
         }
@@ -120,129 +106,47 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IHasSectionResults<FailureMechanismSectionResultOld>>();
+            var failureMechanism = mocks.Stub<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>>();
             mocks.ReplayAll();
 
             // Call
-            TestDelegate call = () => new FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld>, FailureMechanismSectionResultOld>(
-                failureMechanism,
-                null,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>);
+            void Call() => new FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>, FailureMechanismSectionResult>(
+                failureMechanism, null, sr => null);
 
             // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
             Assert.AreEqual("assessmentSection", exception.ParamName);
             mocks.VerifyAll();
         }
 
         [Test]
-        public void Constructor_GetSimpleAssemblyFeaturesFuncNull_ThrowsArgumentNullException()
+        public void Constructor_PerformAssemblyFuncNull_ThrowsArgumentNullException()
         {
             // Setup
             var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IHasSectionResults<FailureMechanismSectionResultOld>>();
+            var failureMechanism = mocks.Stub<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>>();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
             // Call
-            TestDelegate call = () => new FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld>, FailureMechanismSectionResultOld>(
-                failureMechanism,
-                assessmentSection,
-                null,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>);
+            void Call() => new FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>, FailureMechanismSectionResult>(
+                failureMechanism, assessmentSection, null);
 
             // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("getSimpleAssemblyFeaturesFunc", exception.ParamName);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("performAssemblyFunc", exception.ParamName);
             mocks.VerifyAll();
         }
 
         [Test]
-        public void Constructor_GetDetailedAssemblyFeaturesFuncNull_ThrowsArgumentNullException()
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IHasSectionResults<FailureMechanismSectionResultOld>>();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
-
-            // Call
-            TestDelegate call = () => new FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld>, FailureMechanismSectionResultOld>(
-                failureMechanism,
-                assessmentSection,
-                Enumerable.Empty<MapFeature>,
-                null,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("getDetailedAssemblyFeaturesFunc", exception.ParamName);
-            mocks.VerifyAll();
-        }
-
-        [Test]
-        public void Constructor_GetTailorMadeAssemblyFeaturesFuncNull_ThrowsArgumentNullException()
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IHasSectionResults<FailureMechanismSectionResultOld>>();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
-
-            // Call
-            TestDelegate call = () => new FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld>, FailureMechanismSectionResultOld>(
-                failureMechanism,
-                assessmentSection,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>,
-                null,
-                Enumerable.Empty<MapFeature>);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("getTailorMadeAssemblyFeaturesFunc", exception.ParamName);
-            mocks.VerifyAll();
-        }
-
-        [Test]
-        public void Constructor_GetCombinedAssemblyFeaturesFuncNull_ThrowsArgumentNullException()
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var failureMechanism = mocks.Stub<IHasSectionResults<FailureMechanismSectionResultOld>>();
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
-
-            // Call
-            TestDelegate call = () => new FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld>, FailureMechanismSectionResultOld>(
-                failureMechanism,
-                assessmentSection,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>,
-                null);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("getCombinedAssemblyFeaturesFunc", exception.ParamName);
-            mocks.VerifyAll();
-        }
-
-        [Test]
         public void Constructor_AssessmentSectionWithBackgroundData_BackgroundDataSet()
         {
             // Setup
             IAssessmentSection assessmentSection = new AssessmentSectionStub();
 
             // Call
-            using (FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld>, FailureMechanismSectionResultOld> view =
-                CreateView(new TestFailureMechanism(), assessmentSection))
+            using (FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>, FailureMechanismSectionResult> view =
+                   CreateView(new TestFailureMechanism(), assessmentSection))
             {
                 // Assert
                 MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData);
@@ -285,31 +189,14 @@
                 new FailureMechanismSection("C", geometryPoints.Skip(2).Take(2))
             });
 
-            var simpleAssemblyFeatures = new[]
-            {
-                new MapFeature(Enumerable.Empty<MapGeometry>())
-            };
-            var detailedAssemblyFeatures = new[]
-            {
-                new MapFeature(Enumerable.Empty<MapGeometry>())
-            };
-            var tailorMadeAssemblyFeatures = new[]
-            {
-                new MapFeature(Enumerable.Empty<MapGeometry>())
-            };
-            var combinedAssemblyFeatures = new[]
-            {
-                new MapFeature(Enumerable.Empty<MapGeometry>())
-            };
+            var random = new Random(21);
+            var failureMechanismSectionAssemblyResult = new FailureMechanismSectionAssemblyResult(
+                random.NextDouble(), random.NextDouble(), random.NextDouble(),
+                random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
 
             // Call
-            using (var view = new FailureMechanismWithDetailedAssessmentView<TestFailureMechanism, FailureMechanismSectionResultOld>(
-                failureMechanism,
-                assessmentSection,
-                () => simpleAssemblyFeatures,
-                () => detailedAssemblyFeatures,
-                () => tailorMadeAssemblyFeatures,
-                () => combinedAssemblyFeatures))
+            using (var view = new FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>, FailureMechanismSectionResult>(
+                       failureMechanism, assessmentSection, sr => failureMechanismSectionAssemblyResult))
             {
                 IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl;
 
@@ -328,12 +215,7 @@
 
                 MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(assessmentSection, mapDataList[hydraulicBoundaryLocationsIndex]);
 
-                IEnumerable<MapData> assemblyMapDataList = ((MapDataCollection) mapDataList[assemblyResultsIndex]).Collection;
-                Assert.AreEqual(4, assemblyMapDataList.Count());
-                CollectionAssert.AreEqual(simpleAssemblyFeatures, ((MapLineData) assemblyMapDataList.ElementAt(simpleAssemblyIndex)).Features);
-                CollectionAssert.AreEqual(detailedAssemblyFeatures, ((MapLineData) assemblyMapDataList.ElementAt(detailedAssemblyIndex)).Features);
-                CollectionAssert.AreEqual(tailorMadeAssemblyFeatures, ((MapLineData) assemblyMapDataList.ElementAt(tailorMadeAssemblyIndex)).Features);
-                CollectionAssert.AreEqual(combinedAssemblyFeatures, ((MapLineData) assemblyMapDataList.ElementAt(combinedAssemblyIndex)).Features);
+                MapDataTestHelper.AssertAssemblyMapData(failureMechanism, failureMechanismSectionAssemblyResult, mapDataList[assemblyResultsIndex]);
             }
         }
 
@@ -353,8 +235,8 @@
                 ReferenceLine = referenceLine
             };
 
-            using (FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld>, FailureMechanismSectionResultOld> view =
-                CreateView(new TestFailureMechanism(), assessmentSection))
+            using (FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>, FailureMechanismSectionResult> view =
+                   CreateView(new TestFailureMechanism(), assessmentSection))
             {
                 IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl;
 
@@ -394,8 +276,8 @@
                 ReferenceLine = referenceLine
             };
 
-            using (FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld>, FailureMechanismSectionResultOld> view =
-                CreateView(new TestFailureMechanism(), assessmentSection))
+            using (FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>, FailureMechanismSectionResult> view =
+                   CreateView(new TestFailureMechanism(), assessmentSection))
             {
                 IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl;
 
@@ -424,13 +306,13 @@
         }
 
         [Test]
-        public void UpdateObserver_FailureMechanismSectionsUpdated_MapDataUpdated()
+        public void UpdateObserver_FailureMechanismUpdated_MapDataUpdated()
         {
             // Setup
             var failureMechanism = new TestFailureMechanism();
 
-            using (FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld>, FailureMechanismSectionResultOld> view =
-                CreateView(failureMechanism, new AssessmentSectionStub()))
+            using (FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>, FailureMechanismSectionResult> view =
+                   CreateView(failureMechanism, new AssessmentSectionStub()))
             {
                 IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl;
 
@@ -444,10 +326,6 @@
                 observers[sectionsObserverIndex].Expect(obs => obs.UpdateObserver());
                 observers[sectionsStartPointObserverIndex].Expect(obs => obs.UpdateObserver());
                 observers[sectionsEndPointObserverIndex].Expect(obs => obs.UpdateObserver());
-                observers[simpleAssemblyObserverIndex].Expect(obs => obs.UpdateObserver());
-                observers[detailedAssemblyObserverIndex].Expect(obs => obs.UpdateObserver());
-                observers[tailorMadeAssemblyObserverIndex].Expect(obs => obs.UpdateObserver());
-                observers[combinedAssemblyObserverIndex].Expect(obs => obs.UpdateObserver());
                 mocks.ReplayAll();
 
                 // Call
@@ -475,14 +353,14 @@
             // Setup
             const int updatedReferenceLineLayerIndex = referenceLineIndex + 3;
             const int updatedSectionCollectionIndex = sectionsCollectionIndex - 1;
-            const int updatedAssemblyResultsCollectionIndex = assemblyResultsIndex - 1;
+            const int updatedAssemblyResultsIndex = assemblyResultsIndex - 1;
             const int updatedHydraulicLocationsLayerIndex = hydraulicBoundaryLocationsIndex - 1;
 
             var assessmentSection = new AssessmentSectionStub();
             var failureMechanism = new TestFailureMechanism();
 
-            using (FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld>, FailureMechanismSectionResultOld> view =
-                CreateView(failureMechanism, assessmentSection))
+            using (FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>, FailureMechanismSectionResult> view =
+                   CreateView(failureMechanism, assessmentSection))
             {
                 IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl;
 
@@ -501,8 +379,8 @@
                 var sectionsData = (MapDataCollection) mapDataCollection.ElementAt(updatedSectionCollectionIndex);
                 Assert.AreEqual("Vakindeling", sectionsData.Name);
 
-                var assemblyResultsData = (MapDataCollection) mapDataCollection.ElementAt(updatedAssemblyResultsCollectionIndex);
-                Assert.AreEqual("Toetsoordeel", assemblyResultsData.Name);
+                var assemblyResultsData = (MapLineData) mapDataCollection.ElementAt(updatedAssemblyResultsIndex);
+                Assert.AreEqual("Duidingsklasse per vak", assemblyResultsData.Name);
 
                 var hydraulicLocationsData = (MapPointData) mapDataCollection.ElementAt(updatedHydraulicLocationsLayerIndex);
                 Assert.AreEqual("Hydraulische belastingen", hydraulicLocationsData.Name);
@@ -526,192 +404,20 @@
                 var actualSectionsData = (MapDataCollection) mapDataCollection.ElementAt(updatedSectionCollectionIndex);
                 Assert.AreEqual("Vakindeling", actualSectionsData.Name);
 
-                var actualAssemblyResultsData = (MapDataCollection) mapDataCollection.ElementAt(updatedAssemblyResultsCollectionIndex);
-                Assert.AreEqual("Toetsoordeel", actualAssemblyResultsData.Name);
+                var actualAssemblyResultsData = (MapLineData) mapDataCollection.ElementAt(updatedAssemblyResultsIndex);
+                Assert.AreEqual("Duidingsklasse per vak", actualAssemblyResultsData.Name);
 
                 var actualHydraulicLocationsData = (MapPointData) mapDataCollection.ElementAt(updatedHydraulicLocationsLayerIndex);
                 Assert.AreEqual("Hydraulische belastingen", actualHydraulicLocationsData.Name);
             }
         }
 
-        [Test]
-        public void GivenViewWithAssemblyFeatures_WhenFailureMechanismNotified_ThenMapDataUpdated()
-        {
-            // Given
-            var random = new Random(39);
-            var failureMechanism = new TestFailureMechanism();
-            FailureMechanismTestHelper.AddSections(failureMechanism, random.Next(1, 10));
-
-            var originalSimpleAssemblyFeatures = new[]
-            {
-                new MapFeature(Enumerable.Empty<MapGeometry>())
-            };
-            var originalDetailedAssemblyFeatures = new[]
-            {
-                new MapFeature(Enumerable.Empty<MapGeometry>())
-            };
-            var originalTailorMadeAssemblyFeatures = new[]
-            {
-                new MapFeature(Enumerable.Empty<MapGeometry>())
-            };
-            var originalCombinedAssemblyFeatures = new[]
-            {
-                new MapFeature(Enumerable.Empty<MapGeometry>())
-            };
-
-            using (var view = new FailureMechanismWithDetailedAssessmentView<TestFailureMechanism, FailureMechanismSectionResultOld>(
-                failureMechanism,
-                new AssessmentSectionStub(),
-                () => originalSimpleAssemblyFeatures,
-                () => originalDetailedAssemblyFeatures,
-                () => originalTailorMadeAssemblyFeatures,
-                () => originalCombinedAssemblyFeatures))
-            {
-                IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl;
-
-                var mocks = new MockRepository();
-                IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection);
-                observers[sectionsObserverIndex].Expect(obs => obs.UpdateObserver());
-                observers[sectionsStartPointObserverIndex].Expect(obs => obs.UpdateObserver());
-                observers[sectionsEndPointObserverIndex].Expect(obs => obs.UpdateObserver());
-                observers[simpleAssemblyObserverIndex].Expect(obs => obs.UpdateObserver());
-                observers[detailedAssemblyObserverIndex].Expect(obs => obs.UpdateObserver());
-                observers[tailorMadeAssemblyObserverIndex].Expect(obs => obs.UpdateObserver());
-                observers[combinedAssemblyObserverIndex].Expect(obs => obs.UpdateObserver());
-                mocks.ReplayAll();
-
-                // Precondition
-                IEnumerable<MapData> assemblyMapDataList = ((MapDataCollection) map.Data.Collection.ElementAt(assemblyResultsIndex)).Collection;
-                CollectionAssert.AreEqual(originalSimpleAssemblyFeatures, ((MapLineData) assemblyMapDataList.ElementAt(simpleAssemblyIndex)).Features);
-                CollectionAssert.AreEqual(originalDetailedAssemblyFeatures, ((MapLineData) assemblyMapDataList.ElementAt(detailedAssemblyIndex)).Features);
-                CollectionAssert.AreEqual(originalTailorMadeAssemblyFeatures, ((MapLineData) assemblyMapDataList.ElementAt(tailorMadeAssemblyIndex)).Features);
-                CollectionAssert.AreEqual(originalCombinedAssemblyFeatures, ((MapLineData) assemblyMapDataList.ElementAt(combinedAssemblyIndex)).Features);
-
-                // When
-                originalSimpleAssemblyFeatures = new[]
-                {
-                    new MapFeature(Enumerable.Empty<MapGeometry>()),
-                    new MapFeature(Enumerable.Empty<MapGeometry>())
-                };
-                originalDetailedAssemblyFeatures = new[]
-                {
-                    new MapFeature(Enumerable.Empty<MapGeometry>()),
-                    new MapFeature(Enumerable.Empty<MapGeometry>())
-                };
-                originalTailorMadeAssemblyFeatures = new[]
-                {
-                    new MapFeature(Enumerable.Empty<MapGeometry>()),
-                    new MapFeature(Enumerable.Empty<MapGeometry>())
-                };
-                originalCombinedAssemblyFeatures = new[]
-                {
-                    new MapFeature(Enumerable.Empty<MapGeometry>()),
-                    new MapFeature(Enumerable.Empty<MapGeometry>())
-                };
-                failureMechanism.NotifyObservers();
-
-                // Then
-                CollectionAssert.AreEqual(originalSimpleAssemblyFeatures, ((MapLineData) assemblyMapDataList.ElementAt(simpleAssemblyIndex)).Features);
-                CollectionAssert.AreEqual(originalDetailedAssemblyFeatures, ((MapLineData) assemblyMapDataList.ElementAt(detailedAssemblyIndex)).Features);
-                CollectionAssert.AreEqual(originalTailorMadeAssemblyFeatures, ((MapLineData) assemblyMapDataList.ElementAt(tailorMadeAssemblyIndex)).Features);
-                CollectionAssert.AreEqual(originalCombinedAssemblyFeatures, ((MapLineData) assemblyMapDataList.ElementAt(combinedAssemblyIndex)).Features);
-                mocks.VerifyAll();
-            }
-        }
-
-        [Test]
-        public void GivenViewWithAssemblyFeatures_WhenFailureMechanismSectionResultNotified_ThenMapDataUpdated()
-        {
-            // Given
-            var random = new Random(39);
-            var failureMechanism = new TestFailureMechanism();
-            FailureMechanismTestHelper.AddSections(failureMechanism, random.Next(1, 10));
-
-            var originalSimpleAssemblyFeatures = new[]
-            {
-                new MapFeature(Enumerable.Empty<MapGeometry>())
-            };
-            var originalDetailedAssemblyFeatures = new[]
-            {
-                new MapFeature(Enumerable.Empty<MapGeometry>())
-            };
-            var originalTailorMadeAssemblyFeatures = new[]
-            {
-                new MapFeature(Enumerable.Empty<MapGeometry>())
-            };
-            var originalCombinedAssemblyFeatures = new[]
-            {
-                new MapFeature(Enumerable.Empty<MapGeometry>())
-            };
-
-            using (var view = new FailureMechanismWithDetailedAssessmentView<TestFailureMechanism, FailureMechanismSectionResultOld>(
-                failureMechanism,
-                new AssessmentSectionStub(),
-                () => originalSimpleAssemblyFeatures,
-                () => originalDetailedAssemblyFeatures,
-                () => originalTailorMadeAssemblyFeatures,
-                () => originalCombinedAssemblyFeatures))
-            {
-                IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl;
-
-                var mocks = new MockRepository();
-                IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection);
-                observers[simpleAssemblyObserverIndex].Expect(obs => obs.UpdateObserver());
-                observers[detailedAssemblyObserverIndex].Expect(obs => obs.UpdateObserver());
-                observers[tailorMadeAssemblyObserverIndex].Expect(obs => obs.UpdateObserver());
-                observers[combinedAssemblyObserverIndex].Expect(obs => obs.UpdateObserver());
-                mocks.ReplayAll();
-
-                // Precondition
-                IEnumerable<MapData> assemblyMapDataList = ((MapDataCollection) map.Data.Collection.ElementAt(assemblyResultsIndex)).Collection;
-                CollectionAssert.AreEqual(originalSimpleAssemblyFeatures, ((MapLineData) assemblyMapDataList.ElementAt(simpleAssemblyIndex)).Features);
-                CollectionAssert.AreEqual(originalDetailedAssemblyFeatures, ((MapLineData) assemblyMapDataList.ElementAt(detailedAssemblyIndex)).Features);
-                CollectionAssert.AreEqual(originalTailorMadeAssemblyFeatures, ((MapLineData) assemblyMapDataList.ElementAt(tailorMadeAssemblyIndex)).Features);
-                CollectionAssert.AreEqual(originalCombinedAssemblyFeatures, ((MapLineData) assemblyMapDataList.ElementAt(combinedAssemblyIndex)).Features);
-
-                // When
-                originalSimpleAssemblyFeatures = new[]
-                {
-                    new MapFeature(Enumerable.Empty<MapGeometry>()),
-                    new MapFeature(Enumerable.Empty<MapGeometry>())
-                };
-                originalDetailedAssemblyFeatures = new[]
-                {
-                    new MapFeature(Enumerable.Empty<MapGeometry>()),
-                    new MapFeature(Enumerable.Empty<MapGeometry>())
-                };
-                originalTailorMadeAssemblyFeatures = new[]
-                {
-                    new MapFeature(Enumerable.Empty<MapGeometry>()),
-                    new MapFeature(Enumerable.Empty<MapGeometry>())
-                };
-                originalCombinedAssemblyFeatures = new[]
-                {
-                    new MapFeature(Enumerable.Empty<MapGeometry>()),
-                    new MapFeature(Enumerable.Empty<MapGeometry>())
-                };
-                failureMechanism.SectionResultsOld.First().NotifyObservers();
-
-                // Then
-                CollectionAssert.AreEqual(originalSimpleAssemblyFeatures, ((MapLineData) assemblyMapDataList.ElementAt(simpleAssemblyIndex)).Features);
-                CollectionAssert.AreEqual(originalDetailedAssemblyFeatures, ((MapLineData) assemblyMapDataList.ElementAt(detailedAssemblyIndex)).Features);
-                CollectionAssert.AreEqual(originalTailorMadeAssemblyFeatures, ((MapLineData) assemblyMapDataList.ElementAt(tailorMadeAssemblyIndex)).Features);
-                CollectionAssert.AreEqual(originalCombinedAssemblyFeatures, ((MapLineData) assemblyMapDataList.ElementAt(combinedAssemblyIndex)).Features);
-                mocks.VerifyAll();
-            }
-        }
-
-        private static FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld>, FailureMechanismSectionResultOld> CreateView(
-            IHasSectionResults<FailureMechanismSectionResultOld> failureMechanism,
+        private static FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>, FailureMechanismSectionResult> CreateView(
+            IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult> failureMechanism,
             IAssessmentSection assessmentSection)
         {
-            return new FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld>, FailureMechanismSectionResultOld>(
-                failureMechanism,
-                assessmentSection,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>);
+            return new FailureMechanismWithDetailedAssessmentView<IHasSectionResults<FailureMechanismSectionResultOld, FailureMechanismSectionResult>, FailureMechanismSectionResult>(
+                failureMechanism, assessmentSection, sr => new DefaultFailureMechanismSectionAssemblyResult());
         }
 
         private static void AssertEmptyMapData(MapDataCollection mapDataCollection)
@@ -723,12 +429,15 @@
             Assert.AreEqual(4, mapDataList.Count);
 
             var referenceLineMapData = (MapLineData) mapDataList[referenceLineIndex];
+            var assemblyResultsMapData = (MapLineData) mapDataList[assemblyResultsIndex];
             var hydraulicBoundaryLocationsMapData = (MapPointData) mapDataList[hydraulicBoundaryLocationsIndex];
 
             CollectionAssert.IsEmpty(referenceLineMapData.Features);
+            CollectionAssert.IsEmpty(assemblyResultsMapData.Features);
             CollectionAssert.IsEmpty(hydraulicBoundaryLocationsMapData.Features);
 
             Assert.AreEqual("Referentielijn", referenceLineMapData.Name);
+            Assert.AreEqual("Duidingsklasse per vak", assemblyResultsMapData.Name);
             Assert.AreEqual("Hydraulische belastingen", hydraulicBoundaryLocationsMapData.Name);
 
             var sectionsMapDataCollection = (MapDataCollection) mapDataList[sectionsCollectionIndex];
@@ -747,26 +456,6 @@
             Assert.AreEqual("Vakindeling (eindpunten)", sectionsEndPointMapData.Name);
             Assert.AreEqual("Vakindeling (startpunten)", sectionsStartPointMapData.Name);
             Assert.AreEqual("Vakindeling", sectionsMapData.Name);
-
-            var assemblyResultsMapDataCollection = (MapDataCollection) mapDataList[assemblyResultsIndex];
-            Assert.AreEqual("Toetsoordeel", assemblyResultsMapDataCollection.Name);
-            List<MapData> assemblyMapDataList = assemblyResultsMapDataCollection.Collection.ToList();
-            Assert.AreEqual(4, assemblyMapDataList.Count);
-
-            var combinedAssemblyMapData = (MapLineData) assemblyMapDataList[combinedAssemblyIndex];
-            var simpleAssemblyMapData = (MapLineData) assemblyMapDataList[simpleAssemblyIndex];
-            var detailedAssemblyMapData = (MapLineData) assemblyMapDataList[detailedAssemblyIndex];
-            var tailorMadeAssemblyMapData = (MapLineData) assemblyMapDataList[tailorMadeAssemblyIndex];
-
-            CollectionAssert.IsEmpty(combinedAssemblyMapData.Features);
-            CollectionAssert.IsEmpty(simpleAssemblyMapData.Features);
-            CollectionAssert.IsEmpty(detailedAssemblyMapData.Features);
-            CollectionAssert.IsEmpty(tailorMadeAssemblyMapData.Features);
-
-            Assert.AreEqual("Gecombineerd toetsoordeel", combinedAssemblyMapData.Name);
-            Assert.AreEqual("Toetsoordeel eenvoudige toets", simpleAssemblyMapData.Name);
-            Assert.AreEqual("Toetsoordeel gedetailleerde toets", detailedAssemblyMapData.Name);
-            Assert.AreEqual("Toetsoordeel toets op maat", tailorMadeAssemblyMapData.Name);
         }
 
         /// <summary>
@@ -793,29 +482,12 @@
             var sectionsEndPointMapDataObserver = mocks.StrictMock<IObserver>();
             sectionsCollection[sectionsEndPointIndex].Attach(sectionsEndPointMapDataObserver);
 
-            MapData[] assemblyResultsCollection = ((MapDataCollection) mapDataArray[assemblyResultsIndex]).Collection.ToArray();
-            var simpleAssemblyMapDataObserver = mocks.StrictMock<IObserver>();
-            assemblyResultsCollection[simpleAssemblyIndex].Attach(simpleAssemblyMapDataObserver);
-
-            var detailedAssemblyMapDataObserver = mocks.StrictMock<IObserver>();
-            assemblyResultsCollection[detailedAssemblyIndex].Attach(detailedAssemblyMapDataObserver);
-
-            var tailorMadeAssemblyMapDataObserver = mocks.StrictMock<IObserver>();
-            assemblyResultsCollection[tailorMadeAssemblyIndex].Attach(tailorMadeAssemblyMapDataObserver);
-
-            var combinedAssemblyMapDataObserver = mocks.StrictMock<IObserver>();
-            assemblyResultsCollection[combinedAssemblyIndex].Attach(combinedAssemblyMapDataObserver);
-
             return new[]
             {
                 referenceLineMapDataObserver,
                 sectionsMapDataObserver,
                 sectionsStartPointMapDataObserver,
-                sectionsEndPointMapDataObserver,
-                simpleAssemblyMapDataObserver,
-                detailedAssemblyMapDataObserver,
-                tailorMadeAssemblyMapDataObserver,
-                combinedAssemblyMapDataObserver
+                sectionsEndPointMapDataObserver
             };
         }
     }
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs
===================================================================
diff -u -r28eb5cbe63e6fe992d25a4856fbd1564ca657236 -r432b46a640176168e7bbb391c08f25fc76b877b7
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 28eb5cbe63e6fe992d25a4856fbd1564ca657236)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 432b46a640176168e7bbb391c08f25fc76b877b7)
@@ -57,7 +57,6 @@
 using Riskeer.Integration.Data;
 using Riskeer.Integration.Data.FailurePath;
 using Riskeer.Integration.Data.StandAlone;
-using Riskeer.Integration.Data.StandAlone.SectionResults;
 using Riskeer.Integration.Forms.PresentationObjects;
 using Riskeer.Integration.Forms.PresentationObjects.StandAlone;
 using Riskeer.Integration.Forms.PropertyClasses;
@@ -375,10 +374,10 @@
             mockRepository.ReplayAll();
 
             using (var plugin = new RiskeerPlugin
+                   {
+                       Gui = gui
+                   })
             {
-                Gui = gui
-            })
-            {
                 // Call
                 ViewInfo[] viewInfos = plugin.GetViewInfos().ToArray();
 
@@ -492,31 +491,31 @@
                     viewInfos,
                     typeof(MicrostabilityFailurePathContext),
                     typeof(MicrostabilityFailureMechanism),
-                    typeof(FailureMechanismWithDetailedAssessmentView<MicrostabilityFailureMechanism, MicrostabilityFailureMechanismSectionResultOld>));
+                    typeof(FailureMechanismWithDetailedAssessmentView<MicrostabilityFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>));
 
                 PluginTestHelper.AssertViewInfoDefined(
                     viewInfos,
                     typeof(GrassCoverSlipOffOutwardsFailurePathContext),
                     typeof(GrassCoverSlipOffOutwardsFailureMechanism),
-                    typeof(FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffOutwardsFailureMechanism, GrassCoverSlipOffOutwardsFailureMechanismSectionResultOld>));
+                    typeof(FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffOutwardsFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>));
 
                 PluginTestHelper.AssertViewInfoDefined(
                     viewInfos,
                     typeof(GrassCoverSlipOffInwardsFailurePathContext),
                     typeof(GrassCoverSlipOffInwardsFailureMechanism),
-                    typeof(FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffInwardsFailureMechanism, GrassCoverSlipOffInwardsFailureMechanismSectionResultOld>));
+                    typeof(FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffInwardsFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>));
 
                 PluginTestHelper.AssertViewInfoDefined(
                     viewInfos,
                     typeof(PipingStructureFailurePathContext),
                     typeof(PipingStructureFailureMechanism),
-                    typeof(FailureMechanismWithDetailedAssessmentView<PipingStructureFailureMechanism, PipingStructureFailureMechanismSectionResultOld>));
+                    typeof(FailureMechanismWithDetailedAssessmentView<PipingStructureFailureMechanism, NonAdoptableFailureMechanismSectionResult>));
 
                 PluginTestHelper.AssertViewInfoDefined(
                     viewInfos,
                     typeof(WaterPressureAsphaltCoverFailurePathContext),
                     typeof(WaterPressureAsphaltCoverFailureMechanism),
-                    typeof(FailureMechanismWithoutDetailedAssessmentView<WaterPressureAsphaltCoverFailureMechanism, WaterPressureAsphaltCoverFailureMechanismSectionResultOld>));
+                    typeof(FailureMechanismWithDetailedAssessmentView<WaterPressureAsphaltCoverFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>));
 
                 PluginTestHelper.AssertViewInfoDefined(
                     viewInfos,
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsFailureMechanismViewInfoTest.cs
===================================================================
diff -u -rd07611d7e455e358e7255b2807447412ac56f9c6 -r432b46a640176168e7bbb391c08f25fc76b877b7
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsFailureMechanismViewInfoTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismViewInfoTest.cs)	(revision d07611d7e455e358e7255b2807447412ac56f9c6)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffInwardsFailureMechanismViewInfoTest.cs	(.../GrassCoverSlipOffInwardsFailureMechanismViewInfoTest.cs)	(revision 432b46a640176168e7bbb391c08f25fc76b877b7)
@@ -21,14 +21,14 @@
 
 using System.Linq;
 using Core.Common.Controls.Views;
-using Core.Components.Gis.Features;
 using Core.Gui.Plugin;
 using NUnit.Framework;
 using Rhino.Mocks;
+using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.AssessmentSection;
+using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Integration.Data.StandAlone;
-using Riskeer.Integration.Data.StandAlone.SectionResults;
 using Riskeer.Integration.Forms.PresentationObjects.StandAlone;
 using Riskeer.Integration.Forms.Views;
 
@@ -48,7 +48,7 @@
             plugin = new RiskeerPlugin();
             info = plugin.GetViewInfos().First(
                 tni => tni.ViewType == typeof(FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffInwardsFailureMechanism,
-                           GrassCoverSlipOffInwardsFailureMechanismSectionResultOld>));
+                           NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>));
         }
 
         [TearDown]
@@ -92,8 +92,8 @@
 
             var failureMechanism = new GrassCoverSlipOffInwardsFailureMechanism();
 
-            using (FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffInwardsFailureMechanism, GrassCoverSlipOffInwardsFailureMechanismSectionResultOld> view =
-                CreateView(failureMechanism, assessmentSection))
+            using (FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffInwardsFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult> view =
+                   CreateView(failureMechanism, assessmentSection))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, otherAssessmentSection);
@@ -112,8 +112,8 @@
             var assessmentSection = new AssessmentSectionStub();
             var failureMechanism = new GrassCoverSlipOffInwardsFailureMechanism();
 
-            using (FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffInwardsFailureMechanism, GrassCoverSlipOffInwardsFailureMechanismSectionResultOld> view =
-                CreateView(failureMechanism, assessmentSection))
+            using (FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffInwardsFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult> view =
+                   CreateView(failureMechanism, assessmentSection))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, assessmentSection);
@@ -161,25 +161,19 @@
 
             // Assert
             Assert.IsInstanceOf<FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffInwardsFailureMechanism,
-                GrassCoverSlipOffInwardsFailureMechanismSectionResultOld>>(view);
+                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>>(view);
 
             var failureMechanismView = (FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffInwardsFailureMechanism,
-                GrassCoverSlipOffInwardsFailureMechanismSectionResultOld>) view;
+                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>) view;
             Assert.AreSame(failureMechanism, failureMechanismView.FailureMechanism);
             Assert.AreSame(assessmentSection, failureMechanismView.AssessmentSection);
         }
 
-        private static FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffInwardsFailureMechanism, GrassCoverSlipOffInwardsFailureMechanismSectionResultOld> CreateView(
+        private static FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffInwardsFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult> CreateView(
             GrassCoverSlipOffInwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
         {
             return new FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffInwardsFailureMechanism,
-                GrassCoverSlipOffInwardsFailureMechanismSectionResultOld>(
-                failureMechanism,
-                assessmentSection,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>);
+                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(failureMechanism, assessmentSection, sr => new DefaultFailureMechanismSectionAssemblyResult());
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffOutwardsFailureMechanismViewInfoTest.cs
===================================================================
diff -u -rd07611d7e455e358e7255b2807447412ac56f9c6 -r432b46a640176168e7bbb391c08f25fc76b877b7
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffOutwardsFailureMechanismViewInfoTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismViewInfoTest.cs)	(revision d07611d7e455e358e7255b2807447412ac56f9c6)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/GrassCoverSlipOffOutwardsFailureMechanismViewInfoTest.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismViewInfoTest.cs)	(revision 432b46a640176168e7bbb391c08f25fc76b877b7)
@@ -21,14 +21,14 @@
 
 using System.Linq;
 using Core.Common.Controls.Views;
-using Core.Components.Gis.Features;
 using Core.Gui.Plugin;
 using NUnit.Framework;
 using Rhino.Mocks;
+using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.AssessmentSection;
+using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Integration.Data.StandAlone;
-using Riskeer.Integration.Data.StandAlone.SectionResults;
 using Riskeer.Integration.Forms.PresentationObjects.StandAlone;
 using Riskeer.Integration.Forms.Views;
 
@@ -48,7 +48,7 @@
             plugin = new RiskeerPlugin();
             info = plugin.GetViewInfos().First(
                 tni => tni.ViewType == typeof(FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffOutwardsFailureMechanism,
-                           GrassCoverSlipOffOutwardsFailureMechanismSectionResultOld>));
+                           NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>));
         }
 
         [TearDown]
@@ -92,8 +92,8 @@
 
             var failureMechanism = new GrassCoverSlipOffOutwardsFailureMechanism();
 
-            using (FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffOutwardsFailureMechanism, GrassCoverSlipOffOutwardsFailureMechanismSectionResultOld> view =
-                CreateView(failureMechanism, assessmentSection))
+            using (FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffOutwardsFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult> view =
+                   CreateView(failureMechanism, assessmentSection))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, otherAssessmentSection);
@@ -112,8 +112,8 @@
             var assessmentSection = new AssessmentSectionStub();
             var failureMechanism = new GrassCoverSlipOffOutwardsFailureMechanism();
 
-            using (FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffOutwardsFailureMechanism, GrassCoverSlipOffOutwardsFailureMechanismSectionResultOld> view =
-                CreateView(failureMechanism, assessmentSection))
+            using (FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffOutwardsFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult> view =
+                   CreateView(failureMechanism, assessmentSection))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, assessmentSection);
@@ -161,25 +161,20 @@
 
             // Assert
             Assert.IsInstanceOf<FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffOutwardsFailureMechanism,
-                GrassCoverSlipOffOutwardsFailureMechanismSectionResultOld>>(view);
+                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>>(view);
 
             var failureMechanismView = (FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffOutwardsFailureMechanism,
-                GrassCoverSlipOffOutwardsFailureMechanismSectionResultOld>) view;
+                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>) view;
             Assert.AreSame(failureMechanism, failureMechanismView.FailureMechanism);
             Assert.AreSame(assessmentSection, failureMechanismView.AssessmentSection);
         }
 
-        private static FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffOutwardsFailureMechanism, GrassCoverSlipOffOutwardsFailureMechanismSectionResultOld> CreateView(
+        private static FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffOutwardsFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult> CreateView(
             GrassCoverSlipOffOutwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
         {
             return new FailureMechanismWithDetailedAssessmentView<GrassCoverSlipOffOutwardsFailureMechanism,
-                GrassCoverSlipOffOutwardsFailureMechanismSectionResultOld>(
-                failureMechanism,
-                assessmentSection,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>);
+                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(
+                failureMechanism, assessmentSection, sr => new DefaultFailureMechanismSectionAssemblyResult());
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MicrostabilityFailureMechanismViewInfoTest.cs
===================================================================
diff -u -rd07611d7e455e358e7255b2807447412ac56f9c6 -r432b46a640176168e7bbb391c08f25fc76b877b7
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MicrostabilityFailureMechanismViewInfoTest.cs	(.../MicrostabilityFailureMechanismViewInfoTest.cs)	(revision d07611d7e455e358e7255b2807447412ac56f9c6)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/MicrostabilityFailureMechanismViewInfoTest.cs	(.../MicrostabilityFailureMechanismViewInfoTest.cs)	(revision 432b46a640176168e7bbb391c08f25fc76b877b7)
@@ -21,14 +21,14 @@
 
 using System.Linq;
 using Core.Common.Controls.Views;
-using Core.Components.Gis.Features;
 using Core.Gui.Plugin;
 using NUnit.Framework;
 using Rhino.Mocks;
+using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.AssessmentSection;
+using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Integration.Data.StandAlone;
-using Riskeer.Integration.Data.StandAlone.SectionResults;
 using Riskeer.Integration.Forms.PresentationObjects.StandAlone;
 using Riskeer.Integration.Forms.Views;
 
@@ -48,7 +48,7 @@
             plugin = new RiskeerPlugin();
             info = plugin.GetViewInfos().First(
                 tni => tni.ViewType == typeof(FailureMechanismWithDetailedAssessmentView<MicrostabilityFailureMechanism,
-                           MicrostabilityFailureMechanismSectionResultOld>));
+                           NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>));
         }
 
         [TearDown]
@@ -92,8 +92,8 @@
 
             var failureMechanism = new MicrostabilityFailureMechanism();
 
-            using (FailureMechanismWithDetailedAssessmentView<MicrostabilityFailureMechanism, MicrostabilityFailureMechanismSectionResultOld> view =
-                CreateView(failureMechanism, assessmentSection))
+            using (FailureMechanismWithDetailedAssessmentView<MicrostabilityFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult> view =
+                   CreateView(failureMechanism, assessmentSection))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, otherAssessmentSection);
@@ -112,8 +112,8 @@
             var assessmentSection = new AssessmentSectionStub();
             var failureMechanism = new MicrostabilityFailureMechanism();
 
-            using (FailureMechanismWithDetailedAssessmentView<MicrostabilityFailureMechanism, MicrostabilityFailureMechanismSectionResultOld> view =
-                CreateView(failureMechanism, assessmentSection))
+            using (FailureMechanismWithDetailedAssessmentView<MicrostabilityFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult> view =
+                   CreateView(failureMechanism, assessmentSection))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, assessmentSection);
@@ -161,25 +161,20 @@
 
             // Assert
             Assert.IsInstanceOf<FailureMechanismWithDetailedAssessmentView<MicrostabilityFailureMechanism,
-                MicrostabilityFailureMechanismSectionResultOld>>(view);
+                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>>(view);
 
             var failureMechanismView = (FailureMechanismWithDetailedAssessmentView<MicrostabilityFailureMechanism,
-                MicrostabilityFailureMechanismSectionResultOld>) view;
+                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>) view;
             Assert.AreSame(failureMechanism, failureMechanismView.FailureMechanism);
             Assert.AreSame(assessmentSection, failureMechanismView.AssessmentSection);
         }
 
-        private static FailureMechanismWithDetailedAssessmentView<MicrostabilityFailureMechanism, MicrostabilityFailureMechanismSectionResultOld> CreateView(
+        private static FailureMechanismWithDetailedAssessmentView<MicrostabilityFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult> CreateView(
             MicrostabilityFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
         {
             return new FailureMechanismWithDetailedAssessmentView<MicrostabilityFailureMechanism,
-                MicrostabilityFailureMechanismSectionResultOld>(
-                failureMechanism,
-                assessmentSection,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>);
+                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(
+                failureMechanism, assessmentSection, sr => new DefaultFailureMechanismSectionAssemblyResult());
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/PipingStructureFailureMechanismViewInfoTest.cs
===================================================================
diff -u -rd07611d7e455e358e7255b2807447412ac56f9c6 -r432b46a640176168e7bbb391c08f25fc76b877b7
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/PipingStructureFailureMechanismViewInfoTest.cs	(.../PipingStructureFailureMechanismViewInfoTest.cs)	(revision d07611d7e455e358e7255b2807447412ac56f9c6)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/PipingStructureFailureMechanismViewInfoTest.cs	(.../PipingStructureFailureMechanismViewInfoTest.cs)	(revision 432b46a640176168e7bbb391c08f25fc76b877b7)
@@ -21,14 +21,14 @@
 
 using System.Linq;
 using Core.Common.Controls.Views;
-using Core.Components.Gis.Features;
 using Core.Gui.Plugin;
 using NUnit.Framework;
 using Rhino.Mocks;
+using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.AssessmentSection;
+using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Integration.Data.StandAlone;
-using Riskeer.Integration.Data.StandAlone.SectionResults;
 using Riskeer.Integration.Forms.PresentationObjects.StandAlone;
 using Riskeer.Integration.Forms.Views;
 
@@ -48,7 +48,7 @@
             plugin = new RiskeerPlugin();
             info = plugin.GetViewInfos().First(
                 tni => tni.ViewType == typeof(FailureMechanismWithDetailedAssessmentView<PipingStructureFailureMechanism,
-                           PipingStructureFailureMechanismSectionResultOld>));
+                           NonAdoptableFailureMechanismSectionResult>));
         }
 
         [TearDown]
@@ -92,8 +92,8 @@
 
             var failureMechanism = new PipingStructureFailureMechanism();
 
-            using (FailureMechanismWithDetailedAssessmentView<PipingStructureFailureMechanism, PipingStructureFailureMechanismSectionResultOld> view =
-                CreateView(failureMechanism, assessmentSection))
+            using (FailureMechanismWithDetailedAssessmentView<PipingStructureFailureMechanism, NonAdoptableFailureMechanismSectionResult> view =
+                   CreateView(failureMechanism, assessmentSection))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, otherAssessmentSection);
@@ -112,8 +112,8 @@
             var assessmentSection = new AssessmentSectionStub();
             var failureMechanism = new PipingStructureFailureMechanism();
 
-            using (FailureMechanismWithDetailedAssessmentView<PipingStructureFailureMechanism, PipingStructureFailureMechanismSectionResultOld> view =
-                CreateView(failureMechanism, assessmentSection))
+            using (FailureMechanismWithDetailedAssessmentView<PipingStructureFailureMechanism, NonAdoptableFailureMechanismSectionResult> view =
+                   CreateView(failureMechanism, assessmentSection))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, assessmentSection);
@@ -161,25 +161,19 @@
 
             // Assert
             Assert.IsInstanceOf<FailureMechanismWithDetailedAssessmentView<PipingStructureFailureMechanism,
-                PipingStructureFailureMechanismSectionResultOld>>(view);
+                NonAdoptableFailureMechanismSectionResult>>(view);
 
             var failureMechanismView = (FailureMechanismWithDetailedAssessmentView<PipingStructureFailureMechanism,
-                PipingStructureFailureMechanismSectionResultOld>) view;
+                NonAdoptableFailureMechanismSectionResult>) view;
             Assert.AreSame(failureMechanism, failureMechanismView.FailureMechanism);
             Assert.AreSame(assessmentSection, failureMechanismView.AssessmentSection);
         }
 
-        private static FailureMechanismWithDetailedAssessmentView<PipingStructureFailureMechanism, PipingStructureFailureMechanismSectionResultOld> CreateView(
+        private static FailureMechanismWithDetailedAssessmentView<PipingStructureFailureMechanism, NonAdoptableFailureMechanismSectionResult> CreateView(
             PipingStructureFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
         {
             return new FailureMechanismWithDetailedAssessmentView<PipingStructureFailureMechanism,
-                PipingStructureFailureMechanismSectionResultOld>(
-                failureMechanism,
-                assessmentSection,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>);
+                NonAdoptableFailureMechanismSectionResult>(failureMechanism, assessmentSection, sr => new DefaultFailureMechanismSectionAssemblyResult());
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverFailureMechanismViewInfoTest.cs
===================================================================
diff -u -rd07611d7e455e358e7255b2807447412ac56f9c6 -r432b46a640176168e7bbb391c08f25fc76b877b7
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverFailureMechanismViewInfoTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismViewInfoTest.cs)	(revision d07611d7e455e358e7255b2807447412ac56f9c6)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterPressureAsphaltCoverFailureMechanismViewInfoTest.cs	(.../WaterPressureAsphaltCoverFailureMechanismViewInfoTest.cs)	(revision 432b46a640176168e7bbb391c08f25fc76b877b7)
@@ -21,14 +21,14 @@
 
 using System.Linq;
 using Core.Common.Controls.Views;
-using Core.Components.Gis.Features;
 using Core.Gui.Plugin;
 using NUnit.Framework;
 using Rhino.Mocks;
+using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.AssessmentSection;
+using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Integration.Data.StandAlone;
-using Riskeer.Integration.Data.StandAlone.SectionResults;
 using Riskeer.Integration.Forms.PresentationObjects.StandAlone;
 using Riskeer.Integration.Forms.Views;
 
@@ -47,8 +47,8 @@
             mocks = new MockRepository();
             plugin = new RiskeerPlugin();
             info = plugin.GetViewInfos().First(
-                tni => tni.ViewType == typeof(FailureMechanismWithoutDetailedAssessmentView<WaterPressureAsphaltCoverFailureMechanism,
-                           WaterPressureAsphaltCoverFailureMechanismSectionResultOld>));
+                tni => tni.ViewType == typeof(FailureMechanismWithDetailedAssessmentView<WaterPressureAsphaltCoverFailureMechanism,
+                           NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>));
         }
 
         [TearDown]
@@ -92,8 +92,8 @@
 
             var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism();
 
-            using (FailureMechanismWithoutDetailedAssessmentView<WaterPressureAsphaltCoverFailureMechanism, WaterPressureAsphaltCoverFailureMechanismSectionResultOld> view =
-                CreateView(failureMechanism, assessmentSection))
+            using (FailureMechanismWithDetailedAssessmentView<WaterPressureAsphaltCoverFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult> view =
+                   CreateView(failureMechanism, assessmentSection))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, otherAssessmentSection);
@@ -112,8 +112,8 @@
             var assessmentSection = new AssessmentSectionStub();
             var failureMechanism = new WaterPressureAsphaltCoverFailureMechanism();
 
-            using (FailureMechanismWithoutDetailedAssessmentView<WaterPressureAsphaltCoverFailureMechanism, WaterPressureAsphaltCoverFailureMechanismSectionResultOld> view =
-                CreateView(failureMechanism, assessmentSection))
+            using (FailureMechanismWithDetailedAssessmentView<WaterPressureAsphaltCoverFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult> view =
+                   CreateView(failureMechanism, assessmentSection))
             {
                 // Call
                 bool closeForData = info.CloseForData(view, assessmentSection);
@@ -160,25 +160,21 @@
             IView view = info.CreateInstance(context);
 
             // Assert
-            Assert.IsInstanceOf<FailureMechanismWithoutDetailedAssessmentView<WaterPressureAsphaltCoverFailureMechanism,
-                WaterPressureAsphaltCoverFailureMechanismSectionResultOld>>(view);
+            Assert.IsInstanceOf<FailureMechanismWithDetailedAssessmentView<WaterPressureAsphaltCoverFailureMechanism,
+                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>>(view);
 
-            var failureMechanismView = (FailureMechanismWithoutDetailedAssessmentView<WaterPressureAsphaltCoverFailureMechanism,
-                WaterPressureAsphaltCoverFailureMechanismSectionResultOld>) view;
+            var failureMechanismView = (FailureMechanismWithDetailedAssessmentView<WaterPressureAsphaltCoverFailureMechanism,
+                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>) view;
             Assert.AreSame(failureMechanism, failureMechanismView.FailureMechanism);
             Assert.AreSame(assessmentSection, failureMechanismView.AssessmentSection);
         }
 
-        private static FailureMechanismWithoutDetailedAssessmentView<WaterPressureAsphaltCoverFailureMechanism, WaterPressureAsphaltCoverFailureMechanismSectionResultOld> CreateView(
+        private static FailureMechanismWithDetailedAssessmentView<WaterPressureAsphaltCoverFailureMechanism, NonAdoptableWithProfileProbabilityFailureMechanismSectionResult> CreateView(
             WaterPressureAsphaltCoverFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
         {
-            return new FailureMechanismWithoutDetailedAssessmentView<WaterPressureAsphaltCoverFailureMechanism,
-                WaterPressureAsphaltCoverFailureMechanismSectionResultOld>(
-                failureMechanism,
-                assessmentSection,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>,
-                Enumerable.Empty<MapFeature>);
+            return new FailureMechanismWithDetailedAssessmentView<WaterPressureAsphaltCoverFailureMechanism,
+                NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>(
+                failureMechanism, assessmentSection, sr => new DefaultFailureMechanismSectionAssemblyResult());
         }
     }
 }
\ No newline at end of file