Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporter.cs =================================================================== diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -r7eb9b53adbeac6651703dc27e84705d116080add --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporter.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporter.cs) (revision 87bd836d55d336e37e3d80f9a1521feb83ddc475) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporter.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporter.cs) (revision 7eb9b53adbeac6651703dc27e84705d116080add) @@ -23,11 +23,9 @@ using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.Contribution; using Riskeer.Common.Data.DikeProfiles; -using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.Hydraulics; using Riskeer.GrassCoverErosionOutwards.Data; using Riskeer.GrassCoverErosionOutwards.IO.Configurations.Converters; -using Riskeer.Revetment.Data; using Riskeer.Revetment.IO.Configurations; namespace Riskeer.GrassCoverErosionOutwards.IO.Configurations @@ -60,16 +58,6 @@ GrassCoverErosionOutwardsWaveConditionsCalculation calculation, NormType normType) { - if (calculationConfiguration.CategoryType.HasValue) - { - calculation.InputParameters.CategoryType = (FailureMechanismCategoryType) new ConfigurationGrassCoverErosionOutwardsCategoryTypeConverter() - .ConvertTo(calculationConfiguration.CategoryType.Value, typeof(FailureMechanismCategoryType)); - } - else - { - WaveConditionsInputHelper.SetCategoryType(calculation.InputParameters, normType); - } - if (calculationConfiguration.CalculationType.HasValue) { calculation.InputParameters.CalculationType = (GrassCoverErosionOutwardsWaveConditionsCalculationType) new ConfigurationGrassCoverErosionOutwardsCalculationTypeConverter() Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporterTest.cs =================================================================== diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -r7eb9b53adbeac6651703dc27e84705d116080add --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporterTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporterTest.cs) (revision 87bd836d55d336e37e3d80f9a1521feb83ddc475) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporterTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporterTest.cs) (revision 7eb9b53adbeac6651703dc27e84705d116080add) @@ -29,7 +29,6 @@ using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.Contribution; using Riskeer.Common.Data.DikeProfiles; -using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.Hydraulics; using Riskeer.GrassCoverErosionOutwards.Data; using Riskeer.GrassCoverErosionOutwards.IO.Configurations; @@ -120,7 +119,6 @@ Height = (RoundedDouble) 6.6, Type = BreakWaterType.Caisson }, - CategoryType = FailureMechanismCategoryType.FactorizedLowerLimitNorm, CalculationType = GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUp } }; @@ -129,75 +127,6 @@ AssertWaveConditionsCalculation(expectedCalculation, (GrassCoverErosionOutwardsWaveConditionsCalculation) calculationGroup.Children[0]); } - [Test] - [TestCase(NormType.LowerLimit, FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm)] - [TestCase(NormType.Signaling, FailureMechanismCategoryType.MechanismSpecificSignalingNorm)] - public void Import_ValidConfigurationWithoutCategoryBoundary_DataAddedToModel(NormType normType, FailureMechanismCategoryType 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 GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporter( - filePath, - calculationGroup, - new[] - { - hydraulicBoundaryLocation - }, - new[] - { - foreshoreProfile - }, - normType); - - // Call - bool successful = importer.Import(); - - // Assert - Assert.IsTrue(successful); - - var expectedCalculation = new GrassCoverErosionOutwardsWaveConditionsCalculation - { - 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 = GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUpAndWaveImpact - } - }; - - Assert.AreEqual(1, calculationGroup.Children.Count); - AssertWaveConditionsCalculation(expectedCalculation, (GrassCoverErosionOutwardsWaveConditionsCalculation) calculationGroup.Children[0]); - } - private static void AssertWaveConditionsCalculation(GrassCoverErosionOutwardsWaveConditionsCalculation expectedCalculation, GrassCoverErosionOutwardsWaveConditionsCalculation actualCalculation) { @@ -214,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/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs =================================================================== diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -r7eb9b53adbeac6651703dc27e84705d116080add --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs) (revision 87bd836d55d336e37e3d80f9a1521feb83ddc475) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs) (revision 7eb9b53adbeac6651703dc27e84705d116080add) @@ -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 'A' 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(ConfigurationGrassCoverErosionOutwardsCategoryType.MechanismSpecificLowerLimitNorm, configuration.CategoryType); Assert.AreEqual(ConfigurationGrassCoverErosionOutwardsCalculationType.WaveImpact, configuration.CalculationType); } } Fisheye: Tag 7eb9b53adbeac6651703dc27e84705d116080add refers to a dead (removed) revision in file `Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporter/validConfigurationWithoutCategoryBoundary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7eb9b53adbeac6651703dc27e84705d116080add refers to a dead (removed) revision in file `Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleCategoryType.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7eb9b53adbeac6651703dc27e84705d116080add refers to a dead (removed) revision in file `Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidCategoryTypeEmpty.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7eb9b53adbeac6651703dc27e84705d116080add refers to a dead (removed) revision in file `Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidCategoryTypeUnknownValue.xml'. Fisheye: No comparison available. Pass `N' to diff?