Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.IO/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationImporter.cs =================================================================== diff -u -r2ef21b0f4d85a5c9689720d539254a1d5c907be7 -r078f95ed4873f3a426c0941fc432e892845507a8 --- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.IO/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationImporter.cs (.../StabilityStoneCoverWaveConditionsCalculationConfigurationImporter.cs) (revision 2ef21b0f4d85a5c9689720d539254a1d5c907be7) +++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.IO/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationImporter.cs (.../StabilityStoneCoverWaveConditionsCalculationConfigurationImporter.cs) (revision 078f95ed4873f3a426c0941fc432e892845507a8) @@ -20,14 +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; -using Riskeer.Revetment.IO.Configurations.Converters; using Riskeer.StabilityStoneCover.Data; using Riskeer.StabilityStoneCover.IO.Configurations.Converters; @@ -59,16 +56,6 @@ protected override void SetCalculationSpecificParameters(StabilityStoneCoverWaveConditionsCalculationConfiguration calculationConfiguration, StabilityStoneCoverWaveConditionsCalculation 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); - } - if (calculationConfiguration.CalculationType.HasValue) { calculation.InputParameters.CalculationType = (StabilityStoneCoverWaveConditionsCalculationType) new ConfigurationStabilityStoneCoverCalculationTypeConverter() Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationImporterTest.cs =================================================================== diff -u -r2ef21b0f4d85a5c9689720d539254a1d5c907be7 -r078f95ed4873f3a426c0941fc432e892845507a8 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationImporterTest.cs (.../StabilityStoneCoverWaveConditionsCalculationConfigurationImporterTest.cs) (revision 2ef21b0f4d85a5c9689720d539254a1d5c907be7) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationImporterTest.cs (.../StabilityStoneCoverWaveConditionsCalculationConfigurationImporterTest.cs) (revision 078f95ed4873f3a426c0941fc432e892845507a8) @@ -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; @@ -120,7 +119,6 @@ Height = (RoundedDouble) 6.6, Type = BreakWaterType.Caisson }, - CategoryType = AssessmentSectionCategoryType.SignalingNorm, CalculationType = StabilityStoneCoverWaveConditionsCalculationType.Blocks } }; @@ -129,76 +127,6 @@ AssertWaveConditionsCalculation(expectedCalculation, (StabilityStoneCoverWaveConditionsCalculation) calculationGroup.Children[0]); } - [Test] - [TestCase(NormType.LowerLimit, AssessmentSectionCategoryType.LowerLimitNorm)] - [TestCase(NormType.Signaling, AssessmentSectionCategoryType.SignalingNorm)] - public void Import_ValidConfigurationWithoutCategoryBoundaryAndCalculationType_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 StabilityStoneCoverWaveConditionsCalculationConfigurationImporter( - filePath, - calculationGroup, - new[] - { - hydraulicBoundaryLocation - }, - new[] - { - foreshoreProfile - }, - normType); - - // Call - bool successful = importer.Import(); - - // Assert - Assert.IsTrue(successful); - - var expectedCalculation = new StabilityStoneCoverWaveConditionsCalculation - { - 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, - CalculationType = StabilityStoneCoverWaveConditionsCalculationType.Both - } - }; - - Assert.AreEqual(1, calculationGroup.Children.Count); - AssertWaveConditionsCalculation(expectedCalculation, (StabilityStoneCoverWaveConditionsCalculation) calculationGroup.Children[0]); - } - private static void AssertWaveConditionsCalculation(StabilityStoneCoverWaveConditionsCalculation expectedCalculation, StabilityStoneCoverWaveConditionsCalculation actualCalculation) { @@ -215,7 +143,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); Assert.AreEqual(expectedCalculation.InputParameters.CalculationType, actualCalculation.InputParameters.CalculationType); } } Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationReaderTest.cs =================================================================== diff -u -r2ef21b0f4d85a5c9689720d539254a1d5c907be7 -r078f95ed4873f3a426c0941fc432e892845507a8 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationReaderTest.cs (.../StabilityStoneCoverWaveConditionsCalculationConfigurationReaderTest.cs) (revision 2ef21b0f4d85a5c9689720d539254a1d5c907be7) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationReaderTest.cs (.../StabilityStoneCoverWaveConditionsCalculationConfigurationReaderTest.cs) (revision 078f95ed4873f3a426c0941fc432e892845507a8) @@ -42,13 +42,6 @@ { 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"); - yield return new TestCaseData("invalidCalculationMultipleRevetmentType.xml", "Element 'typebekleding' cannot appear more than once if content model type is \"all\".") .SetName("invalidCalculationMultipleRevetmentType"); @@ -134,7 +127,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); Assert.AreEqual(ConfigurationStabilityStoneCoverCalculationType.Columns, configuration.CalculationType); } } Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationImporter/validConfigurationFullCalculation.xml =================================================================== diff -u -r89530636bced18fb75e60ffe8de15d76a73739c8 -r078f95ed4873f3a426c0941fc432e892845507a8 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationImporter/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 89530636bced18fb75e60ffe8de15d76a73739c8) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationImporter/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 078f95ed4873f3a426c0941fc432e892845507a8) @@ -2,7 +2,6 @@ Locatie - A 10 2 9 Fisheye: Tag 078f95ed4873f3a426c0941fc432e892845507a8 refers to a dead (removed) revision in file `Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleCategoryType.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 078f95ed4873f3a426c0941fc432e892845507a8 refers to a dead (removed) revision in file `Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/test-data/StabilityStoneCoverWaveConditionsCalculationConfigurationReader/invalidCategoryTypeUnknownValue.xml'. Fisheye: No comparison available. Pass `N' to diff?