Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporter.cs =================================================================== diff -u -r7491928192a7ecf23958f85fbd4669ec17085c95 -r9a51d7d247ddbc9a2c9d7702727c96067e2f11f4 --- Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporter.cs (.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporter.cs) (revision 7491928192a7ecf23958f85fbd4669ec17085c95) +++ Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporter.cs (.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporter.cs) (revision 9a51d7d247ddbc9a2c9d7702727c96067e2f11f4) @@ -23,7 +23,6 @@ using System.Collections.Generic; using Riskeer.Common.Data.Calculation; using Riskeer.Revetment.Data; -using Riskeer.Revetment.IO.Configurations.Converters; namespace Riskeer.Revetment.IO.Configurations { @@ -48,8 +47,6 @@ { var configuration = new AssessmentSectionCategoryWaveConditionsCalculationConfiguration(calculation.Name); SetConfigurationProperties(configuration, calculation); - configuration.CategoryType = (ConfigurationAssessmentSectionCategoryType?) new ConfigurationAssessmentSectionCategoryTypeConverter() - .ConvertFrom(calculation.InputParameters.CategoryType); return configuration; } } Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationWriter.cs =================================================================== diff -u -r7491928192a7ecf23958f85fbd4669ec17085c95 -r9a51d7d247ddbc9a2c9d7702727c96067e2f11f4 --- Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationWriter.cs (.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationWriter.cs) (revision 7491928192a7ecf23958f85fbd4669ec17085c95) +++ Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationWriter.cs (.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationWriter.cs) (revision 9a51d7d247ddbc9a2c9d7702727c96067e2f11f4) @@ -21,7 +21,6 @@ using System.Xml; using Riskeer.Revetment.Data; -using Riskeer.Revetment.IO.Configurations.Converters; namespace Riskeer.Revetment.IO.Configurations { @@ -42,18 +41,8 @@ : base(filePath) {} protected override void WriteWaveConditionsSpecificParameters( - XmlWriter writer, TConfiguration configuration) - { - if (!configuration.CategoryType.HasValue) - { - return; - } + XmlWriter writer, TConfiguration configuration) {} - var converter = new ConfigurationAssessmentSectionCategoryTypeConverter(); - writer.WriteElementString(WaveConditionsCalculationConfigurationSchemaIdentifiers.CategoryType, - converter.ConvertToInvariantString(configuration.CategoryType.Value)); - } - protected override int GetConfigurationVersion() { return 1; Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporterTest.cs =================================================================== diff -u -r7491928192a7ecf23958f85fbd4669ec17085c95 -r9a51d7d247ddbc9a2c9d7702727c96067e2f11f4 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporterTest.cs (.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporterTest.cs) (revision 7491928192a7ecf23958f85fbd4669ec17085c95) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporterTest.cs (.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporterTest.cs) (revision 9a51d7d247ddbc9a2c9d7702727c96067e2f11f4) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.Collections.Generic; using System.IO; using Core.Common.TestUtil; @@ -99,11 +98,7 @@ protected override ICalculation CreateCalculation() { - var random = new Random(21); - return new TestWaveConditionsCalculation(new AssessmentSectionCategoryWaveConditionsInput - { - CategoryType = random.NextEnumValue() - }); + return new TestWaveConditionsCalculation(new AssessmentSectionCategoryWaveConditionsInput()); } protected override AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporter CallConfigurationFilePathConstructor(IEnumerable calculations, string filePath) Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationWriterTest.cs =================================================================== diff -u -r7491928192a7ecf23958f85fbd4669ec17085c95 -r9a51d7d247ddbc9a2c9d7702727c96067e2f11f4 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationWriterTest.cs (.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationWriterTest.cs) (revision 7491928192a7ecf23958f85fbd4669ec17085c95) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationWriterTest.cs (.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationWriterTest.cs) (revision 9a51d7d247ddbc9a2c9d7702727c96067e2f11f4) @@ -19,10 +19,8 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.ComponentModel; using System.IO; using Core.Common.Base.Data; -using Core.Common.IO.Exceptions; using Core.Common.TestUtil; using NUnit.Framework; using Riskeer.Common.IO.Configurations; @@ -85,7 +83,6 @@ var calculation = new AssessmentSectionCategoryWaveConditionsCalculationConfiguration("Berekening 1") { HydraulicBoundaryLocationName = "Locatie1", - CategoryType = ConfigurationAssessmentSectionCategoryType.LowerLimitNorm, UpperBoundaryRevetment = (RoundedDouble) 1.5, LowerBoundaryRevetment = (RoundedDouble) 0.5, UpperBoundaryWaterLevels = (RoundedDouble) 1.4, @@ -124,28 +121,6 @@ } } - [Test] - public void Write_InvalidCategoryType_ThrowsCriticalFileWriteException() - { - // Setup - var configuration = new AssessmentSectionCategoryWaveConditionsCalculationConfiguration("fail") - { - CategoryType = (ConfigurationAssessmentSectionCategoryType?) 99 - }; - - var writer = new AssessmentSectionCategoryWaveConditionsCalculationConfigurationWriter("valid"); - - // Call - TestDelegate call = () => writer.Write(new[] - { - configuration - }); - - // Assert - var exception = Assert.Throws(call); - Assert.IsInstanceOf(exception.InnerException); - } - protected override AssessmentSectionCategoryWaveConditionsCalculationConfigurationWriter CreateWriterInstance(string filePath) { return new AssessmentSectionCategoryWaveConditionsCalculationConfigurationWriter(filePath); Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporter/fullValidConfiguration.xml =================================================================== diff -u -rfe7cbdce377ed794bdf460e0e2911642417c3954 -r9a51d7d247ddbc9a2c9d7702727c96067e2f11f4 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporter/fullValidConfiguration.xml (.../fullValidConfiguration.xml) (revision fe7cbdce377ed794bdf460e0e2911642417c3954) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporter/fullValidConfiguration.xml (.../fullValidConfiguration.xml) (revision 9a51d7d247ddbc9a2c9d7702727c96067e2f11f4) @@ -2,7 +2,6 @@ - A+ NaN NaN NaN @@ -20,7 +19,6 @@ HydraulicLocationA - C NaN NaN NaN Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationWriter/completeConfiguration.xml =================================================================== diff -u -rfe7cbdce377ed794bdf460e0e2911642417c3954 -r9a51d7d247ddbc9a2c9d7702727c96067e2f11f4 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationWriter/completeConfiguration.xml (.../completeConfiguration.xml) (revision fe7cbdce377ed794bdf460e0e2911642417c3954) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationWriter/completeConfiguration.xml (.../completeConfiguration.xml) (revision 9a51d7d247ddbc9a2c9d7702727c96067e2f11f4) @@ -2,7 +2,6 @@ Locatie1 - B 1.5 0.5 1.4