Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/AssemblyCategoryBoundariesResultAssert.cs
===================================================================
diff -u
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/AssemblyCategoryBoundariesResultAssert.cs	(revision 0)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/AssemblyCategoryBoundariesResultAssert.cs	(revision fb7cdba72f870210afaccb9261ff23b9661dd8eb)
@@ -0,0 +1,73 @@
+// 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.Linq;
+using AssemblyTool.Kernel;
+using AssemblyTool.Kernel.CategoriesOutput;
+using AssemblyTool.Kernel.Data;
+using NUnit.Framework;
+using Ringtoets.AssemblyTool.Data.Output;
+
+namespace Ringtoets.AssemblyTool.KernelWrapper.Test
+{
+    /// <summary>
+    /// Class for asserting category boundaries result.
+    /// </summary>
+    public static class AssemblyCategoryBoundariesResultAssert
+    {
+        /// <summary>
+        /// Asserts whether <paramref name="actual"/> is equal to <paramref name="original"/>.
+        /// </summary>
+        /// <param name="original">The original <see cref="CalculationOutput{AssessmentSectionCategoriesOutput}"/>.</param>
+        /// <param name="actual">The actual <see cref="AssemblyCategoryBoundariesResult{AssessmentSectionAssemblyCategoryResult}"/>.</param>
+        /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
+        /// is not equal to <paramref name="original"/>.</exception>
+        public static void AssertAssessmentSectionAssemblyCategoryBoundariesResult(CalculationOutput<AssessmentSectionCategoriesOutput[]> original,
+                                                                                   AssemblyCategoryBoundariesResult<AssessmentSectionAssemblyCategoryResult> actual)
+        {
+            Assert.AreEqual(original.Result.Length, actual.Categories.Count());
+
+            CollectionAssert.AreEqual(original.Result.Select(o => GetResultType(o.Category)), actual.Categories.Select(r => r.Category));
+            CollectionAssert.AreEqual(original.Result.Select(o => o.LowerBoundary), actual.Categories.Select(r => r.LowerBoundary));
+            CollectionAssert.AreEqual(original.Result.Select(o => o.UpperBoundary), actual.Categories.Select(r => r.UpperBoundary));
+        }
+
+        private static AssessmentSectionAssemblyCategoryResultType GetResultType(AssessmentSectionAssemblyCategory category)
+        {
+            switch (category)
+            {
+                case AssessmentSectionAssemblyCategory.APlus:
+                    return AssessmentSectionAssemblyCategoryResultType.APlus;
+                case AssessmentSectionAssemblyCategory.A:
+                    return AssessmentSectionAssemblyCategoryResultType.A;
+                case AssessmentSectionAssemblyCategory.B:
+                    return AssessmentSectionAssemblyCategoryResultType.B;
+                case AssessmentSectionAssemblyCategory.C:
+                    return AssessmentSectionAssemblyCategoryResultType.C;
+                case AssessmentSectionAssemblyCategory.D:
+                    return AssessmentSectionAssemblyCategoryResultType.D;
+                default:
+                    throw new NotSupportedException();
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/CategoryBoundaries/AssemblyCategoryBoundariesCalculatorTest.cs
===================================================================
diff -u -rb37d73c648e099a96a1c623f72391c909f3b0937 -rfb7cdba72f870210afaccb9261ff23b9661dd8eb
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/CategoryBoundaries/AssemblyCategoryBoundariesCalculatorTest.cs	(.../AssemblyCategoryBoundariesCalculatorTest.cs)	(revision b37d73c648e099a96a1c623f72391c909f3b0937)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/CategoryBoundaries/AssemblyCategoryBoundariesCalculatorTest.cs	(.../AssemblyCategoryBoundariesCalculatorTest.cs)	(revision fb7cdba72f870210afaccb9261ff23b9661dd8eb)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using System.Linq;
 using AssemblyTool.Kernel;
 using AssemblyTool.Kernel.CategoriesOutput;
 using AssemblyTool.Kernel.Data;
@@ -133,10 +132,7 @@
                 AssemblyCategoryBoundariesResult<AssessmentSectionAssemblyCategoryResult> result = calculator.CalculateAssessmentSectionCategories(input);
 
                 // Assert
-                Assert.AreEqual(output.Result.Length, result.Categories.Count());
-
-                CollectionAssert.AreEqual(output.Result.Select(o => o.LowerBoundary), result.Categories.Select(r => r.LowerBoundary));
-                CollectionAssert.AreEqual(output.Result.Select(o => o.UpperBoundary), result.Categories.Select(r => r.UpperBoundary));
+                AssemblyCategoryBoundariesResultAssert.AssertAssessmentSectionAssemblyCategoryBoundariesResult(output, result);
             }
         }
 
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryBoundariesResultCreatorTest.cs
===================================================================
diff -u -r9639088b551acfa88a2938629666025d474c77f6 -rfb7cdba72f870210afaccb9261ff23b9661dd8eb
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryBoundariesResultCreatorTest.cs	(.../AssemblyCategoryBoundariesResultCreatorTest.cs)	(revision 9639088b551acfa88a2938629666025d474c77f6)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryBoundariesResultCreatorTest.cs	(.../AssemblyCategoryBoundariesResultCreatorTest.cs)	(revision fb7cdba72f870210afaccb9261ff23b9661dd8eb)
@@ -64,10 +64,7 @@
             AssemblyCategoryBoundariesResult<AssessmentSectionAssemblyCategoryResult> result = AssemblyCategoryBoundariesResultCreator.CreateAssessmentSectionResult(output);
 
             // Assert
-            Assert.AreEqual(output.Result.Length, result.Categories.Count());
-
-            CollectionAssert.AreEqual(output.Result.Select(o => o.LowerBoundary), result.Categories.Select(r => r.LowerBoundary));
-            CollectionAssert.AreEqual(output.Result.Select(o => o.UpperBoundary), result.Categories.Select(r => r.UpperBoundary));
+            AssemblyCategoryBoundariesResultAssert.AssertAssessmentSectionAssemblyCategoryBoundariesResult(output, result);
         }
 
         [Test]
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Ringtoets.AssemblyTool.KernelWrapper.Test.csproj
===================================================================
diff -u -r9639088b551acfa88a2938629666025d474c77f6 -rfb7cdba72f870210afaccb9261ff23b9661dd8eb
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Ringtoets.AssemblyTool.KernelWrapper.Test.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.Test.csproj)	(revision 9639088b551acfa88a2938629666025d474c77f6)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Ringtoets.AssemblyTool.KernelWrapper.Test.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.Test.csproj)	(revision fb7cdba72f870210afaccb9261ff23b9661dd8eb)
@@ -20,6 +20,7 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AssemblyCategoryBoundariesResultAssert.cs" />
     <Compile Include="Calculators\AssemblyToolCalculatorFactoryTest.cs" />
     <Compile Include="Calculators\CategoryBoundaries\AssemblyCategoryBoundariesCalculatorTest.cs" />
     <Compile Include="Creators\AssemblyCategoryBoundariesResultCreatorTest.cs" />