Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporter.cs =================================================================== diff -u -r7491928192a7ecf23958f85fbd4669ec17085c95 -r47553f43a6ec0e4052f31851c19ba1582c933862 --- Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporter.cs (.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporter.cs) (revision 7491928192a7ecf23958f85fbd4669ec17085c95) +++ Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporter.cs (.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporter.cs) (revision 47553f43a6ec0e4052f31851c19ba1582c933862) @@ -20,13 +20,11 @@ // All rights reserved. using System.Collections.Generic; -using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.Contribution; 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 { @@ -57,17 +55,6 @@ protected override void SetCalculationSpecificParameters(AssessmentSectionCategoryWaveConditionsCalculationConfiguration calculationConfiguration, T calculation, - NormType normType) - { - if (calculationConfiguration.CategoryType.HasValue) - { - calculation.InputParameters.CategoryType = (AssessmentSectionCategoryType) new ConfigurationAssessmentSectionCategoryTypeConverter() - .ConvertTo(calculationConfiguration.CategoryType.Value, typeof(AssessmentSectionCategoryType)); - } - else - { - WaveConditionsInputHelper.SetCategoryType(calculation.InputParameters, normType); - } - } + NormType normType) {} } } \ No newline at end of file Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader.cs =================================================================== diff -u -r7491928192a7ecf23958f85fbd4669ec17085c95 -r47553f43a6ec0e4052f31851c19ba1582c933862 --- Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader.cs (.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader.cs) (revision 7491928192a7ecf23958f85fbd4669ec17085c95) +++ Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader.cs (.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader.cs) (revision 47553f43a6ec0e4052f31851c19ba1582c933862) @@ -23,8 +23,6 @@ using System.Xml.Linq; using Core.Common.Base.IO; using Riskeer.Common.IO.Configurations; -using Riskeer.Common.IO.Configurations.Helpers; -using Riskeer.Revetment.IO.Configurations.Converters; using Riskeer.Revetment.IO.Properties; namespace Riskeer.Revetment.IO.Configurations @@ -59,9 +57,6 @@ { var configuration = new AssessmentSectionCategoryWaveConditionsCalculationConfiguration(calculationElement.Attribute(ConfigurationSchemaIdentifiers.NameAttribute).Value); ParseCalculationElementData(calculationElement, configuration); - configuration.CategoryType = (ConfigurationAssessmentSectionCategoryType?) - calculationElement.GetConvertedValueFromDescendantStringElement( - WaveConditionsCalculationConfigurationSchemaIdentifiers.CategoryType); return configuration; } } Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporterTest.cs =================================================================== diff -u -r7491928192a7ecf23958f85fbd4669ec17085c95 -r47553f43a6ec0e4052f31851c19ba1582c933862 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporterTest.cs (.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporterTest.cs) (revision 7491928192a7ecf23958f85fbd4669ec17085c95) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporterTest.cs (.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporterTest.cs) (revision 47553f43a6ec0e4052f31851c19ba1582c933862) @@ -26,7 +26,6 @@ using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; -using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.Contribution; using Riskeer.Common.Data.DikeProfiles; @@ -115,83 +114,14 @@ { Height = (RoundedDouble) 6.6, Type = BreakWaterType.Caisson - }, - CategoryType = AssessmentSectionCategoryType.SignalingNorm + } } }; Assert.AreEqual(1, calculationGroup.Children.Count); AssertWaveConditionsCalculation(expectedCalculation, (ICalculation) calculationGroup.Children[0]); } - [Test] - [TestCase(NormType.LowerLimit, AssessmentSectionCategoryType.LowerLimitNorm)] - [TestCase(NormType.Signaling, AssessmentSectionCategoryType.SignalingNorm)] - public void Import_ValidConfigurationWithoutCategoryBoundary_DataAddedToModel(NormType normType, AssessmentSectionCategoryType expectedCategory) - { - // Setup - string filePath = Path.Combine(path, "validConfigurationWithoutCategoryBoundary.xml"); - - var calculationGroup = new CalculationGroup(); - var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "Locatie", 10, 20); - var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0), new[] - { - new Point2D(0, 0), - new Point2D(1, 1), - new Point2D(2, 2) - }, new BreakWater(BreakWaterType.Caisson, 0), new ForeshoreProfile.ConstructionProperties - { - Id = "Voorlandprofiel", - Name = "VoorlandProfielName" - }); - - var importer = new AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporter( - filePath, - calculationGroup, - new[] - { - hydraulicBoundaryLocation - }, - new[] - { - foreshoreProfile - }, - normType); - - // Call - bool successful = importer.Import(); - - // Assert - Assert.IsTrue(successful); - - var expectedCalculation = new TestTargetTestWaveConditionsCalculation - { - Name = "Berekening 1", - InputParameters = - { - HydraulicBoundaryLocation = hydraulicBoundaryLocation, - UpperBoundaryRevetment = (RoundedDouble) 10, - LowerBoundaryRevetment = (RoundedDouble) 2, - UpperBoundaryWaterLevels = (RoundedDouble) 9, - LowerBoundaryWaterLevels = (RoundedDouble) 4, - StepSize = WaveConditionsInputStepSize.Half, - ForeshoreProfile = foreshoreProfile, - Orientation = (RoundedDouble) 5.5, - UseForeshore = false, - UseBreakWater = true, - BreakWater = - { - Height = (RoundedDouble) 6.6, - Type = BreakWaterType.Caisson - }, - CategoryType = expectedCategory - } - }; - - Assert.AreEqual(1, calculationGroup.Children.Count); - AssertWaveConditionsCalculation(expectedCalculation, (ICalculation) calculationGroup.Children[0]); - } - private static void AssertWaveConditionsCalculation(ICalculation expectedCalculation, ICalculation actualCalculation) { @@ -208,7 +138,6 @@ Assert.AreEqual(expectedCalculation.InputParameters.UseBreakWater, actualCalculation.InputParameters.UseBreakWater); Assert.AreEqual(expectedCalculation.InputParameters.BreakWater.Height, actualCalculation.InputParameters.BreakWater.Height); Assert.AreEqual(expectedCalculation.InputParameters.BreakWater.Type, actualCalculation.InputParameters.BreakWater.Type); - Assert.AreEqual(expectedCalculation.InputParameters.CategoryType, actualCalculation.InputParameters.CategoryType); } private class TestTargetTestWaveConditionsCalculation : TestWaveConditionsCalculation Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs =================================================================== diff -u -r7491928192a7ecf23958f85fbd4669ec17085c95 -r47553f43a6ec0e4052f31851c19ba1582c933862 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs (.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs) (revision 7491928192a7ecf23958f85fbd4669ec17085c95) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs (.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs) (revision 47553f43a6ec0e4052f31851c19ba1582c933862) @@ -22,8 +22,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Xml.Schema; -using Core.Common.Base.IO; using Core.Common.TestUtil; using NUnit.Framework; using Riskeer.Common.IO.Configurations; @@ -37,19 +35,6 @@ private readonly string testDirectoryPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Revetment.IO, nameof(AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader)); - private static IEnumerable InvalidConfigurations - { - get - { - yield return new TestCaseData("invalidCalculationMultipleCategoryType.xml", - "Element 'categoriegrens' cannot appear more than once if content model type is \"all\".") - .SetName("invalidCalculationMultipleCategoryType"); - yield return new TestCaseData("invalidCategoryTypeUnknownValue.xml", - "The 'categoriegrens' element is invalid - The value 'F' is invalid according to its datatype 'categoriegrensType' - The Enumeration constraint failed.") - .SetName("invalidCategoryTypeUnknownValue"); - } - } - [Test] public void Constructor_ExpectedValues() { @@ -64,22 +49,6 @@ } [Test] - [TestCaseSource(nameof(InvalidConfigurations))] - public void Constructor_FileInvalidBasedOnSchemaDefinition_ThrowCriticalFileReadException(string fileName, string expectedParsingMessage) - { - // Setup - string filePath = Path.Combine(testDirectoryPath, fileName); - - // Call - void Call() => new AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader(filePath); - - // Assert - var exception = Assert.Throws(Call); - Assert.IsInstanceOf(exception.InnerException); - StringAssert.Contains(expectedParsingMessage, exception.InnerException?.Message); - } - - [Test] public void Read_ValidConfigurationWithFullCalculation_ReturnExpectedReadWaveConditionsCalculation() { // Setup @@ -126,7 +95,6 @@ Assert.AreEqual(ConfigurationBreakWaterType.Caisson, configuration.WaveReduction.BreakWaterType); Assert.AreEqual(6.6, configuration.WaveReduction.BreakWaterHeight); Assert.IsFalse(configuration.WaveReduction.UseForeshoreProfile); - Assert.AreEqual(ConfigurationAssessmentSectionCategoryType.SignalingNorm, configuration.CategoryType); } } } \ No newline at end of file Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporter/validConfigurationFullCalculation.xml =================================================================== diff -u -r808dc996b0a88d3a88919bcab2164790ee760bff -r47553f43a6ec0e4052f31851c19ba1582c933862 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporter/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 808dc996b0a88d3a88919bcab2164790ee760bff) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporter/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 47553f43a6ec0e4052f31851c19ba1582c933862) @@ -2,7 +2,6 @@ Locatie - A 10 2 9 Fisheye: Tag 47553f43a6ec0e4052f31851c19ba1582c933862 refers to a dead (removed) revision in file `Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporter/validConfigurationWithoutCategoryBoundary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 47553f43a6ec0e4052f31851c19ba1582c933862 refers to a dead (removed) revision in file `Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleCategoryType.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 47553f43a6ec0e4052f31851c19ba1582c933862 refers to a dead (removed) revision in file `Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/invalidCategoryTypeUnknownValue.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml =================================================================== diff -u -r50b8cb8015275ffab688c895f65f45c92bce5c38 -r47553f43a6ec0e4052f31851c19ba1582c933862 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 50b8cb8015275ffab688c895f65f45c92bce5c38) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 47553f43a6ec0e4052f31851c19ba1582c933862) @@ -2,7 +2,6 @@ Locatie - A 1.1 2.2 3.3 Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/version0ValidConfigurationFullCalculation.xml =================================================================== diff -u -r50b8cb8015275ffab688c895f65f45c92bce5c38 -r47553f43a6ec0e4052f31851c19ba1582c933862 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/version0ValidConfigurationFullCalculation.xml (.../version0ValidConfigurationFullCalculation.xml) (revision 50b8cb8015275ffab688c895f65f45c92bce5c38) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/version0ValidConfigurationFullCalculation.xml (.../version0ValidConfigurationFullCalculation.xml) (revision 47553f43a6ec0e4052f31851c19ba1582c933862) @@ -2,7 +2,6 @@ Locatie - A 1.1 2.2 3.3 Fisheye: Tag 47553f43a6ec0e4052f31851c19ba1582c933862 refers to a dead (removed) revision in file `Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationImporter/validConfigurationWithoutCategoryBoundary.xml'. Fisheye: No comparison available. Pass `N' to diff?