Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsCalculation.cs =================================================================== diff -u -r50fc099174271a6f72ed94a8f024cd5377b37a53 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsCalculation.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculation.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsCalculation.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculation.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -37,7 +37,7 @@ public GrassCoverErosionOutwardsWaveConditionsCalculation() { Name = Resources.GrassCoverErosionOutwardsWaveConditionsCalculation_DefaultName; - InputParameters = new WaveConditionsInput(WaveConditionsRevetment.Grass); + InputParameters = new WaveConditionsInput(); } /// Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs =================================================================== diff -u -r50fc099174271a6f72ed94a8f024cd5377b37a53 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -47,7 +47,6 @@ 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/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs =================================================================== diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -50,7 +50,7 @@ failureMechanism.ForeshoreProfiles.Add(foreshoreProfile); failureMechanism.HydraulicBoundaryLocations.Add(hydraulicBoundaryLocation); - var input = new WaveConditionsInput(WaveConditionsRevetment.Grass); + var input = new WaveConditionsInput(); // Call var context = new GrassCoverErosionOutwardsWaveConditionsInputContext(input, failureMechanism); @@ -80,7 +80,7 @@ public void Constructor_FailureMechanismNull_ThrowsArgumentNullException() { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.Grass); + var input = new WaveConditionsInput(); // Call TestDelegate test = () => new GrassCoverErosionOutwardsWaveConditionsInputContext(input, null); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -76,7 +76,7 @@ public void Data_SetDefaultInputContextInstance_ReturnCorrectPropertyValues() { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.Grass); + var input = new WaveConditionsInput(); var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); var inputContext = new GrassCoverErosionOutwardsWaveConditionsInputContext(input, failureMechanism); @@ -141,7 +141,7 @@ { DesignWaterLevel = assessmentLevel }; - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + var input = new WaveConditionsInput() { ForeshoreProfile = foreshoreProfile, HydraulicBoundaryLocation = hydraulicBoundaryLocation, @@ -201,7 +201,7 @@ DesignWaterLevel = assessmentLevel }; - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); input.Attach(observerMock); var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); @@ -255,7 +255,7 @@ [Values(true, false)] bool withForeshoreProfile) { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); var foreshoreProfile = new ForeshoreProfile( new Point2D(0, 0), Enumerable.Empty(), Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsInputContextTreeNodeInfoTest.cs =================================================================== diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsInputContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextTreeNodeInfoTest.cs) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsInputContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextTreeNodeInfoTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -70,7 +70,7 @@ // Setup var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - var input = new WaveConditionsInput(WaveConditionsRevetment.Grass); + var input = new WaveConditionsInput(); var context = new GrassCoverErosionOutwardsWaveConditionsInputContext(input, failureMechanism); using (var plugin = new GrassCoverErosionOutwardsPlugin()) @@ -91,7 +91,7 @@ // Setup var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - var input = new WaveConditionsInput(WaveConditionsRevetment.Grass); + var input = new WaveConditionsInput(); var context = new GrassCoverErosionOutwardsWaveConditionsInputContext(input, failureMechanism); using (var plugin = new GrassCoverErosionOutwardsPlugin()) @@ -114,7 +114,7 @@ { var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - var input = new WaveConditionsInput(WaveConditionsRevetment.Grass); + var input = new WaveConditionsInput(); var context = new GrassCoverErosionOutwardsWaveConditionsInputContext(input, failureMechanism); var menuBuilder = mocks.StrictMock(); Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Ringtoets.Revetment.Data.csproj =================================================================== diff -u -r50fc099174271a6f72ed94a8f024cd5377b37a53 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Ringtoets.Revetment.Data.csproj (.../Ringtoets.Revetment.Data.csproj) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Ringtoets.Revetment.Data.csproj (.../Ringtoets.Revetment.Data.csproj) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -50,7 +50,6 @@ - Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs =================================================================== diff -u -r50fc099174271a6f72ed94a8f024cd5377b37a53 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs (.../WaveConditionsInput.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs (.../WaveConditionsInput.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -49,9 +49,8 @@ /// /// Creates a new instance of . /// - public WaveConditionsInput(WaveConditionsRevetment revetmentType) + public WaveConditionsInput() { - RevetmentType = revetmentType; orientation = new RoundedDouble(2); upperBoundaryRevetment = new RoundedDouble(2, double.NaN); @@ -64,11 +63,6 @@ } /// - /// 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; } Fisheye: Tag f53b435bc3cb5fb70ffac3844ae56e90373cf4d3 refers to a dead (removed) revision in file `Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsRevetment.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs =================================================================== diff -u -r50fc099174271a6f72ed94a8f024cd5377b37a53 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs (.../WaveConditionsInputTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs (.../WaveConditionsInputTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -101,16 +101,12 @@ [Test] public void Constructor_ExpectedValues() { - // Setup - const WaveConditionsRevetment revetmentType = WaveConditionsRevetment.StabilityStone; - // Call - var input = new WaveConditionsInput(revetmentType); + var input = new WaveConditionsInput(); // Assert Assert.IsInstanceOf(input); Assert.IsInstanceOf(input); - Assert.AreEqual(revetmentType, input.RevetmentType); Assert.IsNull(input.HydraulicBoundaryLocation); Assert.IsNull(input.ForeshoreProfile); Assert.IsFalse(input.UseBreakWater); @@ -140,7 +136,7 @@ public void HydraulicBoundaryLocation_SetNewValue_AssessmentLevelAndUpperBoundaryDesignWaterLevelExpectedValue() { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); const double assessmentLevel = 3.2; // Call @@ -158,7 +154,7 @@ public void HydraulicBoundaryLocation_SetNullValue_AssessmentLevelAndUpperBoundaryDesignWaterLevelNaN() { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + var input = new WaveConditionsInput() { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "", 0, 0) { @@ -181,7 +177,7 @@ [Values(true, false)] bool withValidForeshore) { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); BreakWaterType originalBreakWaterType = input.BreakWater.Type; RoundedDouble originalBreakWaterHeight = input.BreakWater.Height; HydraulicBoundaryLocation originalHydraulicBoundaryLocation = input.HydraulicBoundaryLocation; @@ -237,7 +233,7 @@ public void Foreshore_SetNullValue_InputSyncedToDefaults() { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); BreakWaterType originalBreakWaterType = input.BreakWater.Type; RoundedDouble originalBreakWaterHeight = input.BreakWater.Height; HydraulicBoundaryLocation originalHydraulicBoundaryLocation = input.HydraulicBoundaryLocation; @@ -289,7 +285,7 @@ public void Orientation_ValidValues_NewValueSet(double orientation) { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); // Call input.Orientation = (RoundedDouble)orientation; @@ -302,7 +298,7 @@ public void UpperBoundaryDesignWaterLevel_NoHydraulicBoundaryLocation_ReturnNaN() { // Setup - var waveConditionsInput = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var waveConditionsInput = new WaveConditionsInput(); // Call waveConditionsInput.HydraulicBoundaryLocation = null; @@ -315,7 +311,7 @@ public void UpperBoundaryDesignWaterLevel_NoDesignWaterLevel_ReturnNaN() { // Setup - var waveConditionsInput = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var waveConditionsInput = new WaveConditionsInput(); // Call waveConditionsInput.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "", 0, 0); @@ -329,7 +325,7 @@ { // Setup var designWaterLevel = (RoundedDouble)1.0; - var waveConditionsInput = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var waveConditionsInput = new WaveConditionsInput(); // Call waveConditionsInput.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "", 0, 0) @@ -345,7 +341,7 @@ public void LowerBoundaryRevetment_SetNewValue_ValueIsRounded() { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); int originalNumberOfDecimalPlaces = input.LowerBoundaryRevetment.NumberOfDecimalPlaces; @@ -366,7 +362,7 @@ public void LowerBoundaryRevetment_ValidValueAccordingtoUpperBoundaryRevetment_ValueIsSet(double lowerBoundaryRevetment, double upperBoundaryRevetment) { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + var input = new WaveConditionsInput() { UpperBoundaryRevetment = (RoundedDouble)upperBoundaryRevetment }; @@ -385,7 +381,7 @@ public void LowerBoundaryRevetment_InvalidValueAccordingtoUpperBoundaryRevetment_ThrowsArgumentOutOfRangeException(double lowerBoundaryRevetment, double upperBoundaryRevetment) { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + var input = new WaveConditionsInput() { UpperBoundaryRevetment = (RoundedDouble)upperBoundaryRevetment }; @@ -404,7 +400,7 @@ public void LowerBoundaryRevetment_BoundarySmallerThanValid_SetValueToValidBoundary(double newValue) { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); // Call input.LowerBoundaryRevetment = (RoundedDouble) newValue; @@ -417,7 +413,7 @@ public void UpperBoundaryRevetment_SetNewValue_ValueIsRounded() { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); int originalNumberOfDecimalPlaces = input.UpperBoundaryRevetment.NumberOfDecimalPlaces; @@ -438,7 +434,7 @@ public void UpperBoundaryRevetment_ValidValueAccordingtoLowerBoundaryRevetment_ValueIsSet(double lowerBoundaryRevetment, double upperBoundaryRevetment) { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + var input = new WaveConditionsInput() { LowerBoundaryRevetment = (RoundedDouble)lowerBoundaryRevetment }; @@ -457,7 +453,7 @@ public void UpperBoundaryRevetment_InvalidValueAccordingtoLowerBoundaryRevetment_ThrowsArgumentOutOfRangeException(double lowerBoundaryRevetment, double upperBoundaryRevetment) { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + var input = new WaveConditionsInput() { LowerBoundaryRevetment = (RoundedDouble)lowerBoundaryRevetment }; @@ -476,7 +472,7 @@ public void UpperBoundaryRevetment_BoundaryLargerThanValid_SetValueToValidBoundary(double newValue) { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); // Call input.UpperBoundaryRevetment = (RoundedDouble)newValue; @@ -489,7 +485,7 @@ public void LowerBoundaryWaterLevels_SetNewValue_ValueIsRounded() { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); int originalNumberOfDecimalPlaces = input.LowerBoundaryWaterLevels.NumberOfDecimalPlaces; @@ -510,7 +506,7 @@ public void LowerBoundaryWaterLevels_ValidValueAccordingtoUpperBoundaryWaterLevels_ValueIsSet(double lowerBoundaryWaterLevels, double upperBoundaryWaterLevels) { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + var input = new WaveConditionsInput() { UpperBoundaryWaterLevels = (RoundedDouble)upperBoundaryWaterLevels }; @@ -529,7 +525,7 @@ public void LowerBoundaryWaterLevels_InvalidValueAccordingtoUpperBoundaryWaterLevels_ThrowsArgumentOutOfRangeException(double lowerBoundaryWaterLevels, double upperBoundaryWaterLevels) { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + var input = new WaveConditionsInput() { UpperBoundaryWaterLevels = (RoundedDouble)upperBoundaryWaterLevels }; @@ -548,7 +544,7 @@ public void LowerBoundaryWaterLevels_BoundarySmallerThanValid_SetValueToValidBoundary(double newValue) { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); // Call input.LowerBoundaryWaterLevels = (RoundedDouble)newValue; @@ -561,7 +557,7 @@ public void UpperBoundaryWaterLevels_SetNewValue_ValueIsRounded() { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); int originalNumberOfDecimalPlaces = input.UpperBoundaryWaterLevels.NumberOfDecimalPlaces; @@ -582,7 +578,7 @@ public void UpperBoundaryWaterLevels_ValidValueAccordingtoLowerBoundaryWaterLevels_ValueIsSet(double lowerBoundaryWaterLevels, double upperBoundaryWaterLevels) { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + var input = new WaveConditionsInput() { LowerBoundaryWaterLevels = (RoundedDouble)lowerBoundaryWaterLevels }; @@ -601,7 +597,7 @@ public void UpperBoundaryWaterLevels_InvalidValueAccordingtoLowerBoundaryWaterLevels_ThrowsArgumentOutOfRangeException(double lowerBoundaryWaterLevels, double upperBoundaryWaterLevels) { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + var input = new WaveConditionsInput() { LowerBoundaryRevetment = (RoundedDouble)lowerBoundaryWaterLevels }; @@ -620,7 +616,7 @@ public void UpperBoundaryWaterLevels_BoundaryLargerThanValid_SetValueToValidBoundary(double newValue) { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); // Call input.UpperBoundaryWaterLevels = (RoundedDouble)newValue; @@ -636,7 +632,7 @@ public void WaterLevels_InvalidInput_NoWaterLevels(double lowerBoundaryRevetments, double upperBoundaryRevetments, double designWaterLevel) { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + var input = new WaveConditionsInput() { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { @@ -660,7 +656,7 @@ public void WaterLevels_AllBoundariesAboveUpperBoundaryDesignWaterLevel_NoWaterLevels() { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + var input = new WaveConditionsInput() { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { @@ -684,7 +680,7 @@ public void WaterLevels_HydraulicBoundaryLocationNull_NoWaterLevels() { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + var input = new WaveConditionsInput() { LowerBoundaryRevetment = (RoundedDouble)1.0, UpperBoundaryRevetment = (RoundedDouble)10.0, @@ -707,7 +703,7 @@ double designWaterLevel, IEnumerable expectedWaterLevels) { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + var input = new WaveConditionsInput() { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PresentationObjects/WaveConditionsInputContextTest.cs =================================================================== diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PresentationObjects/WaveConditionsInputContextTest.cs (.../WaveConditionsInputContextTest.cs) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PresentationObjects/WaveConditionsInputContextTest.cs (.../WaveConditionsInputContextTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -48,7 +48,7 @@ public void Constructor_ExpectedValues() { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); // Call var context = new TestWaveConditionsInputContext(input); Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputBreakWaterPropertiesTest.cs =================================================================== diff -u -r50fc099174271a6f72ed94a8f024cd5377b37a53 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputBreakWaterPropertiesTest.cs (.../WaveConditionsInputBreakWaterPropertiesTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputBreakWaterPropertiesTest.cs (.../WaveConditionsInputBreakWaterPropertiesTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -53,7 +53,7 @@ public void Data_SetNewInputContextInstance_ReturnCorrectPropertyValues() { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); var properties = new WaveConditionsInputBreakWaterProperties(); // Call @@ -75,7 +75,7 @@ observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties); mockRepository.ReplayAll(); - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); var properties = new WaveConditionsInputBreakWaterProperties { Data = input @@ -105,7 +105,7 @@ public void PropertyAttributes_SpecificForeshoreProfileAndUseBreakWaterState_ReturnExpectedValues(bool useBreakWaterState, bool useForeshoreProfile) { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); BreakWater breakWater = null; if (useBreakWaterState) Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs (.../WaveConditionsInputContextPropertiesTest.cs) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs (.../WaveConditionsInputContextPropertiesTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -76,7 +76,7 @@ public void Data_SetDefaultInputContextInstance_ReturnCorrectPropertyValues() { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); var inputContext = new TestWaveConditionsInputContext(input, new ForeshoreProfile[0], new HydraulicBoundaryLocation[0]); // Call @@ -140,7 +140,7 @@ { DesignWaterLevel = assessmentLevel }; - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + var input = new WaveConditionsInput() { ForeshoreProfile = foreshoreProfile, HydraulicBoundaryLocation = hydraulicBoundaryLocation, @@ -201,7 +201,7 @@ DesignWaterLevel = assessmentLevel }; - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); input.Attach(observerMock); var inputContext = new TestWaveConditionsInputContext(input, new ForeshoreProfile[0], new HydraulicBoundaryLocation[0]); @@ -252,7 +252,7 @@ [Values(true, false)] bool withForeshoreProfile) { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); var foreshoreProfile = new ForeshoreProfile( new Point2D(0, 0), Enumerable.Empty(), Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputForeshoreProfilePropertiesTest.cs =================================================================== diff -u -r50fc099174271a6f72ed94a8f024cd5377b37a53 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputForeshoreProfilePropertiesTest.cs (.../WaveConditionsInputForeshoreProfilePropertiesTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputForeshoreProfilePropertiesTest.cs (.../WaveConditionsInputForeshoreProfilePropertiesTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -55,7 +55,7 @@ public void Data_SetNewInputContextInstance_ReturnCorrectPropertyValues() { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); var properties = new WaveConditionsInputForeshoreProfileProperties(); // Call @@ -70,7 +70,7 @@ public void Data_SetInputContextInstanceWithData_ReturnCorrectPropertyValues() { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + var input = new WaveConditionsInput() { 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(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); 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(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); if (withDikeProfile) { Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/UITypeEditors/WaveConditionsInputContextForeshoreProfileEditorTest.cs =================================================================== diff -u -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/UITypeEditors/WaveConditionsInputContextForeshoreProfileEditorTest.cs (.../WaveConditionsInputContextForeshoreProfileEditorTest.cs) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/UITypeEditors/WaveConditionsInputContextForeshoreProfileEditorTest.cs (.../WaveConditionsInputContextForeshoreProfileEditorTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -58,7 +58,7 @@ null, new ForeshoreProfile.ConstructionProperties()) }; - var grassCoverErosionInwardsInput = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var grassCoverErosionInwardsInput = new WaveConditionsInput(); var inputContext = new TestWaveConditionsInputContext(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(WaveConditionsRevetment.StabilityStone) + var waveConditionsInput = new WaveConditionsInput() { ForeshoreProfile = foreshoreProfile }; Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/UITypeEditors/WaveConditionsInputContextHydraulicBoundaryLocationEditorTest.cs =================================================================== diff -u -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/UITypeEditors/WaveConditionsInputContextHydraulicBoundaryLocationEditorTest.cs (.../WaveConditionsInputContextHydraulicBoundaryLocationEditorTest.cs) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/UITypeEditors/WaveConditionsInputContextHydraulicBoundaryLocationEditorTest.cs (.../WaveConditionsInputContextHydraulicBoundaryLocationEditorTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -50,7 +50,7 @@ public void EditValue_NoCurrentItemInAvailableItems_ReturnsOriginalValue() { // Setup - var grassCoverErosionInwardsInput = new WaveConditionsInput(WaveConditionsRevetment.Grass); + var grassCoverErosionInwardsInput = new WaveConditionsInput(); var inputContext = new TestWaveConditionsInputContext(grassCoverErosionInwardsInput, new[] @@ -90,7 +90,7 @@ // Setup var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - var waveConditionsInput = new WaveConditionsInput(WaveConditionsRevetment.Grass) + var waveConditionsInput = new WaveConditionsInput() { HydraulicBoundaryLocation = hydraulicBoundaryLocation }; Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsFactoryTest.cs =================================================================== diff -u -rf6010c4c780d043ec6de4465e7a3858b5f9ebb94 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsFactoryTest.cs (.../ExportableWaveConditionsFactoryTest.cs) (revision f6010c4c780d043ec6de4465e7a3858b5f9ebb94) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsFactoryTest.cs (.../ExportableWaveConditionsFactoryTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -38,8 +38,8 @@ new WaveConditionsOutput(0.0, 1.1, 2.2, 3.3) }; - private readonly WaveConditionsInput emptyWaveConditionsInput = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); - private readonly WaveConditionsInput waveConditionsInputWithAsphalt = new WaveConditionsInput(WaveConditionsRevetment.Asphalt); + private readonly WaveConditionsInput emptyWaveConditionsInput = new WaveConditionsInput(); + private readonly WaveConditionsInput waveConditionsInputWithAsphalt = new WaveConditionsInput(); [Test] public void CreateExportableWaveConditionsCollection_NameNull_ThrowArgumentNullException() @@ -115,7 +115,7 @@ public void CreateExportableWaveConditionsCollection_ValidData_ReturnsValidCollection() { // Setup - var waveConditionsInput = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + var waveConditionsInput = new WaveConditionsInput() { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "hblName", 1.0, 8.0), ForeshoreProfile = new ForeshoreProfile(new Point2D(8.7, 7.8), Enumerable.Empty(), null, new ForeshoreProfile.ConstructionProperties()), @@ -213,7 +213,7 @@ public void CreateExportableWaveConditionsCollection_ValidDataWithCoverType_ReturnsValidCollection() { // Setup - var waveConditionsInput = new WaveConditionsInput(WaveConditionsRevetment.Grass) + var waveConditionsInput = new WaveConditionsInput() { 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 -r50fc099174271a6f72ed94a8f024cd5377b37a53 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsTest.cs (.../ExportableWaveConditionsTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsTest.cs (.../ExportableWaveConditionsTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -31,7 +31,7 @@ [TestFixture] public class ExportableWaveConditionsTest { - private readonly WaveConditionsInput waveConditionsInput = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + private readonly WaveConditionsInput waveConditionsInput = new WaveConditionsInput() { 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(WaveConditionsRevetment.StabilityStone), waveConditionsOutput, CoverType.StoneCoverColumns); + TestDelegate call = () => new ExportableWaveConditions("aName", new WaveConditionsInput(), waveConditionsOutput, CoverType.StoneCoverColumns); // Assert var exception = Assert.Throws(call); @@ -90,7 +90,7 @@ // Call ExportableWaveConditions exportableWaveConditions = new ExportableWaveConditions("ewcName", - new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + new WaveConditionsInput() { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "hblName", 1.0, 8.0) }, Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsExporterBaseTest.cs =================================================================== diff -u -r50fc099174271a6f72ed94a8f024cd5377b37a53 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsExporterBaseTest.cs (.../WaveConditionsExporterBaseTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsExporterBaseTest.cs (.../WaveConditionsExporterBaseTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -118,7 +118,7 @@ // Setup ExportableWaveConditions[] exportableWaveConditions = { - new ExportableWaveConditions("blocksName", new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + new ExportableWaveConditions("blocksName", new WaveConditionsInput() { 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(WaveConditionsRevetment.StabilityStone) + new ExportableWaveConditions("columnsName", new WaveConditionsInput() { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456) { Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsWriterTest.cs =================================================================== diff -u -rf6010c4c780d043ec6de4465e7a3858b5f9ebb94 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsWriterTest.cs (.../WaveConditionsWriterTest.cs) (revision f6010c4c780d043ec6de4465e7a3858b5f9ebb94) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsWriterTest.cs (.../WaveConditionsWriterTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -77,7 +77,7 @@ // Setup ExportableWaveConditions[] exportableWaveConditions = { - new ExportableWaveConditions("blocksName", new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + new ExportableWaveConditions("blocksName", new WaveConditionsInput() { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { @@ -89,7 +89,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(WaveConditionsRevetment.StabilityStone) + new ExportableWaveConditions("columnsName", new WaveConditionsInput() { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456) { Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r4438e5f52238284921d2f6505b424804ee2e458c -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceTest.cs (.../WaveConditionsCalculationServiceTest.cs) (revision 4438e5f52238284921d2f6505b424804ee2e458c) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceTest.cs (.../WaveConditionsCalculationServiceTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -106,7 +106,7 @@ FilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite") }; - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); // 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(WaveConditionsRevetment.StabilityStone) + var input = new WaveConditionsInput() { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) }; @@ -171,7 +171,7 @@ FilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite") }; - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + var input = new WaveConditionsInput() { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { @@ -328,7 +328,7 @@ double b = 0.8; double c = 0.4; int norm = 5; - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + var input = new WaveConditionsInput() { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0), ForeshoreProfile = CreateForeshoreProfile(), @@ -368,7 +368,7 @@ double b = 0.8; double c = 0.4; int norm = 5; - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + var input = new WaveConditionsInput() { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0), ForeshoreProfile = CreateForeshoreProfile() @@ -402,7 +402,7 @@ private static WaveConditionsInput GetDefaultValidationInput() { - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + var input = new WaveConditionsInput() { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil.Test/TestWaveConditionsCalculationServiceInputTest.cs =================================================================== diff -u -r50fc099174271a6f72ed94a8f024cd5377b37a53 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil.Test/TestWaveConditionsCalculationServiceInputTest.cs (.../TestWaveConditionsCalculationServiceInputTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil.Test/TestWaveConditionsCalculationServiceInputTest.cs (.../TestWaveConditionsCalculationServiceInputTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -37,7 +37,7 @@ const double b = 0.3; const double c = 0.8; const int norm = 5; - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); 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 -r50fc099174271a6f72ed94a8f024cd5377b37a53 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil.Test/TestWaveConditionsCalculationServiceTest.cs (.../TestWaveConditionsCalculationServiceTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil.Test/TestWaveConditionsCalculationServiceTest.cs (.../TestWaveConditionsCalculationServiceTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -66,7 +66,7 @@ double.NaN, double.NaN, 0, - new WaveConditionsInput(WaveConditionsRevetment.StabilityStone), + new WaveConditionsInput(), 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(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); 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 -r50fc099174271a6f72ed94a8f024cd5377b37a53 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverWaveConditionsCalculation.cs (.../StabilityStoneCoverWaveConditionsCalculation.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverWaveConditionsCalculation.cs (.../StabilityStoneCoverWaveConditionsCalculation.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -37,7 +37,7 @@ public StabilityStoneCoverWaveConditionsCalculation() { Name = Resources.StabilityStoneCoverWaveConditionsCalculation_DefaultName; - InputParameters = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + InputParameters = new WaveConditionsInput(); } /// Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsCalculationTest.cs =================================================================== diff -u -r50fc099174271a6f72ed94a8f024cd5377b37a53 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsCalculationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsCalculationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -47,7 +47,6 @@ 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/PresentationObjects/StabilityStoneCoverWaveConditionsInputContextTest.cs =================================================================== diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverWaveConditionsInputContextTest.cs (.../StabilityStoneCoverWaveConditionsInputContextTest.cs) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverWaveConditionsInputContextTest.cs (.../StabilityStoneCoverWaveConditionsInputContextTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -67,7 +67,7 @@ } }; - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); // Call var context = new StabilityStoneCoverWaveConditionsInputContext(input, @@ -111,7 +111,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); // Call TestDelegate test = () => new StabilityStoneCoverWaveConditionsInputContext(input, @@ -128,7 +128,7 @@ public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException() { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); var failureMechanism = new StabilityStoneCoverFailureMechanism(); // Call @@ -149,7 +149,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); var failureMechanism = new StabilityStoneCoverFailureMechanism(); var context = new StabilityStoneCoverWaveConditionsInputContext(input, failureMechanism.ForeshoreProfiles, assessmentSection); Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs (.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs (.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -81,7 +81,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); var failureMechanism = new StabilityStoneCoverFailureMechanism(); var inputContext = new StabilityStoneCoverWaveConditionsInputContext(input, failureMechanism.ForeshoreProfiles, @@ -161,7 +161,7 @@ } }; - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone) + var input = new WaveConditionsInput() { ForeshoreProfile = foreshoreProfile, HydraulicBoundaryLocation = hydraulicBoundaryLocation, @@ -232,7 +232,7 @@ } }; - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); input.Attach(observerMock); var failureMechanism = new StabilityStoneCoverFailureMechanism(); @@ -292,7 +292,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); var foreshoreProfile = new ForeshoreProfile( new Point2D(0, 0), Enumerable.Empty(), Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsInputContextTreeNodeInfoTest.cs =================================================================== diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsInputContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsInputContextTreeNodeInfoTest.cs) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsInputContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsInputContextTreeNodeInfoTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -88,7 +88,7 @@ var failureMechanism = new StabilityStoneCoverFailureMechanism(); - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); var context = new StabilityStoneCoverWaveConditionsInputContext(input, failureMechanism.ForeshoreProfiles, assessmentSection); using (var plugin = new StabilityStoneCoverPlugin()) @@ -112,7 +112,7 @@ var failureMechanism = new StabilityStoneCoverFailureMechanism(); - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); var context = new StabilityStoneCoverWaveConditionsInputContext(input, failureMechanism.ForeshoreProfiles, assessmentSection); using (var plugin = new StabilityStoneCoverPlugin()) @@ -137,7 +137,7 @@ var failureMechanism = new StabilityStoneCoverFailureMechanism(); - var input = new WaveConditionsInput(WaveConditionsRevetment.StabilityStone); + var input = new WaveConditionsInput(); var context = new StabilityStoneCoverWaveConditionsInputContext(input, failureMechanism.ForeshoreProfiles, assessmentSection); var menuBuilder = mocks.StrictMock(); Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverWaveConditionsCalculation.cs =================================================================== diff -u -r50fc099174271a6f72ed94a8f024cd5377b37a53 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverWaveConditionsCalculation.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculation.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverWaveConditionsCalculation.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculation.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -37,7 +37,7 @@ public WaveImpactAsphaltCoverWaveConditionsCalculation() { Name = Resources.WaveImpactAsphaltCoverWaveConditionsCalculation_DefaultName; - InputParameters = new WaveConditionsInput(WaveConditionsRevetment.Asphalt); + InputParameters = new WaveConditionsInput(); } /// Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs =================================================================== diff -u -r50fc099174271a6f72ed94a8f024cd5377b37a53 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -47,7 +47,6 @@ 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/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs =================================================================== diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs (.../WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs (.../WaveImpactAsphaltCoverWaveConditionsInputContextTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -67,7 +67,7 @@ } }; - var input = new WaveConditionsInput(WaveConditionsRevetment.Asphalt); + var input = new WaveConditionsInput(); // Call var context = new WaveImpactAsphaltCoverWaveConditionsInputContext(input, @@ -111,7 +111,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var input = new WaveConditionsInput(WaveConditionsRevetment.Asphalt); + var input = new WaveConditionsInput(); // Call TestDelegate test = () => new WaveImpactAsphaltCoverWaveConditionsInputContext(input, @@ -128,7 +128,7 @@ public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException() { // Setup - var input = new WaveConditionsInput(WaveConditionsRevetment.Asphalt); + var input = new WaveConditionsInput(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); // Call @@ -149,7 +149,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var input = new WaveConditionsInput(WaveConditionsRevetment.Asphalt); + var input = new WaveConditionsInput(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var context = new WaveImpactAsphaltCoverWaveConditionsInputContext(input, failureMechanism.ForeshoreProfiles, assessmentSection); Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs (.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs (.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -81,7 +81,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var input = new WaveConditionsInput(WaveConditionsRevetment.Asphalt); + var input = new WaveConditionsInput(); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var inputContext = new WaveImpactAsphaltCoverWaveConditionsInputContext(input, failureMechanism.ForeshoreProfiles, @@ -161,7 +161,7 @@ } }; - var input = new WaveConditionsInput(WaveConditionsRevetment.Asphalt) + var input = new WaveConditionsInput() { ForeshoreProfile = foreshoreProfile, HydraulicBoundaryLocation = hydraulicBoundaryLocation, @@ -232,7 +232,7 @@ } }; - var input = new WaveConditionsInput(WaveConditionsRevetment.Asphalt); + var input = new WaveConditionsInput(); input.Attach(observerMock); var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); @@ -292,7 +292,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var input = new WaveConditionsInput(WaveConditionsRevetment.Asphalt); + var input = new WaveConditionsInput(); var foreshoreProfile = new ForeshoreProfile( new Point2D(0, 0), Enumerable.Empty(), Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsInputContextTreeNodeInfoTest.cs =================================================================== diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsInputContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsInputContextTreeNodeInfoTest.cs) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsInputContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsInputContextTreeNodeInfoTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3) @@ -88,7 +88,7 @@ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - var input = new WaveConditionsInput(WaveConditionsRevetment.Asphalt); + var input = new WaveConditionsInput(); var context = new WaveImpactAsphaltCoverWaveConditionsInputContext(input, failureMechanism.ForeshoreProfiles, assessmentSection); using (var plugin = new WaveImpactAsphaltCoverPlugin()) @@ -112,7 +112,7 @@ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - var input = new WaveConditionsInput(WaveConditionsRevetment.Asphalt); + var input = new WaveConditionsInput(); var context = new WaveImpactAsphaltCoverWaveConditionsInputContext(input, failureMechanism.ForeshoreProfiles, assessmentSection); using (var plugin = new WaveImpactAsphaltCoverPlugin()) @@ -137,7 +137,7 @@ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - var input = new WaveConditionsInput(WaveConditionsRevetment.Asphalt); + var input = new WaveConditionsInput(); var context = new WaveImpactAsphaltCoverWaveConditionsInputContext(input, failureMechanism.ForeshoreProfiles, assessmentSection); var menuBuilder = mocks.StrictMock();