Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs
===================================================================
diff -u -rdc2f99ebb6094aea82e5720c9d18f1c292a7c2e0 -rff442572ba8bfed0c9e727953e0ce39ed1509235
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs)	(revision dc2f99ebb6094aea82e5720c9d18f1c292a7c2e0)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs)	(revision ff442572ba8bfed0c9e727953e0ce39ed1509235)
@@ -55,9 +55,9 @@
                 yield return new TestCaseData("invalidRevetmentTypeUnknownValue.xml",
                                               "The 'typebelasting' element is invalid - The value 'Gras' is invalid according to its datatype 'String' - The Enumeration constraint failed.")
                     .SetName("invalidRevetmentTypeUnknownValue");
-                yield return new TestCaseData("invalidBoundaryType.xml",
+                yield return new TestCaseData("invalidRevetmentType.xml",
                                               "The element 'berekening' has invalid child element 'typebekleding'.")
-                    .SetName("invalidBoundaryType");
+                    .SetName("invalidRevetmentType");
             }
         }
 
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationTest.cs
===================================================================
diff -u -r20e869b4c77f50902514b9e32f26ad877230a943 -rff442572ba8bfed0c9e727953e0ce39ed1509235
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationTest.cs)	(revision 20e869b4c77f50902514b9e32f26ad877230a943)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationTest.cs)	(revision ff442572ba8bfed0c9e727953e0ce39ed1509235)
@@ -41,6 +41,7 @@
 
             // Assert
             Assert.IsInstanceOf<WaveConditionsCalculationConfiguration>(configuration);
+            Assert.AreEqual(name, configuration.Name);
             Assert.IsNull(configuration.CategoryType);
             Assert.IsNull(configuration.CalculationType);
         }
