Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsCalculation.cs =================================================================== diff -u -r2876f9193f8ea4f2bf130601553d4f8eace0580c -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsCalculation.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculation.cs) (revision 2876f9193f8ea4f2bf130601553d4f8eace0580c) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsCalculation.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculation.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -37,7 +37,7 @@ public GrassCoverErosionOutwardsWaveConditionsCalculation() { Name = Resources.GrassCoverErosionOutwardsWaveConditionsCalculation_DefaultName; - InputParameters = new WaveConditionsInput(); + InputParameters = new WaveConditionsInput(WaveConditionsRevetment.Grass); } /// Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs =================================================================== diff -u -r2876f9193f8ea4f2bf130601553d4f8eace0580c -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs) (revision 2876f9193f8ea4f2bf130601553d4f8eace0580c) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -47,6 +47,7 @@ Assert.IsNull(calculation.Comments); Assert.IsNull(calculation.Output); Assert.IsNull(calculation.InputParameters.ForeshoreProfile); + Assert.AreEqual(WaveConditionsRevetment.Grass, calculation.InputParameters.RevetmentType); } [Test] Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/WaveConditionsInputContextTreeNodeInfoTest.cs =================================================================== diff -u -r7e73b46787b05288e766f041ba935e20edf1eb93 -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/WaveConditionsInputContextTreeNodeInfoTest.cs (.../WaveConditionsInputContextTreeNodeInfoTest.cs) (revision 7e73b46787b05288e766f041ba935e20edf1eb93) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/WaveConditionsInputContextTreeNodeInfoTest.cs (.../WaveConditionsInputContextTreeNodeInfoTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -80,7 +80,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.Grass); var context = new WaveConditionsInputContext(input, new ForeshoreProfile[0], assessmentSection); @@ -104,7 +104,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.Grass); var context = new WaveConditionsInputContext(input, new ForeshoreProfile[0], assessmentSection); @@ -127,7 +127,7 @@ { var assessmentSection = mocks.Stub(); - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.Grass); var context = new WaveConditionsInputContext(input, new ForeshoreProfile[0], assessmentSection); Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Properties/Resources.Designer.cs =================================================================== diff -u -r8efe4bdfd7e47208edb8585a8ac32ebcd56635c0 -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 8efe4bdfd7e47208edb8585a8ac32ebcd56635c0) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -22,7 +22,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -136,5 +136,32 @@ return ResourceManager.GetString("WaveConditionsInputStepSize_Two", resourceCulture); } } + + /// + /// Looks up a localized string similar to Asfalt. + /// + internal static string WaveConditionsRevetment_AsphaltRevetment { + get { + return ResourceManager.GetString("WaveConditionsRevetment_AsphaltRevetment", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Gras. + /// + internal static string WaveConditionsRevetment_GrassRevetment { + get { + return ResourceManager.GetString("WaveConditionsRevetment_GrassRevetment", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Steen (blokken en zuilen). + /// + internal static string WaveConditionsRevetment_StoneRevetment { + get { + return ResourceManager.GetString("WaveConditionsRevetment_StoneRevetment", resourceCulture); + } + } } } Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Properties/Resources.resx =================================================================== diff -u -r8efe4bdfd7e47208edb8585a8ac32ebcd56635c0 -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Properties/Resources.resx (.../Resources.resx) (revision 8efe4bdfd7e47208edb8585a8ac32ebcd56635c0) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Properties/Resources.resx (.../Resources.resx) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -135,4 +135,13 @@ 2.0 + + Asfalt + + + Gras + + + Steen (blokken en zuilen) + \ No newline at end of file Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Ringtoets.Revetment.Data.csproj =================================================================== diff -u -rae93bd6b8ccbffa91f7c5c10e898736b5919b73d -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Ringtoets.Revetment.Data.csproj (.../Ringtoets.Revetment.Data.csproj) (revision ae93bd6b8ccbffa91f7c5c10e898736b5919b73d) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Ringtoets.Revetment.Data.csproj (.../Ringtoets.Revetment.Data.csproj) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -50,6 +50,7 @@ + Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs =================================================================== diff -u -re9c2bf6e6c4d2ed9217597a115d09be4f3974901 -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs (.../WaveConditionsInput.cs) (revision e9c2bf6e6c4d2ed9217597a115d09be4f3974901) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs (.../WaveConditionsInput.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -49,8 +49,9 @@ /// /// Creates a new instance of . /// - public WaveConditionsInput() + public WaveConditionsInput(WaveConditionsRevetment revetmentType) { + RevetmentType = revetmentType; orientation = new RoundedDouble(2); upperBoundaryRevetment = new RoundedDouble(2, double.NaN); @@ -63,6 +64,11 @@ } /// + /// Gets the type of the revetment. + /// + public WaveConditionsRevetment RevetmentType { get; private set; } + + /// /// Gets or sets the hydraulic boundary location from which to use the assessment level. /// public HydraulicBoundaryLocation HydraulicBoundaryLocation { get; set; } @@ -351,7 +357,7 @@ { if (foreshoreProfile == null) { - Orientation = (RoundedDouble)0.0; + Orientation = (RoundedDouble) 0.0; UseForeshore = false; UseBreakWater = false; BreakWater = GetDefaultBreakWater(); Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsRevetment.cs =================================================================== diff -u --- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsRevetment.cs (revision 0) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsRevetment.cs (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -0,0 +1,50 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using Core.Common.Utils.Attributes; +using Ringtoets.Revetment.Data.Properties; + +namespace Ringtoets.Revetment.Data +{ + /// + /// Enum defining the possible revetment types for a wave conditions calculation. + /// + public enum WaveConditionsRevetment + { + /// + /// Grass revetment. + /// + [ResourcesDisplayName(typeof(Resources), "WaveConditionsRevetment_GrassRevetment")] + Grass, + + /// + /// Stability stone revetment. + /// + [ResourcesDisplayName(typeof(Resources), "WaveConditionsRevetment_StoneRevetment")] + StabilityStone, + + /// + /// Wave impact asphalt revetment. + /// + [ResourcesDisplayName(typeof(Resources), "WaveConditionsRevetment_AsphaltRevetment")] + Asphalt + } +} \ No newline at end of file Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rf3e0a05168328097121cfa8f9c4ff32d775879ff -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f3e0a05168328097121cfa8f9c4ff32d775879ff) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -154,15 +154,6 @@ } /// - /// Looks up a localized string similar to Steen (blokken en zuilen). - /// - internal static string StabilityStoneCover_StoneRevetment_DisplayName { - get { - return ResourceManager.GetString("StabilityStoneCover_StoneRevetment_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Ondergrens van de bekleding.. /// internal static string WaveConditionsInput_LowerBoundaryRevetment_Description { Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.resx =================================================================== diff -u -rf3e0a05168328097121cfa8f9c4ff32d775879ff -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.resx (.../Resources.resx) (revision f3e0a05168328097121cfa8f9c4ff32d775879ff) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Properties/Resources.resx (.../Resources.resx) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -141,9 +141,6 @@ c - - Steen (blokken en zuilen) - Ondergrens van de bekleding. Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs =================================================================== diff -u -rf3e0a05168328097121cfa8f9c4ff32d775879ff -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs (.../WaveConditionsInputContextProperties.cs) (revision f3e0a05168328097121cfa8f9c4ff32d775879ff) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs (.../WaveConditionsInputContextProperties.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -286,14 +286,15 @@ } [PropertyOrder(revetmentTypePropertyIndex)] + [TypeConverter(typeof(EnumTypeConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] [ResourcesDisplayName(typeof(Resources), "WaveConditionsInput_RevetmentType_DisplayName")] [ResourcesDescription(typeof(Resources), "WaveConditionsInput_RevetmentType_Description")] - public string RevetmentType + public WaveConditionsRevetment RevetmentType { get { - return Resources.StabilityStoneCover_StoneRevetment_DisplayName; + return data.WrappedData.RevetmentType; } } Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Ringtoets.Revetment.Forms.csproj =================================================================== diff -u -rf3e0a05168328097121cfa8f9c4ff32d775879ff -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Ringtoets.Revetment.Forms.csproj (.../Ringtoets.Revetment.Forms.csproj) (revision f3e0a05168328097121cfa8f9c4ff32d775879ff) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Ringtoets.Revetment.Forms.csproj (.../Ringtoets.Revetment.Forms.csproj) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -106,6 +106,7 @@ ResXFileCodeGenerator Resources.Designer.cs + Designer Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs =================================================================== diff -u -re9c2bf6e6c4d2ed9217597a115d09be4f3974901 -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs (.../WaveConditionsInputTest.cs) (revision e9c2bf6e6c4d2ed9217597a115d09be4f3974901) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs (.../WaveConditionsInputTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -101,12 +101,16 @@ [Test] public void Constructor_ExpectedValues() { + // Setup + const WaveConditionsRevetment revetmentType = WaveConditionsRevetment.StabilityStone; + // Call - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(revetmentType); // Assert Assert.IsInstanceOf(input); Assert.IsInstanceOf(input); + Assert.AreEqual(revetmentType, input.RevetmentType); Assert.IsNull(input.HydraulicBoundaryLocation); Assert.IsNull(input.ForeshoreProfile); Assert.IsFalse(input.UseBreakWater); @@ -136,7 +140,7 @@ public void HydraulicBoundaryLocation_SetNewValue_AssessmentLevelAndUpperBoundaryDesignWaterLevelExpectedValue() { // Setup - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); const double assessmentLevel = 3.2; // Call @@ -154,7 +158,7 @@ public void HydraulicBoundaryLocation_SetNullValue_AssessmentLevelAndUpperBoundaryDesignWaterLevelNaN() { // Setup - var input = new WaveConditionsInput + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "", 0, 0) { @@ -177,7 +181,7 @@ [Values(true, false)] bool withValidForeshore) { // Setup - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); BreakWaterType originalBreakWaterType = input.BreakWater.Type; RoundedDouble originalBreakWaterHeight = input.BreakWater.Height; HydraulicBoundaryLocation originalHydraulicBoundaryLocation = input.HydraulicBoundaryLocation; @@ -233,7 +237,7 @@ public void Foreshore_SetNullValue_InputSyncedToDefaults() { // Setup - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); BreakWaterType originalBreakWaterType = input.BreakWater.Type; RoundedDouble originalBreakWaterHeight = input.BreakWater.Height; HydraulicBoundaryLocation originalHydraulicBoundaryLocation = input.HydraulicBoundaryLocation; @@ -285,7 +289,7 @@ public void Orientation_ValidValues_NewValueSet(double orientation) { // Setup - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); // Call input.Orientation = (RoundedDouble)orientation; @@ -298,7 +302,7 @@ public void UpperBoundaryDesignWaterLevel_NoHydraulicBoundaryLocation_ReturnNaN() { // Setup - var waveConditionsInput = new WaveConditionsInput(); + var waveConditionsInput = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); // Call waveConditionsInput.HydraulicBoundaryLocation = null; @@ -311,7 +315,7 @@ public void UpperBoundaryDesignWaterLevel_NoDesignWaterLevel_ReturnNaN() { // Setup - var waveConditionsInput = new WaveConditionsInput(); + var waveConditionsInput = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); // Call waveConditionsInput.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "", 0, 0); @@ -325,7 +329,7 @@ { // Setup var designWaterLevel = (RoundedDouble)1.0; - var waveConditionsInput = new WaveConditionsInput(); + var waveConditionsInput = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); // Call waveConditionsInput.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "", 0, 0) @@ -341,7 +345,7 @@ public void LowerBoundaryRevetment_SetNewValue_ValueIsRounded() { // Setup - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); int originalNumberOfDecimalPlaces = input.LowerBoundaryRevetment.NumberOfDecimalPlaces; @@ -362,7 +366,7 @@ public void LowerBoundaryRevetment_ValidValueAccordingtoUpperBoundaryRevetment_ValueIsSet(double lowerBoundaryRevetment, double upperBoundaryRevetment) { // Setup - var input = new WaveConditionsInput + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { UpperBoundaryRevetment = (RoundedDouble)upperBoundaryRevetment }; @@ -381,7 +385,7 @@ public void LowerBoundaryRevetment_InvalidValueAccordingtoUpperBoundaryRevetment_ThrowsArgumentOutOfRangeException(double lowerBoundaryRevetment, double upperBoundaryRevetment) { // Setup - var input = new WaveConditionsInput + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { UpperBoundaryRevetment = (RoundedDouble)upperBoundaryRevetment }; @@ -400,7 +404,7 @@ public void LowerBoundaryRevetment_BoundarySmallerThanValid_SetValueToValidBoundary(double newValue) { // Setup - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); // Call input.LowerBoundaryRevetment = (RoundedDouble) newValue; @@ -413,7 +417,7 @@ public void UpperBoundaryRevetment_SetNewValue_ValueIsRounded() { // Setup - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); int originalNumberOfDecimalPlaces = input.UpperBoundaryRevetment.NumberOfDecimalPlaces; @@ -434,7 +438,7 @@ public void UpperBoundaryRevetment_ValidValueAccordingtoLowerBoundaryRevetment_ValueIsSet(double lowerBoundaryRevetment, double upperBoundaryRevetment) { // Setup - var input = new WaveConditionsInput + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { LowerBoundaryRevetment = (RoundedDouble)lowerBoundaryRevetment }; @@ -453,7 +457,7 @@ public void UpperBoundaryRevetment_InvalidValueAccordingtoLowerBoundaryRevetment_ThrowsArgumentOutOfRangeException(double lowerBoundaryRevetment, double upperBoundaryRevetment) { // Setup - var input = new WaveConditionsInput + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { LowerBoundaryRevetment = (RoundedDouble)lowerBoundaryRevetment }; @@ -472,7 +476,7 @@ public void UpperBoundaryRevetment_BoundaryLargerThanValid_SetValueToValidBoundary(double newValue) { // Setup - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); // Call input.UpperBoundaryRevetment = (RoundedDouble)newValue; @@ -485,7 +489,7 @@ public void LowerBoundaryWaterLevels_SetNewValue_ValueIsRounded() { // Setup - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); int originalNumberOfDecimalPlaces = input.LowerBoundaryWaterLevels.NumberOfDecimalPlaces; @@ -506,7 +510,7 @@ public void LowerBoundaryWaterLevels_ValidValueAccordingtoUpperBoundaryWaterLevels_ValueIsSet(double lowerBoundaryWaterLevels, double upperBoundaryWaterLevels) { // Setup - var input = new WaveConditionsInput + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { UpperBoundaryWaterLevels = (RoundedDouble)upperBoundaryWaterLevels }; @@ -525,7 +529,7 @@ public void LowerBoundaryWaterLevels_InvalidValueAccordingtoUpperBoundaryWaterLevels_ThrowsArgumentOutOfRangeException(double lowerBoundaryWaterLevels, double upperBoundaryWaterLevels) { // Setup - var input = new WaveConditionsInput + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { UpperBoundaryWaterLevels = (RoundedDouble)upperBoundaryWaterLevels }; @@ -544,7 +548,7 @@ public void LowerBoundaryWaterLevels_BoundarySmallerThanValid_SetValueToValidBoundary(double newValue) { // Setup - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); // Call input.LowerBoundaryWaterLevels = (RoundedDouble)newValue; @@ -557,7 +561,7 @@ public void UpperBoundaryWaterLevels_SetNewValue_ValueIsRounded() { // Setup - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); int originalNumberOfDecimalPlaces = input.UpperBoundaryWaterLevels.NumberOfDecimalPlaces; @@ -578,7 +582,7 @@ public void UpperBoundaryWaterLevels_ValidValueAccordingtoLowerBoundaryWaterLevels_ValueIsSet(double lowerBoundaryWaterLevels, double upperBoundaryWaterLevels) { // Setup - var input = new WaveConditionsInput + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { LowerBoundaryWaterLevels = (RoundedDouble)lowerBoundaryWaterLevels }; @@ -597,7 +601,7 @@ public void UpperBoundaryWaterLevels_InvalidValueAccordingtoLowerBoundaryWaterLevels_ThrowsArgumentOutOfRangeException(double lowerBoundaryWaterLevels, double upperBoundaryWaterLevels) { // Setup - var input = new WaveConditionsInput + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { LowerBoundaryRevetment = (RoundedDouble)lowerBoundaryWaterLevels }; @@ -616,7 +620,7 @@ public void UpperBoundaryWaterLevels_BoundaryLargerThanValid_SetValueToValidBoundary(double newValue) { // Setup - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); // Call input.UpperBoundaryWaterLevels = (RoundedDouble)newValue; @@ -632,7 +636,7 @@ public void WaterLevels_InvalidInput_NoWaterLevels(double lowerBoundaryRevetments, double upperBoundaryRevetments, double designWaterLevel) { // Setup - var input = new WaveConditionsInput + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { @@ -656,7 +660,7 @@ public void WaterLevels_AllBoundariesAboveUpperBoundaryDesignWaterLevel_NoWaterLevels() { // Setup - var input = new WaveConditionsInput + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { @@ -680,7 +684,7 @@ public void WaterLevels_HydraulicBoundaryLocationNull_NoWaterLevels() { // Setup - var input = new WaveConditionsInput + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { LowerBoundaryRevetment = (RoundedDouble)1.0, UpperBoundaryRevetment = (RoundedDouble)10.0, @@ -703,7 +707,7 @@ double designWaterLevel, IEnumerable expectedWaterLevels) { // Setup - var input = new WaveConditionsInput + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PresentationObjects/WaveConditionsInputContextTest.cs =================================================================== diff -u -rbfe0c885c674d20d6ed6fbfb95e9cdc484b4788c -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PresentationObjects/WaveConditionsInputContextTest.cs (.../WaveConditionsInputContextTest.cs) (revision bfe0c885c674d20d6ed6fbfb95e9cdc484b4788c) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PresentationObjects/WaveConditionsInputContextTest.cs (.../WaveConditionsInputContextTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -60,7 +60,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); // Call TestDelegate call = () => new WaveConditionsInputContext(input, null, assessmentSection); @@ -75,7 +75,7 @@ public void Constructor_AssessmentSectionNull_ThrowArgumentNullException() { // Setup - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); // Call TestDelegate call = () => new WaveConditionsInputContext(input, new ForeshoreProfile[0], null); @@ -103,7 +103,7 @@ assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase; mocks.ReplayAll(); - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); var foreshoreProfiles = new[] { Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputBreakWaterPropertiesTest.cs =================================================================== diff -u -rae93bd6b8ccbffa91f7c5c10e898736b5919b73d -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputBreakWaterPropertiesTest.cs (.../WaveConditionsInputBreakWaterPropertiesTest.cs) (revision ae93bd6b8ccbffa91f7c5c10e898736b5919b73d) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputBreakWaterPropertiesTest.cs (.../WaveConditionsInputBreakWaterPropertiesTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -53,7 +53,7 @@ public void Data_SetNewInputContextInstance_ReturnCorrectPropertyValues() { // Setup - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); var properties = new WaveConditionsInputBreakWaterProperties(); // Call @@ -75,7 +75,7 @@ observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties); mockRepository.ReplayAll(); - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); var properties = new WaveConditionsInputBreakWaterProperties { Data = input @@ -105,7 +105,7 @@ public void PropertyAttributes_SpecificForeshoreProfileAndUseBreakWaterState_ReturnExpectedValues(bool useBreakWaterState, bool useForeshoreProfile) { // Setup - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); BreakWater breakWater = null; if (useBreakWaterState) Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -rf3e0a05168328097121cfa8f9c4ff32d775879ff -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs (.../WaveConditionsInputContextPropertiesTest.cs) (revision f3e0a05168328097121cfa8f9c4ff32d775879ff) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs (.../WaveConditionsInputContextPropertiesTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -85,8 +85,8 @@ // Setup var assessmentSectionMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); - - var input = new WaveConditionsInput(); + + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); var inputContext = new WaveConditionsInputContext(input, new ForeshoreProfile[0], assessmentSectionMock); // Call @@ -116,7 +116,7 @@ Assert.AreEqual(0, properties.Orientation.Value); Assert.AreSame(input, properties.BreakWater.Data); Assert.AreSame(input, properties.ForeshoreGeometry.Data); - Assert.AreEqual("Steen (blokken en zuilen)", properties.RevetmentType); + Assert.AreEqual(input.RevetmentType, properties.RevetmentType); mockRepository.VerifyAll(); } @@ -155,7 +155,7 @@ { DesignWaterLevel = assessmentLevel }; - var input = new WaveConditionsInput + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { ForeshoreProfile = foreshoreProfile, HydraulicBoundaryLocation = hydraulicBoundaryLocation, @@ -213,8 +213,8 @@ { DesignWaterLevel = assessmentLevel }; - - var input = new WaveConditionsInput(); + + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); input.Attach(observerMock); var inputContext = new WaveConditionsInputContext(input, new ForeshoreProfile[0], assessmentSectionMock); @@ -267,8 +267,8 @@ // Setup var assessmentSectionMock = mockRepository.StrictMock(); mockRepository.ReplayAll(); - - var input = new WaveConditionsInput(); + + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); var foreshoreProfile = new ForeshoreProfile( new Point2D(0,0), Enumerable.Empty(), Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputForeshoreProfilePropertiesTest.cs =================================================================== diff -u -r679173a47bec16eebaf4be2ddedf42de87788456 -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputForeshoreProfilePropertiesTest.cs (.../WaveConditionsInputForeshoreProfilePropertiesTest.cs) (revision 679173a47bec16eebaf4be2ddedf42de87788456) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputForeshoreProfilePropertiesTest.cs (.../WaveConditionsInputForeshoreProfilePropertiesTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -55,7 +55,7 @@ public void Data_SetNewInputContextInstance_ReturnCorrectPropertyValues() { // Setup - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); var properties = new WaveConditionsInputForeshoreProfileProperties(); // Call @@ -70,7 +70,7 @@ public void Data_SetInputContextInstanceWithData_ReturnCorrectPropertyValues() { // Setup - var input = new WaveConditionsInput + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { ForeshoreProfile = new ForeshoreProfile(new Point2D(0, 0), new[] @@ -104,7 +104,7 @@ observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties); mockRepository.ReplayAll(); - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); var properties = new WaveConditionsInputForeshoreProfileProperties { Data = input @@ -127,7 +127,7 @@ public void PropertyAttributes_WithOrWithoutForeshoreProfileAndForelands_ReturnExpectedValues(bool withDikeProfile, int forlands, bool expectedCoordinatesPropertyReadOnly) { // Setup - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); if (withDikeProfile) { Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/UITypeEditors/WaveConditionsInputContextForeshoreProfileEditorTest.cs =================================================================== diff -u -rf3e0a05168328097121cfa8f9c4ff32d775879ff -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/UITypeEditors/WaveConditionsInputContextForeshoreProfileEditorTest.cs (.../WaveConditionsInputContextForeshoreProfileEditorTest.cs) (revision f3e0a05168328097121cfa8f9c4ff32d775879ff) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/UITypeEditors/WaveConditionsInputContextForeshoreProfileEditorTest.cs (.../WaveConditionsInputContextForeshoreProfileEditorTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -55,9 +55,9 @@ new ForeshoreProfile(new Point2D(0, 0), new Point2D[0], null, new ForeshoreProfile.ConstructionProperties()) }; - - var grassCoverErosionInwardsInput = new WaveConditionsInput(); + var grassCoverErosionInwardsInput = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var assessmentSectionMock = mockRepository.StrictMock(); var inputContext = new WaveConditionsInputContext(grassCoverErosionInwardsInput, foreshoreProfiles, @@ -96,7 +96,7 @@ // Setup var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0), new Point2D[0], null, new ForeshoreProfile.ConstructionProperties()); - var waveConditionsInput = new WaveConditionsInput + var waveConditionsInput = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { ForeshoreProfile = foreshoreProfile }; Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/UITypeEditors/WaveConditionsInputContextHydraulicBoundaryLocationEditorTest.cs =================================================================== diff -u -rf3e0a05168328097121cfa8f9c4ff32d775879ff -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/UITypeEditors/WaveConditionsInputContextHydraulicBoundaryLocationEditorTest.cs (.../WaveConditionsInputContextHydraulicBoundaryLocationEditorTest.cs) (revision f3e0a05168328097121cfa8f9c4ff32d775879ff) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/UITypeEditors/WaveConditionsInputContextHydraulicBoundaryLocationEditorTest.cs (.../WaveConditionsInputContextHydraulicBoundaryLocationEditorTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -53,7 +53,7 @@ var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); hydraulicBoundaryDatabase.Locations.Add(new TestHydraulicBoundaryLocation()); - var grassCoverErosionInwardsInput = new WaveConditionsInput(); + var grassCoverErosionInwardsInput = new WaveConditionsInput(WaveConditionsRevetment.Grass); var assessmentSectionMock = mockRepository.StrictMock(); assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase) @@ -97,7 +97,7 @@ var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation); - var waveConditionsInput = new WaveConditionsInput + var waveConditionsInput = new WaveConditionsInput(WaveConditionsRevetment.Grass) { HydraulicBoundaryLocation = hydraulicBoundaryLocation }; Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsFactoryTest.cs =================================================================== diff -u -r1afcd478d6992b815486c2697f3d5ce76c90b975 -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsFactoryTest.cs (.../ExportableWaveConditionsFactoryTest.cs) (revision 1afcd478d6992b815486c2697f3d5ce76c90b975) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsFactoryTest.cs (.../ExportableWaveConditionsFactoryTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -42,7 +42,7 @@ public void CreateExportableWaveConditionsCollectionFourParameters_NameNull_ThrowArgumentNullException() { // Call - TestDelegate call = () => ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection(null, new WaveConditionsInput(), waveConditionsOutputCollection, waveConditionsOutputCollection); + TestDelegate call = () => ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection(null, new WaveConditionsInput(WaveConditionsRevetment.StabilityStone), waveConditionsOutputCollection, waveConditionsOutputCollection); // Assert var exception = Assert.Throws(call); @@ -64,7 +64,7 @@ public void CreateExportableWaveConditionsCollectionFourParameters_ColumnsOutputNull_ThrowArgumentNullException() { // Call - TestDelegate call = () => ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection("aName", new WaveConditionsInput(), null, waveConditionsOutputCollection); + TestDelegate call = () => ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection("aName", new WaveConditionsInput(WaveConditionsRevetment.StabilityStone), null, waveConditionsOutputCollection); // Assert var exception = Assert.Throws(call); @@ -75,7 +75,7 @@ public void CreateExportableWaveConditionsCollectionFourParameters_BlocksOutputNull_ThrowArgumentNullException() { // Call - TestDelegate call = () => ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection("aName", new WaveConditionsInput(), waveConditionsOutputCollection, null); + TestDelegate call = () => ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection("aName", new WaveConditionsInput(WaveConditionsRevetment.StabilityStone), waveConditionsOutputCollection, null); // Assert var exception = Assert.Throws(call); @@ -87,7 +87,7 @@ { // Call IEnumerable exportableWaveConditionsCollection = - ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection("aName", new WaveConditionsInput(), + ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection("aName", new WaveConditionsInput(WaveConditionsRevetment.StabilityStone), Enumerable.Empty(), Enumerable.Empty()); @@ -101,7 +101,7 @@ // Call ExportableWaveConditions[] exportableWaveConditionsCollection = ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection("ewcName", - new WaveConditionsInput + new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "hblName", 1.0, 8.0), ForeshoreProfile = new ForeshoreProfile(new Point2D(8.7, 7.8), Enumerable.Empty(), null, new ForeshoreProfile.ConstructionProperties()), @@ -138,7 +138,7 @@ public void CreateExportableWaveConditionsCollectionThreeParameters_NameNull_ThrowArgumentNullException() { // Call - TestDelegate call = () => ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection(null, new WaveConditionsInput(), waveConditionsOutputCollection); + TestDelegate call = () => ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection(null, new WaveConditionsInput(WaveConditionsRevetment.StabilityStone), waveConditionsOutputCollection); // Assert var exception = Assert.Throws(call); @@ -160,7 +160,7 @@ public void CreateExportableWaveConditionsCollectionThreeParameters_OutputNull_ThrowArgumentNullException() { // Call - TestDelegate call = () => ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection("aName", new WaveConditionsInput(), null); + TestDelegate call = () => ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection("aName", new WaveConditionsInput(WaveConditionsRevetment.StabilityStone), null); // Assert var exception = Assert.Throws(call); @@ -172,7 +172,7 @@ { // Call IEnumerable exportableWaveConditionsCollection = - ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection("aName", new WaveConditionsInput(), Enumerable.Empty()); + ExportableWaveConditionsFactory.CreateExportableWaveConditionsCollection("aName", new WaveConditionsInput(WaveConditionsRevetment.StabilityStone), Enumerable.Empty()); // Assert Assert.IsEmpty(exportableWaveConditionsCollection); @@ -182,7 +182,7 @@ public void CreateExportableWaveConditionsCollectionThreeParameters_ValidData_ReturnsValidCollection() { // Setup - var waveConditionsInput = new WaveConditionsInput + var waveConditionsInput = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "hblName", 1.0, 8.0), ForeshoreProfile = new ForeshoreProfile(new Point2D(8.7, 7.8), Enumerable.Empty(), null, new ForeshoreProfile.ConstructionProperties()), Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsTest.cs (.../ExportableWaveConditionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsTest.cs (.../ExportableWaveConditionsTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -31,7 +31,7 @@ [TestFixture] public class ExportableWaveConditionsTest { - private readonly WaveConditionsInput waveConditionsInput = new WaveConditionsInput + private readonly WaveConditionsInput waveConditionsInput = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "hblName", 1.0, 8.0), ForeshoreProfile = new ForeshoreProfile(new Point2D(8.7, 7.8), new Point2D[0], null, new ForeshoreProfile.ConstructionProperties()), @@ -76,7 +76,7 @@ public void Constructor_WaveConditionsInputHydraulicBoundaryLocationNull_ThrowsArgumentException() { // Call - TestDelegate call = () => new ExportableWaveConditions("aName", new WaveConditionsInput(), waveConditionsOutput, CoverType.StoneCoverColumns); + TestDelegate call = () => new ExportableWaveConditions("aName", new WaveConditionsInput(WaveConditionsRevetment.StabilityStone), waveConditionsOutput, CoverType.StoneCoverColumns); // Assert var exception = Assert.Throws(call); @@ -90,7 +90,7 @@ // Call ExportableWaveConditions exportableWaveConditions = new ExportableWaveConditions("ewcName", - new WaveConditionsInput + new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "hblName", 1.0, 8.0) }, Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsExporterBaseTest.cs =================================================================== diff -u -r1d5ceacfda0640fe7527659cc57605d7f6fead0f -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsExporterBaseTest.cs (.../WaveConditionsExporterBaseTest.cs) (revision 1d5ceacfda0640fe7527659cc57605d7f6fead0f) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsExporterBaseTest.cs (.../WaveConditionsExporterBaseTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -118,7 +118,7 @@ // Setup ExportableWaveConditions[] exportableWaveConditions = { - new ExportableWaveConditions("blocksName", new WaveConditionsInput + new ExportableWaveConditions("blocksName", new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { @@ -130,7 +130,7 @@ LowerBoundaryWaterLevels = (RoundedDouble) 2.689, UpperBoundaryWaterLevels = (RoundedDouble) 77.8249863247 }, new WaveConditionsOutput(1.11111, 2.22222, 3.33333, 4.44444), CoverType.StoneCoverBlocks), - new ExportableWaveConditions("columnsName", new WaveConditionsInput + new ExportableWaveConditions("columnsName", new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456) { Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsWriterTest.cs =================================================================== diff -u -r1d5ceacfda0640fe7527659cc57605d7f6fead0f -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsWriterTest.cs (.../WaveConditionsWriterTest.cs) (revision 1d5ceacfda0640fe7527659cc57605d7f6fead0f) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsWriterTest.cs (.../WaveConditionsWriterTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -76,7 +76,7 @@ // Setup ExportableWaveConditions[] exportableWaveConditions = { - new ExportableWaveConditions("blocksName", new WaveConditionsInput + new ExportableWaveConditions("blocksName", new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { @@ -88,7 +88,7 @@ LowerBoundaryWaterLevels = (RoundedDouble) 2.689, UpperBoundaryWaterLevels = (RoundedDouble) 77.8249863247 }, new WaveConditionsOutput(1.11111, 2.22222, 3.33333, 4.44444), CoverType.StoneCoverBlocks), - new ExportableWaveConditions("columnsName", new WaveConditionsInput + new ExportableWaveConditions("columnsName", new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456) { Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r8a04b4a13dcd6b3a78888b0305e239b2978c5dae -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceTest.cs (.../WaveConditionsCalculationServiceTest.cs) (revision 8a04b4a13dcd6b3a78888b0305e239b2978c5dae) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceTest.cs (.../WaveConditionsCalculationServiceTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -106,7 +106,7 @@ FilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite") }; - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); // Call Action action = () => isValid = WaveConditionsCalculationService.Instance.Validate(input, database, name); @@ -136,7 +136,7 @@ FilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite") }; - var input = new WaveConditionsInput() + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) }; @@ -171,7 +171,7 @@ FilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite") }; - var input = new WaveConditionsInput + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { @@ -223,7 +223,7 @@ new BreakWater(BreakWaterType.Dam, breakWaterHeight), new ForeshoreProfile.ConstructionProperties()); - var input = new WaveConditionsInput + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { @@ -276,7 +276,7 @@ new BreakWater(BreakWaterType.Dam, breakWaterHeight), new ForeshoreProfile.ConstructionProperties()); - var input = new WaveConditionsInput + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { @@ -318,7 +318,7 @@ FilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite") }; - var input = new WaveConditionsInput + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { @@ -367,7 +367,7 @@ new BreakWater(BreakWaterType.Dam, 10.0), new ForeshoreProfile.ConstructionProperties()); - var input = new WaveConditionsInput + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { @@ -417,7 +417,7 @@ null, new ForeshoreProfile.ConstructionProperties()); - var input = new WaveConditionsInput + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { @@ -458,7 +458,7 @@ double b = 0.8; double c = 0.4; int norm = 5; - var input = new WaveConditionsInput + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0), ForeshoreProfile = CreateForeshoreProfile(), @@ -498,7 +498,7 @@ double b = 0.8; double c = 0.4; int norm = 5; - var input = new WaveConditionsInput + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0), ForeshoreProfile = CreateForeshoreProfile() Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil.Test/TestWaveConditionsCalculationServiceInputTest.cs =================================================================== diff -u -r7ac7d2230eac8ce6eb3233596157002c9cb7bc19 -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil.Test/TestWaveConditionsCalculationServiceInputTest.cs (.../TestWaveConditionsCalculationServiceInputTest.cs) (revision 7ac7d2230eac8ce6eb3233596157002c9cb7bc19) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil.Test/TestWaveConditionsCalculationServiceInputTest.cs (.../TestWaveConditionsCalculationServiceInputTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -37,7 +37,7 @@ const double b = 0.3; const double c = 0.8; const int norm = 5; - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); const string hlcdDirectory = "C:/temp"; const string ringId = "11-1"; const string name = "test"; Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil.Test/TestWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r3a89e41054c6cfe6babdc150e8282cbe4a6dc672 -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil.Test/TestWaveConditionsCalculationServiceTest.cs (.../TestWaveConditionsCalculationServiceTest.cs) (revision 3a89e41054c6cfe6babdc150e8282cbe4a6dc672) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil.Test/TestWaveConditionsCalculationServiceTest.cs (.../TestWaveConditionsCalculationServiceTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -66,7 +66,7 @@ double.NaN, double.NaN, 0, - new WaveConditionsInput(), + new WaveConditionsInput(WaveConditionsRevetment.StabilityStone), string.Empty, string.Empty, string.Empty); @@ -87,7 +87,7 @@ const double b = 0.3; const double c = 0.8; const int norm = 5; - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); const string hlcdDirectory = "C:/temp"; const string ringId = "11-1"; const string name = "test"; Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverWaveConditionsCalculation.cs =================================================================== diff -u -rf4c9e0545d96afcd7738cc9493dfa57222baab44 -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverWaveConditionsCalculation.cs (.../StabilityStoneCoverWaveConditionsCalculation.cs) (revision f4c9e0545d96afcd7738cc9493dfa57222baab44) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverWaveConditionsCalculation.cs (.../StabilityStoneCoverWaveConditionsCalculation.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -37,7 +37,7 @@ public StabilityStoneCoverWaveConditionsCalculation() { Name = Resources.StabilityStoneCoverWaveConditionsCalculation_DefaultName; - InputParameters = new WaveConditionsInput(); + InputParameters = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); } /// Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs =================================================================== diff -u -r859df1c0fea027dccd923d241240aad9f50f55c8 -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs (.../StabilityStoneCoverFailureMechanismTest.cs) (revision 859df1c0fea027dccd923d241240aad9f50f55c8) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverFailureMechanismTest.cs (.../StabilityStoneCoverFailureMechanismTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -28,6 +28,7 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Revetment.Data; namespace Ringtoets.StabilityStoneCover.Data.Test { Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsCalculationTest.cs =================================================================== diff -u -r275811c8e133cba03f636224f40a9536a733fb1f -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsCalculationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationTest.cs) (revision 275811c8e133cba03f636224f40a9536a733fb1f) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsCalculationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -47,6 +47,7 @@ Assert.IsNull(calculation.Comments); Assert.IsNull(calculation.Output); Assert.IsNull(calculation.InputParameters.ForeshoreProfile); + Assert.AreEqual(WaveConditionsRevetment.StabilityStone, calculation.InputParameters.RevetmentType); } [Test] Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/WaveConditionsInputContextTreeNodeInfoTest.cs =================================================================== diff -u -rbebc81db833730a3ea2e3b74f312e429552e99db -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/WaveConditionsInputContextTreeNodeInfoTest.cs (.../WaveConditionsInputContextTreeNodeInfoTest.cs) (revision bebc81db833730a3ea2e3b74f312e429552e99db) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/WaveConditionsInputContextTreeNodeInfoTest.cs (.../WaveConditionsInputContextTreeNodeInfoTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -80,7 +80,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); var context = new WaveConditionsInputContext(input, new ForeshoreProfile[0], assessmentSection); @@ -104,7 +104,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); var context = new WaveConditionsInputContext(input, new ForeshoreProfile[0], assessmentSection); @@ -127,7 +127,7 @@ { var assessmentSection = mocks.Stub(); - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); var context = new WaveConditionsInputContext(input, new ForeshoreProfile[0], assessmentSection); Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverWaveConditionsCalculation.cs =================================================================== diff -u -ra481b019d025f649cd52d4714aebcf7d323d0ecb -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverWaveConditionsCalculation.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculation.cs) (revision a481b019d025f649cd52d4714aebcf7d323d0ecb) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverWaveConditionsCalculation.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculation.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -37,7 +37,7 @@ public WaveImpactAsphaltCoverWaveConditionsCalculation() { Name = Resources.WaveImpactAsphaltCoverWaveConditionsCalculation_DefaultName; - InputParameters = new WaveConditionsInput(); + InputParameters = new WaveConditionsInput(WaveConditionsRevetment.Asphalt); } /// Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs =================================================================== diff -u -ra481b019d025f649cd52d4714aebcf7d323d0ecb -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs) (revision a481b019d025f649cd52d4714aebcf7d323d0ecb) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -47,6 +47,7 @@ Assert.IsNull(calculation.Comments); Assert.IsNull(calculation.Output); Assert.IsNull(calculation.InputParameters.ForeshoreProfile); + Assert.AreEqual(WaveConditionsRevetment.Asphalt, calculation.InputParameters.RevetmentType); } [Test] Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationInputContextTreeNodeInfoTest.cs =================================================================== diff -u -r0d7efa62d16c64a925c63172e4d1bf1a4e0bf94f -r50fc099174271a6f72ed94a8f024cd5377b37a53 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationInputContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationInputContextTreeNodeInfoTest.cs) (revision 0d7efa62d16c64a925c63172e4d1bf1a4e0bf94f) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationInputContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationInputContextTreeNodeInfoTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) @@ -81,7 +81,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.Asphalt); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var context = new WaveImpactAsphaltCoverWaveConditionsCalculationInputContext(input, failureMechanism, @@ -106,7 +106,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.Asphalt); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var context = new WaveImpactAsphaltCoverWaveConditionsCalculationInputContext(input, failureMechanism, @@ -131,7 +131,7 @@ { var assessmentSection = mocks.Stub(); - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput(WaveConditionsRevetment.Asphalt); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var context = new WaveImpactAsphaltCoverWaveConditionsCalculationInputContext(input, failureMechanism,