Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs
===================================================================
diff -u -rc1069e6cf39338685915adbe417b2bfa28e3ac22 -r19fd80cc583267703afacd8eb812d170d3282fa0
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs	(.../AssemblyCategoriesCalculator.cs)	(revision c1069e6cf39338685915adbe417b2bfa28e3ac22)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs	(.../AssemblyCategoriesCalculator.cs)	(revision 19fd80cc583267703afacd8eb812d170d3282fa0)
@@ -61,7 +61,7 @@
                 ICategoriesCalculator kernel = factory.CreateAssemblyCategoriesKernel();
                 CalculationOutput<AssessmentSectionCategory[]> output = kernel.CalculateAssessmentSectionCategories(input);
 
-                return AssessmentSectionAssemblyCategoryCreator.CreateAssessmentSectionAssemblyCategories(output);
+                return AssemblyCategoryCreator.CreateAssessmentSectionAssemblyCategories(output);
             }
             catch (Exception e)
             {
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs
===================================================================
diff -u
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs	(revision 0)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs	(revision 19fd80cc583267703afacd8eb812d170d3282fa0)
@@ -0,0 +1,98 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using AssemblyTool.Kernel;
+using AssemblyTool.Kernel.Data.AssemblyCategories;
+using Ringtoets.Common.Data.AssemblyTool;
+
+namespace Ringtoets.AssemblyTool.KernelWrapper.Creators
+{
+    /// <summary>
+    /// Creates <see cref="AssemblyCategory"/> instances.
+    /// </summary>
+    internal static class AssemblyCategoryCreator
+    {
+        /// <summary>
+        /// Creates an <see cref="IEnumerable{AssessmentSectionAssemblyCategoryResult}"/>
+        /// based on the information given in the <paramref name="output"/>.
+        /// </summary>
+        /// <param name="output">The output to create the result for.</param>
+        /// <returns>An <see cref="IEnumerable{AssessmentSectionAssemblyCategoryResult}"/>
+        /// with information taken from the <paramref name="output"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="output"/> is <c>null</c>.</exception>
+        /// <exception cref="InvalidEnumArgumentException">Thrown when <see cref="AssessmentSectionCategoryGroup"/>
+        /// is an invalid value.</exception>
+        /// <exception cref="NotSupportedException">Thrown when <see cref="AssessmentSectionCategoryGroup"/>
+        /// is a valid value, but unsupported.</exception>
+        public static IEnumerable<AssessmentSectionAssemblyCategory> CreateAssessmentSectionAssemblyCategories(
+            CalculationOutput<AssessmentSectionCategory[]> output)
+        {
+            if (output == null)
+            {
+                throw new ArgumentNullException(nameof(output));
+            }
+
+            return output.Result.Select(
+                categoriesOutput => new AssessmentSectionAssemblyCategory(categoriesOutput.LowerBoundary,
+                                                                          categoriesOutput.UpperBoundary,
+                                                                          ConvertAssessmentSectionCategoryGroup(categoriesOutput.CategoryGroup))).ToArray();
+        }
+
+        /// <summary>
+        /// Converts a <see cref="category"/> into a <see cref="AssessmentSectionAssemblyCategoryGroup"/>.
+        /// </summary>
+        /// <param name="category">The <see cref="AssessmentSectionCategoryGroup"/> to convert.</param>
+        /// <returns>A <see cref="AssessmentSectionAssemblyCategoryGroup"/> based on <paramref name="category"/>.</returns>
+        /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="category"/>
+        /// is an invalid value.</exception>
+        /// <exception cref="NotSupportedException">Thrown when <paramref name="category"/>
+        /// is a valid value, but unsupported.</exception>
+        private static AssessmentSectionAssemblyCategoryGroup ConvertAssessmentSectionCategoryGroup(AssessmentSectionCategoryGroup category)
+        {
+            if (!Enum.IsDefined(typeof(AssessmentSectionCategoryGroup), category))
+            {
+                throw new InvalidEnumArgumentException(nameof(category),
+                                                       (int) category,
+                                                       typeof(AssessmentSectionCategoryGroup));
+            }
+
+            switch (category)
+            {
+                case AssessmentSectionCategoryGroup.APlus:
+                    return AssessmentSectionAssemblyCategoryGroup.APlus;
+                case AssessmentSectionCategoryGroup.A:
+                    return AssessmentSectionAssemblyCategoryGroup.A;
+                case AssessmentSectionCategoryGroup.B:
+                    return AssessmentSectionAssemblyCategoryGroup.B;
+                case AssessmentSectionCategoryGroup.C:
+                    return AssessmentSectionAssemblyCategoryGroup.C;
+                case AssessmentSectionCategoryGroup.D:
+                    return AssessmentSectionAssemblyCategoryGroup.D;
+                default:
+                    throw new NotSupportedException();
+            }
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 19fd80cc583267703afacd8eb812d170d3282fa0 refers to a dead (removed) revision in file `Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssessmentSectionAssemblyCategoryCreator.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Ringtoets.AssemblyTool.KernelWrapper.csproj
===================================================================
diff -u -r39e13825618c9845e2100ae802a007c04c2e8517 -r19fd80cc583267703afacd8eb812d170d3282fa0
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Ringtoets.AssemblyTool.KernelWrapper.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.csproj)	(revision 39e13825618c9845e2100ae802a007c04c2e8517)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Ringtoets.AssemblyTool.KernelWrapper.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.csproj)	(revision 19fd80cc583267703afacd8eb812d170d3282fa0)
@@ -22,7 +22,7 @@
     <Compile Include="Calculators\Categories\AssemblyCategoriesCalculatorException.cs" />
     <Compile Include="Calculators\Categories\IAssemblyCategoriesCalculator.cs" />
     <Compile Include="Calculators\IAssemblyToolCalculatorFactory.cs" />
-    <Compile Include="Creators\AssessmentSectionAssemblyCategoryCreator.cs" />
+    <Compile Include="Creators\AssemblyCategoryCreator.cs" />
     <Compile Include="Creators\FailureMechanismSectionAssemblyCalculatorInputCreator.cs" />
     <Compile Include="Creators\FailureMechanismSectionAssemblyCreator.cs" />
     <Compile Include="Kernels\AssemblyToolKernelFactory.cs" />
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs
===================================================================
diff -u
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs	(revision 0)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs	(revision 19fd80cc583267703afacd8eb812d170d3282fa0)
@@ -0,0 +1,114 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using AssemblyTool.Kernel;
+using AssemblyTool.Kernel.Data;
+using AssemblyTool.Kernel.Data.AssemblyCategories;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Ringtoets.AssemblyTool.KernelWrapper.Creators;
+using Ringtoets.Common.Data.AssemblyTool;
+
+namespace Ringtoets.AssemblyTool.KernelWrapper.Test.Creators
+{
+    [TestFixture]
+    public class AssemblyCategoryCreatorTest
+    {
+        [Test]
+        public void CreateAssessmentSectionAssemblyCategories_OutputNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => AssemblyCategoryCreator.CreateAssessmentSectionAssemblyCategories(null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("output", exception.ParamName);
+        }
+
+        [Test]
+        public void CreateAssessmentSectionAssemblyCategories_WithOutput_ReturnAssessmentSectionAssemblyCategoryResult()
+        {
+            // Setup
+            var random = new Random(11);
+
+            var output = new CalculationOutput<AssessmentSectionCategory[]>(new[]
+            {
+                new AssessmentSectionCategory(random.NextEnumValue<AssessmentSectionCategoryGroup>(), new Probability(random.Next(1)), new Probability(random.Next(1, 2))),
+                new AssessmentSectionCategory(random.NextEnumValue<AssessmentSectionCategoryGroup>(), new Probability(random.Next(1)), new Probability(random.Next(1, 2))),
+                new AssessmentSectionCategory(random.NextEnumValue<AssessmentSectionCategoryGroup>(), new Probability(random.Next(1)), new Probability(random.Next(1, 2))),
+                new AssessmentSectionCategory(random.NextEnumValue<AssessmentSectionCategoryGroup>(), new Probability(random.Next(1)), new Probability(random.Next(1, 2)))
+            });
+
+            // Call
+            IEnumerable<AssessmentSectionAssemblyCategory> result = AssemblyCategoryCreator.CreateAssessmentSectionAssemblyCategories(output);
+
+            // Assert
+            AssessmentSectionAssemblyCategoryAssert.AssertAssessmentSectionAssemblyCategories(output, result);
+        }
+
+        [Test]
+        public void CreateAssessmentSectionAssemblyCategories_CategoryWithInvalidAssessmentSectionAssemblyCategory_ThrowsInvalidEnumArgumentException()
+        {
+            // Setup
+            var output = new CalculationOutput<AssessmentSectionCategory[]>(new[]
+            {
+                new AssessmentSectionCategory((AssessmentSectionCategoryGroup) 99, new Probability(0), new Probability(0))
+            });
+
+            // Call
+            TestDelegate test = () => AssemblyCategoryCreator.CreateAssessmentSectionAssemblyCategories(output);
+
+            // Assert
+            const string exceptionMessage = "The value of argument 'category' (99) is invalid for Enum type 'AssessmentSectionCategoryGroup'.";
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(test, exceptionMessage);
+        }
+
+        [Test]
+        [TestCase(AssessmentSectionCategoryGroup.APlus, AssessmentSectionAssemblyCategoryGroup.APlus)]
+        [TestCase(AssessmentSectionCategoryGroup.A, AssessmentSectionAssemblyCategoryGroup.A)]
+        [TestCase(AssessmentSectionCategoryGroup.B, AssessmentSectionAssemblyCategoryGroup.B)]
+        [TestCase(AssessmentSectionCategoryGroup.C, AssessmentSectionAssemblyCategoryGroup.C)]
+        [TestCase(AssessmentSectionCategoryGroup.D, AssessmentSectionAssemblyCategoryGroup.D)]
+        public void CreateAssessmentSectionAssemblyCategories_CategoryWithValidAssessmentSectionAssemblyCategory_ExpectedAssessmentSectionAssemblyCategoryResultType(
+            AssessmentSectionCategoryGroup categoryGroup,
+            AssessmentSectionAssemblyCategoryGroup expectedCategoryGroup)
+        {
+            // Setup
+            var output = new CalculationOutput<AssessmentSectionCategory[]>(new[]
+            {
+                new AssessmentSectionCategory(categoryGroup, new Probability(0), new Probability(0))
+            });
+
+            // Call
+            IEnumerable<AssessmentSectionAssemblyCategory> result = AssemblyCategoryCreator.CreateAssessmentSectionAssemblyCategories(output);
+
+            // Assert
+            Assert.AreEqual(1, result.Count());
+            AssessmentSectionAssemblyCategory categoryResult = result.First();
+
+            Assert.AreEqual(expectedCategoryGroup, categoryResult.Group);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 19fd80cc583267703afacd8eb812d170d3282fa0 refers to a dead (removed) revision in file `Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssessmentSectionAssemblyCategoryCreatorTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Ringtoets.AssemblyTool.KernelWrapper.Test.csproj
===================================================================
diff -u -r39e13825618c9845e2100ae802a007c04c2e8517 -r19fd80cc583267703afacd8eb812d170d3282fa0
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Ringtoets.AssemblyTool.KernelWrapper.Test.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.Test.csproj)	(revision 39e13825618c9845e2100ae802a007c04c2e8517)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Ringtoets.AssemblyTool.KernelWrapper.Test.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.Test.csproj)	(revision 19fd80cc583267703afacd8eb812d170d3282fa0)
@@ -26,7 +26,7 @@
     <Compile Include="Calculators\Assembly\FailureMechanismSectionAssemblyCalculatorTest.cs" />
     <Compile Include="Calculators\Categories\AssemblyCategoriesCalculatorExceptionTest.cs" />
     <Compile Include="Calculators\Categories\AssemblyCategoriesCalculatorTest.cs" />
-    <Compile Include="Creators\AssessmentSectionAssemblyCategoryCreatorTest.cs" />
+    <Compile Include="Creators\AssemblyCategoryCreatorTest.cs" />
     <Compile Include="Creators\FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs" />
     <Compile Include="Creators\FailureMechanismSectionAssemblyCreatorTest.cs" />
     <Compile Include="Kernels\AssemblyToolKernelFactoryTest.cs" />