Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs
===================================================================
diff -u -r2548c373f81aaed2b497df18d500da52f5a50eed -rca50e203235730c6a88901c20588095704aeee84
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs (.../WaveConditionsInput.cs) (revision 2548c373f81aaed2b497df18d500da52f5a50eed)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs (.../WaveConditionsInput.cs) (revision ca50e203235730c6a88901c20588095704aeee84)
@@ -219,17 +219,6 @@
}
///
- /// Gets the water levels to perform a wave conditions calculation for.
- ///
- public IEnumerable WaterLevels
- {
- get
- {
- return this.GetWaterLevels(AssessmentLevel);
- }
- }
-
- ///
/// Gets or sets the foreshore profile.
///
public ForeshoreProfile ForeshoreProfile
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs
===================================================================
diff -u -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c -rca50e203235730c6a88901c20588095704aeee84
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs (.../WaveConditionsInputViewTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs (.../WaveConditionsInputViewTest.cs) (revision ca50e203235730c6a88901c20588095704aeee84)
@@ -268,7 +268,7 @@
chartData.Collection.ElementAt(designWaterLevelChartDataIndex), "Toetspeil");
AssertWaterLevelsChartData(calculation.InputParameters.ForeshoreGeometry,
- calculation.InputParameters.WaterLevels,
+ calculation.InputParameters.GetWaterLevels(calculation.InputParameters.AssessmentLevel),
chartData.Collection.ElementAt(waterLevelsChartDataIndex));
AssertRevetmentBaseChartData(calculation.InputParameters.ForeshoreGeometry.Last(),
@@ -435,7 +435,7 @@
designWaterLevelChartData, "Toetspeil");
AssertWaterLevelsChartData(calculation.InputParameters.ForeshoreGeometry,
- calculation.InputParameters.WaterLevels,
+ calculation.InputParameters.GetWaterLevels(calculation.InputParameters.AssessmentLevel),
waterLevelsChartData);
AssertRevetmentBaseChartData(profile2.Geometry.Last(),
@@ -445,6 +445,7 @@
AssertRevetmentChartData(profile2.Geometry.Last(), calculation.InputParameters.LowerBoundaryRevetment,
calculation.InputParameters.UpperBoundaryRevetment, revetmentChartData);
}
+
mocks.VerifyAll();
}
@@ -480,6 +481,7 @@
// Assert
Assert.AreEqual(calculation1, view.Data);
}
+
mocks.VerifyAll(); // no update observer expected
}
@@ -553,7 +555,7 @@
designWaterLevelChartData, "Toetspeil");
AssertWaterLevelsChartData(calculation.InputParameters.ForeshoreGeometry,
- calculation.InputParameters.WaterLevels,
+ calculation.InputParameters.GetWaterLevels(calculation.InputParameters.AssessmentLevel),
waterLevelsChartData);
AssertRevetmentBaseChartData(profile.Geometry.Last(),