Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsInput.cs =================================================================== diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -r3b1aea305fa3407ef2d830bac9096ea670c86321 --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsInput.cs (.../GrassCoverErosionOutwardsWaveConditionsInput.cs) (revision 87bd836d55d336e37e3d80f9a1521feb83ddc475) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsInput.cs (.../GrassCoverErosionOutwardsWaveConditionsInput.cs) (revision 3b1aea305fa3407ef2d830bac9096ea670c86321) @@ -26,7 +26,7 @@ /// /// Wave conditions input for grass cover erosion outwards. /// - public class GrassCoverErosionOutwardsWaveConditionsInput : FailureMechanismCategoryWaveConditionsInput + public class GrassCoverErosionOutwardsWaveConditionsInput : WaveConditionsInput { /// /// Creates a new instance of . Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationWriter.cs =================================================================== diff -u -r3a50ce192fa494387b46e9e18bc87835d117ea1a -r3b1aea305fa3407ef2d830bac9096ea670c86321 --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationWriter.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationWriter.cs) (revision 3a50ce192fa494387b46e9e18bc87835d117ea1a) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationWriter.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationWriter.cs) (revision 3b1aea305fa3407ef2d830bac9096ea670c86321) @@ -20,14 +20,14 @@ // All rights reserved. using System.Xml; +using Riskeer.GrassCoverErosionOutwards.Data; using Riskeer.GrassCoverErosionOutwards.IO.Configurations.Converters; -using Riskeer.Revetment.Data; using Riskeer.Revetment.IO.Configurations; namespace Riskeer.GrassCoverErosionOutwards.IO.Configurations { /// - /// Writer for calculations that contain as input, + /// Writer for calculations that contain as input, /// to XML format. /// public class GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationWriter @@ -43,7 +43,6 @@ protected override void WriteWaveConditionsSpecificParameters( XmlWriter writer, GrassCoverErosionOutwardsWaveConditionsCalculationConfiguration configuration) { - if (configuration.CalculationType.HasValue) { writer.WriteElementString(WaveConditionsCalculationConfigurationSchemaIdentifiers.CalculationType, Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -r07256b6a9cc4abaff600e7c9a266cef54295b3c3 -r3b1aea305fa3407ef2d830bac9096ea670c86321 --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 07256b6a9cc4abaff600e7c9a266cef54295b3c3) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 3b1aea305fa3407ef2d830bac9096ea670c86321) @@ -141,7 +141,7 @@ }; yield return new ViewInfo, + ICalculation, WaveConditionsInputView> { Image = RiskeerCommonFormsResources.GenericInputOutputIcon, Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsInputTest.cs =================================================================== diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -r3b1aea305fa3407ef2d830bac9096ea670c86321 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsInputTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputTest.cs) (revision 87bd836d55d336e37e3d80f9a1521feb83ddc475) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsInputTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputTest.cs) (revision 3b1aea305fa3407ef2d830bac9096ea670c86321) @@ -39,7 +39,7 @@ var input = new GrassCoverErosionOutwardsWaveConditionsInput(); // Assert - Assert.IsInstanceOf(input); + Assert.IsInstanceOf(input); Assert.AreEqual(GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUpAndWaveImpact, input.CalculationType); } Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsWaveConditionsCalculationHelperTest.cs =================================================================== diff -u -rcfab785127fbc85d91c6bb2f259777e537448630 -r3b1aea305fa3407ef2d830bac9096ea670c86321 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsWaveConditionsCalculationHelperTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationHelperTest.cs) (revision cfab785127fbc85d91c6bb2f259777e537448630) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsWaveConditionsCalculationHelperTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationHelperTest.cs) (revision 3b1aea305fa3407ef2d830bac9096ea670c86321) @@ -103,13 +103,13 @@ Assert.AreEqual(2, calculationBases.Count); var firstCalculation = (GrassCoverErosionOutwardsWaveConditionsCalculation) calculationBases.First(); Assert.AreEqual(name, firstCalculation.Name); - FailureMechanismCategoryWaveConditionsInput firstCalculationInput = firstCalculation.InputParameters; + GrassCoverErosionOutwardsWaveConditionsInput firstCalculationInput = firstCalculation.InputParameters; Assert.AreEqual(locations[0], firstCalculationInput.HydraulicBoundaryLocation); Assert.AreEqual(expectedWaveConditionsInputWaterLevelType, firstCalculationInput.WaterLevelType); var secondCalculation = (GrassCoverErosionOutwardsWaveConditionsCalculation) calculationBases.ElementAt(1); Assert.AreEqual($"{name} (1)", secondCalculation.Name); - FailureMechanismCategoryWaveConditionsInput secondCalculationInput = secondCalculation.InputParameters; + GrassCoverErosionOutwardsWaveConditionsInput secondCalculationInput = secondCalculation.InputParameters; Assert.AreSame(locations[1], secondCalculationInput.HydraulicBoundaryLocation); Assert.AreEqual(expectedWaveConditionsInputWaterLevelType, secondCalculationInput.WaterLevelType); } @@ -143,13 +143,13 @@ Assert.AreEqual(3, calculationBases.Count); var firstCalculation = (GrassCoverErosionOutwardsWaveConditionsCalculation) calculationBases.ElementAt(1); Assert.AreEqual($"{name} (1)", firstCalculation.Name); - FailureMechanismCategoryWaveConditionsInput firstCalculationInput = firstCalculation.InputParameters; + GrassCoverErosionOutwardsWaveConditionsInput firstCalculationInput = firstCalculation.InputParameters; Assert.AreEqual(locations[0], firstCalculationInput.HydraulicBoundaryLocation); Assert.AreEqual(expectedWaveConditionsInputWaterLevelType, firstCalculationInput.WaterLevelType); var secondCalculation = (GrassCoverErosionOutwardsWaveConditionsCalculation) calculationBases.ElementAt(2); Assert.AreEqual($"{name} (2)", secondCalculation.Name); - FailureMechanismCategoryWaveConditionsInput secondCalculationInput = secondCalculation.InputParameters; + GrassCoverErosionOutwardsWaveConditionsInput secondCalculationInput = secondCalculation.InputParameters; Assert.AreSame(locations[1], secondCalculationInput.HydraulicBoundaryLocation); Assert.AreEqual(expectedWaveConditionsInputWaterLevelType, secondCalculationInput.WaterLevelType); } Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs =================================================================== diff -u -rd845320c4be9246f74eb65e0d460148be87777d8 -r3b1aea305fa3407ef2d830bac9096ea670c86321 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs (.../GrassCoverErosionOutwardsWaveConditionsExporterTest.cs) (revision d845320c4be9246f74eb65e0d460148be87777d8) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs (.../GrassCoverErosionOutwardsWaveConditionsExporterTest.cs) (revision 3b1aea305fa3407ef2d830bac9096ea670c86321) @@ -24,7 +24,6 @@ using Core.Common.Base.Data; using Core.Common.TestUtil; using NUnit.Framework; -using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.TestUtil; using Riskeer.GrassCoverErosionOutwards.Data; @@ -158,7 +157,7 @@ StepSize = WaveConditionsInputStepSize.Half, LowerBoundaryWaterLevels = (RoundedDouble) 1.98699, UpperBoundaryWaterLevels = (RoundedDouble) 84.26548, - CategoryType = FailureMechanismCategoryType.LowerLimitNorm + WaterLevelType = WaveConditionsInputWaterLevelType.LowerLimit }, Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create( new[] @@ -214,7 +213,7 @@ StepSize = WaveConditionsInputStepSize.Half, LowerBoundaryWaterLevels = (RoundedDouble) 1.98699, UpperBoundaryWaterLevels = (RoundedDouble) 84.26548, - CategoryType = FailureMechanismCategoryType.LowerLimitNorm, + WaterLevelType = WaveConditionsInputWaterLevelType.LowerLimit, CalculationType = GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUp }, Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create( @@ -270,7 +269,7 @@ StepSize = WaveConditionsInputStepSize.Half, LowerBoundaryWaterLevels = (RoundedDouble) 1.98699, UpperBoundaryWaterLevels = (RoundedDouble) 84.26548, - CategoryType = FailureMechanismCategoryType.LowerLimitNorm, + WaterLevelType = WaveConditionsInputWaterLevelType.LowerLimit, CalculationType = GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveImpact }, Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create( @@ -326,7 +325,7 @@ StepSize = WaveConditionsInputStepSize.Half, LowerBoundaryWaterLevels = (RoundedDouble) 1.98699, UpperBoundaryWaterLevels = (RoundedDouble) 84.26548, - CategoryType = FailureMechanismCategoryType.LowerLimitNorm, + WaterLevelType = WaveConditionsInputWaterLevelType.LowerLimit, CalculationType = GrassCoverErosionOutwardsWaveConditionsCalculationType.TailorMadeWaveImpact }, Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create( @@ -382,7 +381,7 @@ StepSize = WaveConditionsInputStepSize.Half, LowerBoundaryWaterLevels = (RoundedDouble) 1.98699, UpperBoundaryWaterLevels = (RoundedDouble) 84.26548, - CategoryType = FailureMechanismCategoryType.LowerLimitNorm, + WaterLevelType = WaveConditionsInputWaterLevelType.LowerLimit, CalculationType = GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUpAndTailorMadeWaveImpact }, Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create( @@ -439,7 +438,7 @@ StepSize = WaveConditionsInputStepSize.Half, LowerBoundaryWaterLevels = (RoundedDouble) 1.98699, UpperBoundaryWaterLevels = (RoundedDouble) 84.26548, - CategoryType = FailureMechanismCategoryType.LowerLimitNorm, + WaterLevelType = WaveConditionsInputWaterLevelType.LowerLimit, CalculationType = GrassCoverErosionOutwardsWaveConditionsCalculationType.All }, Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create( Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs =================================================================== diff -u -r21ca6f7676be810586cf62b08f24f25b618a7101 -r3b1aea305fa3407ef2d830bac9096ea670c86321 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs) (revision 21ca6f7676be810586cf62b08f24f25b618a7101) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs) (revision 3b1aea305fa3407ef2d830bac9096ea670c86321) @@ -31,10 +31,10 @@ using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.Contribution; -using Riskeer.Common.Data.FailureMechanism; using Riskeer.GrassCoverErosionOutwards.Data; using Riskeer.GrassCoverErosionOutwards.Forms.PresentationObjects; using Riskeer.GrassCoverErosionOutwards.IO.Configurations; +using Riskeer.Revetment.Data; using CoreGuiResources = Core.Gui.Properties.Resources; namespace Riskeer.GrassCoverErosionOutwards.Plugin.Test.ExportInfos @@ -98,7 +98,7 @@ { InputParameters = { - CategoryType = random.NextEnumValue() + WaterLevelType = random.NextEnumValue() } }; var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(calculation, Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs =================================================================== diff -u -rb940b6d997e521c433775bcd2aa5eddd15010d15 -r3b1aea305fa3407ef2d830bac9096ea670c86321 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs (.../GrassCoverErosionOutwardsPluginTest.cs) (revision b940b6d997e521c433775bcd2aa5eddd15010d15) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs (.../GrassCoverErosionOutwardsPluginTest.cs) (revision 3b1aea305fa3407ef2d830bac9096ea670c86321) @@ -34,7 +34,6 @@ using Riskeer.GrassCoverErosionOutwards.Forms.PresentationObjects; using Riskeer.GrassCoverErosionOutwards.Forms.PropertyClasses; using Riskeer.GrassCoverErosionOutwards.Forms.Views; -using Riskeer.Revetment.Data; using Riskeer.Revetment.Forms.Views; namespace Riskeer.GrassCoverErosionOutwards.Plugin.Test @@ -84,7 +83,7 @@ PluginTestHelper.AssertViewInfoDefined( viewInfos, typeof(GrassCoverErosionOutwardsWaveConditionsInputContext), - typeof(ICalculation), + typeof(ICalculation), typeof(WaveConditionsInputView)); } } Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -rce9f350f2e89e398b59b2f412c12b91f3902659f -r3b1aea305fa3407ef2d830bac9096ea670c86321 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision ce9f350f2e89e398b59b2f412c12b91f3902659f) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 3b1aea305fa3407ef2d830bac9096ea670c86321) @@ -41,7 +41,6 @@ using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.DikeProfiles; -using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Service.TestUtil; @@ -1008,7 +1007,7 @@ Name = "A", InputParameters = { - CategoryType = random.NextEnumValue() + WaterLevelType = random.NextEnumValue() } }; Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rcfab785127fbc85d91c6bb2f259777e537448630 -r3b1aea305fa3407ef2d830bac9096ea670c86321 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision cfab785127fbc85d91c6bb2f259777e537448630) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 3b1aea305fa3407ef2d830bac9096ea670c86321) @@ -42,7 +42,6 @@ using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.Contribution; -using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Forms; @@ -1109,7 +1108,7 @@ LowerBoundaryWaterLevels = (RoundedDouble) 1.0, UpperBoundaryWaterLevels = (RoundedDouble) 10.0, Orientation = (RoundedDouble) 0, - CategoryType = random.NextEnumValue() + WaterLevelType = random.NextEnumValue() } }; @@ -1847,13 +1846,13 @@ WaveConditionsInputWaterLevelType expectedWaveConditionsInputWaterLevelType = GetWaterLevelTypeFromNormType(normType); var firstCalculation = group.Children[2] as GrassCoverErosionOutwardsWaveConditionsCalculation; Assert.IsNotNull(firstCalculation); - FailureMechanismCategoryWaveConditionsInput firstCalculationInput = firstCalculation.InputParameters; + GrassCoverErosionOutwardsWaveConditionsInput firstCalculationInput = firstCalculation.InputParameters; Assert.AreSame(hydraulicBoundaryLocation1, firstCalculationInput.HydraulicBoundaryLocation); Assert.AreEqual(expectedWaveConditionsInputWaterLevelType, firstCalculationInput.WaterLevelType); var secondCalculation = group.Children[3] as GrassCoverErosionOutwardsWaveConditionsCalculation; Assert.IsNotNull(secondCalculation); - FailureMechanismCategoryWaveConditionsInput secondCalculationInput = secondCalculation.InputParameters; + GrassCoverErosionOutwardsWaveConditionsInput secondCalculationInput = secondCalculation.InputParameters; Assert.AreSame(hydraulicBoundaryLocation2, secondCalculationInput.HydraulicBoundaryLocation); Assert.AreEqual(expectedWaveConditionsInputWaterLevelType, secondCalculationInput.WaterLevelType); } Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs =================================================================== diff -u -r726ce8f2df7487028975e76a5df637c938992e01 -r3b1aea305fa3407ef2d830bac9096ea670c86321 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs) (revision 726ce8f2df7487028975e76a5df637c938992e01) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs) (revision 3b1aea305fa3407ef2d830bac9096ea670c86321) @@ -75,7 +75,7 @@ { // Assert Assert.AreEqual(typeof(GrassCoverErosionOutwardsWaveConditionsInputContext), info.DataType); - Assert.AreEqual(typeof(ICalculation), info.ViewDataType); + Assert.AreEqual(typeof(ICalculation), info.ViewDataType); TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.GenericInputOutputIcon, info.Image); } @@ -98,7 +98,7 @@ { InputParameters = { - CategoryType = random.NextEnumValue() + WaterLevelType = random.NextEnumValue() } }; var context = new GrassCoverErosionOutwardsWaveConditionsInputContext( Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs =================================================================== diff -u -r2c1e108f7c6e62fd4025809fe4f97fee7d0d2948 -r3b1aea305fa3407ef2d830bac9096ea670c86321 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs (.../GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs) (revision 2c1e108f7c6e62fd4025809fe4f97fee7d0d2948) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs (.../GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs) (revision 3b1aea305fa3407ef2d830bac9096ea670c86321) @@ -30,7 +30,6 @@ using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; -using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Service; @@ -236,7 +235,7 @@ InputParameters = { HydraulicBoundaryLocation = hydraulicBoundaryLocation, - CategoryType = FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm, + WaterLevelType = WaveConditionsInputWaterLevelType.Signaling, ForeshoreProfile = new TestForeshoreProfile(true) { BreakWater = Fisheye: Tag 3b1aea305fa3407ef2d830bac9096ea670c86321 refers to a dead (removed) revision in file `Riskeer/Revetment/src/Riskeer.Revetment.Data/FailureMechanismCategoryWaveConditionsInput.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/WaveConditions/ExportableWaveConditionsFactory.cs =================================================================== diff -u -rc9a87f101cdd37370a07bd6d0727ce9773313332 -r3b1aea305fa3407ef2d830bac9096ea670c86321 --- Riskeer/Revetment/src/Riskeer.Revetment.IO/WaveConditions/ExportableWaveConditionsFactory.cs (.../ExportableWaveConditionsFactory.cs) (revision c9a87f101cdd37370a07bd6d0727ce9773313332) +++ Riskeer/Revetment/src/Riskeer.Revetment.IO/WaveConditions/ExportableWaveConditionsFactory.cs (.../ExportableWaveConditionsFactory.cs) (revision 3b1aea305fa3407ef2d830bac9096ea670c86321) @@ -35,26 +35,36 @@ /// Creates a collection of . /// /// The name of the calculation to which the belong. - /// The used in the calculations. + /// The used in the calculations. /// The resulting from the calculations. /// The that the represents. /// for getting the target probability to use. /// A collection of . /// Thrown when any parameter is null. - /// Thrown when + /// Thrown when /// is null in . public static IEnumerable CreateExportableWaveConditionsCollection( string name, - FailureMechanismCategoryWaveConditionsInput waveConditionsInput, + WaveConditionsInput waveConditionsInput, IEnumerable output, CoverType coverType, Func getTargetProbabilityFunc) { + if (name == null) + { + throw new ArgumentNullException(nameof(name)); + } + if (waveConditionsInput == null) { throw new ArgumentNullException(nameof(waveConditionsInput)); } + if (output == null) + { + throw new ArgumentNullException(nameof(output)); + } + if (coverType == null) { throw new ArgumentNullException(nameof(coverType)); @@ -65,7 +75,8 @@ throw new ArgumentNullException(nameof(getTargetProbabilityFunc)); } - return CreateExportableWaveConditionsCollection(name, (WaveConditionsInput) waveConditionsInput, output, coverType, getTargetProbabilityFunc); + return output.Select(waveConditionsOutput => new ExportableWaveConditions(name, waveConditionsInput, waveConditionsOutput, + coverType, getTargetProbabilityFunc(waveConditionsInput))).ToArray(); } /// @@ -103,38 +114,5 @@ return CreateExportableWaveConditionsCollection(name, (WaveConditionsInput) waveConditionsInput, output, coverType, getTargetProbabilityFunc); } - - /// - /// Creates a collection of . - /// - /// The name of the calculation to which the belong. - /// The used in the calculations. - /// The resulting from the calculations. - /// The type of cover. - /// for getting the target probability to use. - /// A collection of . - /// Thrown when any parameter is null. - /// Thrown when - /// is null in . - private static IEnumerable CreateExportableWaveConditionsCollection( - string name, - WaveConditionsInput waveConditionsInput, - IEnumerable output, - CoverType coverType, - Func getTargetProbabilityFunc) - { - if (name == null) - { - throw new ArgumentNullException(nameof(name)); - } - - if (output == null) - { - throw new ArgumentNullException(nameof(output)); - } - - return output.Select(waveConditionsOutput => new ExportableWaveConditions(name, waveConditionsInput, waveConditionsOutput, - coverType, getTargetProbabilityFunc(waveConditionsInput))).ToArray(); - } } } \ No newline at end of file Fisheye: Tag 3b1aea305fa3407ef2d830bac9096ea670c86321 refers to a dead (removed) revision in file `Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/FailureMechanismCategoryWaveConditionsInputTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Revetment/test/Riskeer.Revetment.Data.TestUtil/WaveConditionsCloneAssert.cs =================================================================== diff -u -r7491928192a7ecf23958f85fbd4669ec17085c95 -r3b1aea305fa3407ef2d830bac9096ea670c86321 --- Riskeer/Revetment/test/Riskeer.Revetment.Data.TestUtil/WaveConditionsCloneAssert.cs (.../WaveConditionsCloneAssert.cs) (revision 7491928192a7ecf23958f85fbd4669ec17085c95) +++ Riskeer/Revetment/test/Riskeer.Revetment.Data.TestUtil/WaveConditionsCloneAssert.cs (.../WaveConditionsCloneAssert.cs) (revision 3b1aea305fa3407ef2d830bac9096ea670c86321) @@ -75,21 +75,6 @@ /// The cloned object. /// Thrown when and /// are not clones. - public static void AreClones(FailureMechanismCategoryWaveConditionsInput original, FailureMechanismCategoryWaveConditionsInput clone) - { - Assert.AreEqual(original.CategoryType, clone.CategoryType); - - AreClones((WaveConditionsInput) original, clone); - } - - /// - /// Method that asserts whether and - /// are clones. - /// - /// The original object. - /// The cloned object. - /// Thrown when and - /// are not clones. public static void AreClones(WaveConditionsInput original, WaveConditionsInput clone) { CoreCloneAssert.AreObjectClones(original.BreakWater, clone.BreakWater, CommonCloneAssert.AreClones); Index: Riskeer/Revetment/test/Riskeer.Revetment.Data.TestUtil/WaveConditionsTestDataGenerator.cs =================================================================== diff -u -r7491928192a7ecf23958f85fbd4669ec17085c95 -r3b1aea305fa3407ef2d830bac9096ea670c86321 --- Riskeer/Revetment/test/Riskeer.Revetment.Data.TestUtil/WaveConditionsTestDataGenerator.cs (.../WaveConditionsTestDataGenerator.cs) (revision 7491928192a7ecf23958f85fbd4669ec17085c95) +++ Riskeer/Revetment/test/Riskeer.Revetment.Data.TestUtil/WaveConditionsTestDataGenerator.cs (.../WaveConditionsTestDataGenerator.cs) (revision 3b1aea305fa3407ef2d830bac9096ea670c86321) @@ -22,7 +22,6 @@ using System; using Core.Common.TestUtil; using Riskeer.Common.Data.AssessmentSection; -using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.TestUtil; @@ -69,19 +68,6 @@ /// This method sets random data values to all properties of . /// /// The input to set the random data values to. - public static void SetRandomDataToWaveConditionsInput(FailureMechanismCategoryWaveConditionsInput input) - { - var random = new Random(21); - - input.CategoryType = random.NextEnumValue(); - - SetRandomDataToWaveConditionsInput((WaveConditionsInput) input); - } - - /// - /// This method sets random data values to all properties of . - /// - /// The input to set the random data values to. public static void SetRandomDataToWaveConditionsInput(WaveConditionsInput input) { var random = new Random(21); Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/WaveConditions/ExportableWaveConditionsFactoryTest.cs =================================================================== diff -u -rb488cc05750d849cd91fb36920d8ad346889c7c3 -r3b1aea305fa3407ef2d830bac9096ea670c86321 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/WaveConditions/ExportableWaveConditionsFactoryTest.cs (.../ExportableWaveConditionsFactoryTest.cs) (revision b488cc05750d849cd91fb36920d8ad346889c7c3) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/WaveConditions/ExportableWaveConditionsFactoryTest.cs (.../ExportableWaveConditionsFactoryTest.cs) (revision 3b1aea305fa3407ef2d830bac9096ea670c86321) @@ -24,7 +24,6 @@ using System.Linq; using NUnit.Framework; using Riskeer.Common.Data.AssessmentSection; -using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.TestUtil; using Riskeer.Revetment.Data; @@ -44,110 +43,6 @@ }; [Test] - public void CreateExportableWaveConditionsCollectionWithFailureMechanismCategoryWaveConditionsInput_NameNull_ThrowArgumentNullException() - { - // Call - void Call() => ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection(null, new FailureMechanismCategoryWaveConditionsInput(), - waveConditionsOutputCollection, CoverType.GrassWaveRunUp, i => "1/100"); - - // Assert - var exception = Assert.Throws(Call); - Assert.AreEqual("name", exception.ParamName); - } - - [Test] - public void CreateExportableWaveConditionsCollectionWithFailureMechanismCategoryWaveConditionsInput_WaveConditionsInputNull_ThrowArgumentNullException() - { - // Call - void Call() => ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection("aName", (FailureMechanismCategoryWaveConditionsInput) null, waveConditionsOutputCollection, - CoverType.GrassWaveRunUp, i => "1/100"); - - // Assert - var exception = Assert.Throws(Call); - Assert.AreEqual("waveConditionsInput", exception.ParamName); - } - - [Test] - public void CreateExportableWaveConditionsCollectionWithFailureMechanismCategoryWaveConditionsInput_OutputNull_ThrowArgumentNullException() - { - // Call - void Call() => ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection("aName", new FailureMechanismCategoryWaveConditionsInput(), - null, CoverType.GrassWaveRunUp, i => "1/100"); - - // Assert - var exception = Assert.Throws(Call); - Assert.AreEqual("output", exception.ParamName); - } - - [Test] - public void CreateExportableWaveConditionsCollectionWithFailureMechanismCategoryWaveConditionsInput_CoverTypeNull_ThrowArgumentNullException() - { - // Call - void Call() => ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection("aName", new FailureMechanismCategoryWaveConditionsInput(), - waveConditionsOutputCollection, null, i => "1/100"); - - // Assert - var exception = Assert.Throws(Call); - Assert.AreEqual("coverType", exception.ParamName); - } - - [Test] - public void CreateExportableWaveConditionsCollectionWithFailureMechanismCategoryWaveConditionsInput_GetTargetProbabilityFuncNull_ThrowArgumentNullException() - { - // Call - void Call() => ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection("aName", new FailureMechanismCategoryWaveConditionsInput(), - waveConditionsOutputCollection, CoverType.GrassWaveRunUp, null); - - // Assert - var exception = Assert.Throws(Call); - Assert.AreEqual("getTargetProbabilityFunc", exception.ParamName); - } - - [Test] - [TestCaseSource(nameof(GetCoverTypes))] - public void CreateExportableWaveConditionsCollectionWithFailureMechanismCategoryWaveConditionsInput_ValidDataWithCoverType_ReturnsValidCollection(CoverType coverType) - { - // Setup - var waveConditionsInput = new FailureMechanismCategoryWaveConditionsInput - { - HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "hblName", 1.0, 8.0), - ForeshoreProfile = new TestForeshoreProfile(), - UseForeshore = true, - CategoryType = FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm - }; - - // Call - ExportableWaveConditions[] exportableWaveConditionsCollection = - ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection("ewcName", - waveConditionsInput, - waveConditionsOutputCollection, - coverType, - i => "1/100").ToArray(); - - // Assert - Assert.AreEqual(1, exportableWaveConditionsCollection.Length); - ExportableWaveConditions exportableWaveConditions = exportableWaveConditionsCollection[0]; - Assert.AreEqual("ewcName", exportableWaveConditions.CalculationName); - Assert.AreEqual("hblName", exportableWaveConditions.LocationName); - Assert.AreEqual(1.0, exportableWaveConditions.LocationXCoordinate); - Assert.AreEqual(8.0, exportableWaveConditions.LocationYCoordinate); - Assert.AreEqual("id", exportableWaveConditions.ForeshoreId); - Assert.AreEqual(false, exportableWaveConditions.UseBreakWater); - Assert.AreEqual(true, exportableWaveConditions.UseForeshore); - Assert.AreEqual(coverType, exportableWaveConditions.CoverType); - Assert.AreEqual("1/100", exportableWaveConditions.TargetProbability); - Assert.AreEqual(2, exportableWaveConditions.WaterLevel.NumberOfDecimalPlaces); - Assert.AreEqual(2, exportableWaveConditions.WaveHeight.NumberOfDecimalPlaces); - Assert.AreEqual(2, exportableWaveConditions.WavePeriod.NumberOfDecimalPlaces); - Assert.AreEqual(2, exportableWaveConditions.WaveAngle.NumberOfDecimalPlaces); - Assert.AreEqual(waveConditionsOutput.WaterLevel, exportableWaveConditions.WaterLevel); - Assert.AreEqual(waveConditionsOutput.WaveHeight, exportableWaveConditions.WaveHeight); - Assert.AreEqual(waveConditionsOutput.WavePeakPeriod, exportableWaveConditions.WavePeriod); - Assert.AreEqual(waveConditionsOutput.WaveAngle, exportableWaveConditions.WaveAngle); - Assert.AreEqual(waveConditionsOutput.WaveDirection, exportableWaveConditions.WaveDirection); - } - - [Test] public void CreateExportableWaveConditionsCollectionWithAssessmentSectionCategoryWaveConditionsInput_NameNull_ThrowArgumentNullException() { // Call @@ -163,7 +58,7 @@ public void CreateExportableWaveConditionsCollectionWithAssessmentSectionCategoryWaveConditionsInput_WaveConditionsInputNull_ThrowArgumentNullException() { // Call - void Call() => ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection("aName", (AssessmentSectionCategoryWaveConditionsInput) null, + void Call() => ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection("aName", null, waveConditionsOutputCollection, CoverType.Asphalt, i => "1/100"); // Assert Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -r9727d33fa1f6919fb1c0f70ba7c87a7cf4e158dd -r3b1aea305fa3407ef2d830bac9096ea670c86321 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs) (revision 9727d33fa1f6919fb1c0f70ba7c87a7cf4e158dd) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs) (revision 3b1aea305fa3407ef2d830bac9096ea670c86321) @@ -34,7 +34,6 @@ using Riskeer.Storage.Core.Read.GrassCoverErosionOutwards; using Riskeer.Storage.Core.Serializers; using Riskeer.Storage.Core.TestUtil.Hydraulics; -using WaveConditionsInputWaterLevelType = Riskeer.Revetment.Data.WaveConditionsInputWaterLevelType; namespace Riskeer.Storage.Core.Test.Read.GrassCoverErosionOutwards { @@ -148,7 +147,7 @@ Assert.IsNull(calculation.Name); Assert.IsNull(calculation.Comments.Body); - FailureMechanismCategoryWaveConditionsInput calculationInput = calculation.InputParameters; + GrassCoverErosionOutwardsWaveConditionsInput calculationInput = calculation.InputParameters; Assert.IsNaN(calculationInput.BreakWater.Height); Assert.IsNaN(calculationInput.Orientation); Assert.IsNaN(calculationInput.UpperBoundaryRevetment);