Fisheye: Tag ff442572ba8bfed0c9e727953e0ce39ed1509235 refers to a dead (removed) revision in file `Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidBoundaryType.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidRevetmentType.xml
===================================================================
diff -u
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidRevetmentType.xml	(revision 0)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidRevetmentType.xml	(revision ff442572ba8bfed0c9e727953e0ce39ed1509235)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <typebekleding>Gras</typebekleding>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporter.cs
===================================================================
diff -u -rcc5f7db9f71388c14c7da37300e3948794120199 -rff442572ba8bfed0c9e727953e0ce39ed1509235
--- Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporter.cs	(.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporter.cs)	(revision cc5f7db9f71388c14c7da37300e3948794120199)
+++ Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporter.cs	(.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporter.cs)	(revision ff442572ba8bfed0c9e727953e0ce39ed1509235)
@@ -26,6 +26,7 @@
 using Riskeer.Common.Data.DikeProfiles;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Revetment.Data;
+using Riskeer.Revetment.IO.Configurations.Converters;
 
 namespace Riskeer.Revetment.IO.Configurations
 {
@@ -60,7 +61,8 @@
         {
             if (calculationConfiguration.CategoryType.HasValue)
             {
-                calculation.InputParameters.CategoryType = (AssessmentSectionCategoryType) calculationConfiguration.CategoryType;
+                calculation.InputParameters.CategoryType = (AssessmentSectionCategoryType) new ConfigurationAssessmentSectionCategoryTypeConverter()
+                    .ConvertTo(calculationConfiguration.CategoryType.Value, typeof(AssessmentSectionCategoryType));
             }
             else
             {
Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rff442572ba8bfed0c9e727953e0ce39ed1509235
--- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationTest.cs	(.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationTest.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationTest.cs	(.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationTest.cs)	(revision ff442572ba8bfed0c9e727953e0ce39ed1509235)
@@ -40,6 +40,7 @@
 
             // Assert
             Assert.IsInstanceOf<WaveConditionsCalculationConfiguration>(configuration);
+            Assert.AreEqual(name, configuration.Name);
             Assert.IsNull(configuration.CategoryType);
         }
 
Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.IO/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationImporter.cs
===================================================================
diff -u -rcc5f7db9f71388c14c7da37300e3948794120199 -rff442572ba8bfed0c9e727953e0ce39ed1509235
--- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.IO/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationImporter.cs	(.../StabilityStoneCoverWaveConditionsCalculationConfigurationImporter.cs)	(revision cc5f7db9f71388c14c7da37300e3948794120199)
+++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.IO/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationImporter.cs	(.../StabilityStoneCoverWaveConditionsCalculationConfigurationImporter.cs)	(revision ff442572ba8bfed0c9e727953e0ce39ed1509235)
@@ -27,7 +27,9 @@
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Revetment.Data;
 using Riskeer.Revetment.IO.Configurations;
+using Riskeer.Revetment.IO.Configurations.Converters;
 using Riskeer.StabilityStoneCover.Data;
+using Riskeer.StabilityStoneCover.IO.Configurations.Converters;
 
 namespace Riskeer.StabilityStoneCover.IO.Configurations
 {
@@ -59,7 +61,8 @@
         {
             if (calculationConfiguration.CategoryType.HasValue)
             {
-                calculation.InputParameters.CategoryType = (AssessmentSectionCategoryType) calculationConfiguration.CategoryType.Value;
+                calculation.InputParameters.CategoryType = (AssessmentSectionCategoryType) new ConfigurationAssessmentSectionCategoryTypeConverter()
+                    .ConvertTo(calculationConfiguration.CategoryType.Value, typeof(AssessmentSectionCategoryType));
             }
             else
             {
@@ -68,7 +71,8 @@
 
             if (calculationConfiguration.CalculationType.HasValue)
             {
-                calculation.InputParameters.CalculationType = (StabilityStoneCoverWaveConditionsCalculationType) calculationConfiguration.CalculationType.Value;
+                calculation.InputParameters.CalculationType = (StabilityStoneCoverWaveConditionsCalculationType) new ConfigurationStabilityStoneCoverCalculationTypeConverter()
+                    .ConvertTo(calculationConfiguration.CalculationType.Value, typeof(StabilityStoneCoverWaveConditionsCalculationType));
             }
         }
     }
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/Converters/ConfigurationStabilityStoneCoverCalculationTypeConverterTest.cs
===================================================================
diff -u -rcaa9caa961af883e2967fe284a2bec98f4fe891e -rff442572ba8bfed0c9e727953e0ce39ed1509235
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/Converters/ConfigurationStabilityStoneCoverCalculationTypeConverterTest.cs	(.../ConfigurationStabilityStoneCoverCalculationTypeConverterTest.cs)	(revision caa9caa961af883e2967fe284a2bec98f4fe891e)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/Converters/ConfigurationStabilityStoneCoverCalculationTypeConverterTest.cs	(.../ConfigurationStabilityStoneCoverCalculationTypeConverterTest.cs)	(revision ff442572ba8bfed0c9e727953e0ce39ed1509235)
@@ -176,7 +176,7 @@
         public void ConvertFrom_InvalidStabilityStoneCoverWaveConditionsCalculationType_ThrowInvalidEnumArgumentException()
         {
             // Setup
-            const StabilityStoneCoverWaveConditionsCalculationType invalidValue = (StabilityStoneCoverWaveConditionsCalculationType)99;
+            const StabilityStoneCoverWaveConditionsCalculationType invalidValue = (StabilityStoneCoverWaveConditionsCalculationType) 99;
             var converter = new ConfigurationStabilityStoneCoverCalculationTypeConverter();
 
             // Call
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationExporterTest.cs
===================================================================
diff -u -r8f172e35ecf9d0b05a49e39a39c42420d054c900 -rff442572ba8bfed0c9e727953e0ce39ed1509235
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationExporterTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationConfigurationExporterTest.cs)	(revision 8f172e35ecf9d0b05a49e39a39c42420d054c900)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationExporterTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationConfigurationExporterTest.cs)	(revision ff442572ba8bfed0c9e727953e0ce39ed1509235)
@@ -29,7 +29,6 @@
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.IO.TestUtil;
-using Riskeer.Revetment.Data.TestUtil;
 using Riskeer.StabilityStoneCover.Data;
 using Riskeer.StabilityStoneCover.IO.Configurations;
 
@@ -44,7 +43,7 @@
         public void Export_ValidData_ReturnTrueAndWritesFile()
         {
             // Setup
-            var calculation1 = new TestWaveConditionsCalculation<StabilityStoneCoverWaveConditionsInput>(new StabilityStoneCoverWaveConditionsInput())
+            var calculation1 = new StabilityStoneCoverWaveConditionsCalculation
             {
                 Name = "Calculation A",
                 InputParameters =
@@ -54,7 +53,7 @@
                 }
             };
 
-            var calculation2 = new TestWaveConditionsCalculation<StabilityStoneCoverWaveConditionsInput>(new StabilityStoneCoverWaveConditionsInput())
+            var calculation2 = new StabilityStoneCoverWaveConditionsCalculation
             {
                 Name = "PK001_0002 W1-6_4_1D1",
                 InputParameters =
@@ -99,11 +98,14 @@
         protected override ICalculation<StabilityStoneCoverWaveConditionsInput> CreateCalculation()
         {
             var random = new Random(21);
-            return new TestWaveConditionsCalculation<StabilityStoneCoverWaveConditionsInput>(new StabilityStoneCoverWaveConditionsInput
+            return new StabilityStoneCoverWaveConditionsCalculation
             {
-                CategoryType = random.NextEnumValue<AssessmentSectionCategoryType>(),
-                CalculationType = random.NextEnumValue<StabilityStoneCoverWaveConditionsCalculationType>()
-            });
+                InputParameters =
+                {
+                    CategoryType = random.NextEnumValue<AssessmentSectionCategoryType>(),
+                    CalculationType = random.NextEnumValue<StabilityStoneCoverWaveConditionsCalculationType>()
+                }
+            };
         }
 
         protected override StabilityStoneCoverWaveConditionsCalculationConfigurationExporter CallConfigurationFilePathConstructor(
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationImporterTest.cs
===================================================================
diff -u -ra2306e7019c2fc4757e97eb15f6aae1dc4a472c8 -rff442572ba8bfed0c9e727953e0ce39ed1509235
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationImporterTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationConfigurationImporterTest.cs)	(revision a2306e7019c2fc4757e97eb15f6aae1dc4a472c8)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationImporterTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationConfigurationImporterTest.cs)	(revision ff442572ba8bfed0c9e727953e0ce39ed1509235)
@@ -132,7 +132,8 @@
         [Test]
         [TestCase(NormType.LowerLimit, AssessmentSectionCategoryType.LowerLimitNorm)]
         [TestCase(NormType.Signaling, AssessmentSectionCategoryType.SignalingNorm)]
-        public void Import_ValidConfigurationWithoutCategoryBoundary_DataAddedToModel(NormType normType, AssessmentSectionCategoryType expectedCategory)
+        public void Import_ValidConfigurationWithoutCategoryBoundaryAndCalculationType_DataAddedToModel(
+            NormType normType, AssessmentSectionCategoryType expectedCategory)
         {
             // Setup
             string filePath = Path.Combine(path, "validConfigurationWithoutCategoryBoundary.xml");
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationReaderTest.cs
===================================================================
diff -u -r0006259ca598a5a486468f386758f811a88ca21d -rff442572ba8bfed0c9e727953e0ce39ed1509235
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationReaderTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationConfigurationReaderTest.cs)	(revision 0006259ca598a5a486468f386758f811a88ca21d)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationReaderTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationConfigurationReaderTest.cs)	(revision ff442572ba8bfed0c9e727953e0ce39ed1509235)
@@ -55,9 +55,9 @@
                 yield return new TestCaseData("invalidRevetmentTypeUnknownValue.xml",
                                               "The 'typebekleding' element is invalid - The value 'Steen' is invalid according to its datatype 'String' - The Enumeration constraint failed.")
                     .SetName("invalidRevetmentTypeUnknownValue");
-                yield return new TestCaseData("invalidBoundaryType.xml",
+                yield return new TestCaseData("invalidRevetmentType.xml",
                                               "The element 'berekening' has invalid child element 'typebelasting'.")
-                    .SetName("invalidBoundaryType");
+                    .SetName("invalidRevetmentType");
             }
         }
 
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationTest.cs
===================================================================
diff -u -rae79690c2041fe9e9b8ac2410e19c43e69d36bc5 -rff442572ba8bfed0c9e727953e0ce39ed1509235
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationConfigurationTest.cs)	(revision ae79690c2041fe9e9b8ac2410e19c43e69d36bc5)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationConfigurationTest.cs)	(revision ff442572ba8bfed0c9e727953e0ce39ed1509235)
@@ -41,6 +41,7 @@
 
             // Assert
             Assert.IsInstanceOf<AssessmentSectionCategoryWaveConditionsCalculationConfiguration>(configuration);
+            Assert.AreEqual(name, configuration.Name);
             Assert.IsNull(configuration.CalculationType);
         }
 
Fisheye: Tag ff442572ba8bfed0c9e727953e0ce39ed1509235 refers to a dead (removed) revision in file `Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/invalidBoundaryType.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/invalidRevetmentType.xml
===================================================================
diff -u
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/invalidRevetmentType.xml	(revision 0)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/invalidRevetmentType.xml	(revision ff442572ba8bfed0c9e727953e0ce39ed1509235)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <typebelasting>Steen</typebelasting>
+  </berekening>
+</configuratie>
\ No newline at end of file