Index: Core/Components/src/Core.Components.OxyPlot/Converter/ChartMultipleLineDataConverter.cs =================================================================== diff -u -r5fb13b35ed6bba8b867b95826e85dddb064b7036 -re464d420d0ce85287a40d0aee40d5dbdd0ade68e --- Core/Components/src/Core.Components.OxyPlot/Converter/ChartMultipleLineDataConverter.cs (.../ChartMultipleLineDataConverter.cs) (revision 5fb13b35ed6bba8b867b95826e85dddb064b7036) +++ Core/Components/src/Core.Components.OxyPlot/Converter/ChartMultipleLineDataConverter.cs (.../ChartMultipleLineDataConverter.cs) (revision e464d420d0ce85287a40d0aee40d5dbdd0ade68e) @@ -51,10 +51,8 @@ { series.Color = ChartDataHelper.Convert(lineStyle.Color); series.StrokeThickness = lineStyle.Width; - - DashStyle dashStyle = lineStyle.Style; series.Dashes = lineStyle.Dashes; - series.LineStyle = ChartDataHelper.Convert(dashStyle); + series.LineStyle = ChartDataHelper.Convert(lineStyle.Style); } } } Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartMultipleLineDataConverterTest.cs =================================================================== diff -u -r5fb13b35ed6bba8b867b95826e85dddb064b7036 -re464d420d0ce85287a40d0aee40d5dbdd0ade68e --- Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartMultipleLineDataConverterTest.cs (.../ChartMultipleLineDataConverterTest.cs) (revision 5fb13b35ed6bba8b867b95826e85dddb064b7036) +++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartMultipleLineDataConverterTest.cs (.../ChartMultipleLineDataConverterTest.cs) (revision e464d420d0ce85287a40d0aee40d5dbdd0ade68e) @@ -154,7 +154,7 @@ } [Test] - public void ConvertSeriesProperties_ChartLineStyleSetWithDifferentCustomDashStyles_AppliesStyleToSeries() + public void ConvertSeriesProperties_ChartLineStyleSetWithCustomDashStyle_AppliesStyleToSeries() { // Setup var converter = new ChartMultipleLineDataConverter(); Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationActivity.cs =================================================================== diff -u -r5fb13b35ed6bba8b867b95826e85dddb064b7036 -re464d420d0ce85287a40d0aee40d5dbdd0ade68e --- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationActivity.cs (.../DesignWaterLevelCalculationActivity.cs) (revision 5fb13b35ed6bba8b867b95826e85dddb064b7036) +++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationActivity.cs (.../DesignWaterLevelCalculationActivity.cs) (revision e464d420d0ce85287a40d0aee40d5dbdd0ade68e) @@ -105,7 +105,7 @@ protected override void OnFinish() { - hydraulicBoundaryLocation.NotifyObservers(); + hydraulicBoundaryLocation.NotifyObservers(); } private bool AlreadyCalculated Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs =================================================================== diff -u -r5fb13b35ed6bba8b867b95826e85dddb064b7036 -re464d420d0ce85287a40d0aee40d5dbdd0ade68e --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision 5fb13b35ed6bba8b867b95826e85dddb064b7036) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision e464d420d0ce85287a40d0aee40d5dbdd0ade68e) @@ -431,11 +431,9 @@ hydraulicBoundaryLocation.Attach(observer); mockRepository.ReplayAll(); - string validFilePath = Path.Combine(testDataPath, validFile); - const double norm = 1.0; var activity = new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocation, - validFilePath, - norm, + Path.Combine(testDataPath, validFile), + 1.0, calculationMessageProvider); // Call Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs =================================================================== diff -u -r5fb13b35ed6bba8b867b95826e85dddb064b7036 -re464d420d0ce85287a40d0aee40d5dbdd0ade68e --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs (.../WaveHeightCalculationActivityTest.cs) (revision 5fb13b35ed6bba8b867b95826e85dddb064b7036) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs (.../WaveHeightCalculationActivityTest.cs) (revision e464d420d0ce85287a40d0aee40d5dbdd0ade68e) @@ -417,12 +417,10 @@ hydraulicBoundaryLocation.Attach(observer); mockRepository.ReplayAll(); - string validFilePath = Path.Combine(testDataPath, validFile); - const double norm = 1.0; var activity = new WaveHeightCalculationActivity(hydraulicBoundaryLocation, - validFilePath, - norm, - calculationMessageProvider); + Path.Combine(testDataPath, validFile), + 1.0, + calculationMessageProvider); // Call activity.Finish(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs =================================================================== diff -u -r5fb13b35ed6bba8b867b95826e85dddb064b7036 -re464d420d0ce85287a40d0aee40d5dbdd0ade68e --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs (.../WaveConditionsInputViewInfoTest.cs) (revision 5fb13b35ed6bba8b867b95826e85dddb064b7036) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs (.../WaveConditionsInputViewInfoTest.cs) (revision e464d420d0ce85287a40d0aee40d5dbdd0ade68e) @@ -438,17 +438,17 @@ // Assert ChartDataCollection chartData = view.Chart.Data; - var revetmentChartData = (ChartLineData) chartData.Collection.ElementAt(revetmentChartDataIndex); - var revetmentBaseChartData = (ChartLineData) chartData.Collection.ElementAt(revetmentBaseChartDataIndex); var lowerBoundaryRevetmentChartData = (ChartLineData) chartData.Collection.ElementAt(lowerBoundaryRevetmentChartDataIndex); var upperBoundaryRevetmentChartData = (ChartLineData) chartData.Collection.ElementAt(upperBoundaryRevetmentChartDataIndex); var designWaterLevelChartData = (ChartLineData) chartData.Collection.ElementAt(designWaterLevelChartDataIndex); + var revetmentBaseChartData = (ChartLineData) chartData.Collection.ElementAt(revetmentBaseChartDataIndex); + var revetmentChartData = (ChartLineData) chartData.Collection.ElementAt(revetmentChartDataIndex); - Assert.AreEqual(revetmentLineColor, revetmentChartData.Style.Color); - Assert.AreEqual(Color.FromArgb(120, revetmentLineColor), revetmentBaseChartData.Style.Color); Assert.AreEqual(revetmentLineColor, lowerBoundaryRevetmentChartData.Style.Color); Assert.AreEqual(revetmentLineColor, upperBoundaryRevetmentChartData.Style.Color); Assert.AreEqual(designWaterLevelName, designWaterLevelChartData.Name); + Assert.AreEqual(Color.FromArgb(120, revetmentLineColor), revetmentBaseChartData.Style.Color); + Assert.AreEqual(revetmentLineColor, revetmentChartData.Style.Color); } #region TestCaseData Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Views/WaveConditionsInputView.cs =================================================================== diff -u -r5fb13b35ed6bba8b867b95826e85dddb064b7036 -re464d420d0ce85287a40d0aee40d5dbdd0ade68e --- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Views/WaveConditionsInputView.cs (.../WaveConditionsInputView.cs) (revision 5fb13b35ed6bba8b867b95826e85dddb064b7036) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Views/WaveConditionsInputView.cs (.../WaveConditionsInputView.cs) (revision e464d420d0ce85287a40d0aee40d5dbdd0ade68e) @@ -45,13 +45,12 @@ private readonly ChartLineData foreshoreChartData; private readonly ChartLineData lowerBoundaryRevetmentChartData; private readonly ChartLineData upperBoundaryRevetmentChartData; - private readonly ChartLineData revetmentChartData; - private readonly ChartLineData revetmentBaseChartData; - private readonly ChartLineData lowerBoundaryWaterLevelsChartData; private readonly ChartLineData upperBoundaryWaterLevelsChartData; private readonly ChartLineData designWaterLevelChartData; private readonly ChartMultipleLineData waterLevelsChartData; + private readonly ChartLineData revetmentBaseChartData; + private readonly ChartLineData revetmentChartData; private ICalculation data; @@ -96,12 +95,6 @@ chartDataCollection.Add(revetmentChartData); } - private void UpdateCalculationInput() - { - hydraulicBoundaryLocationObserver.Observable = data?.InputParameters.HydraulicBoundaryLocation; - UpdateChartData(); - } - public object Data { get @@ -152,19 +145,25 @@ base.Dispose(disposing); } + private void UpdateCalculationInput() + { + hydraulicBoundaryLocationObserver.Observable = data?.InputParameters.HydraulicBoundaryLocation; + UpdateChartData(); + } + private void UpdateChartData() { SetChartData(); foreshoreChartData.NotifyObservers(); - revetmentBaseChartData.NotifyObservers(); - revetmentChartData.NotifyObservers(); lowerBoundaryRevetmentChartData.NotifyObservers(); upperBoundaryRevetmentChartData.NotifyObservers(); lowerBoundaryWaterLevelsChartData.NotifyObservers(); upperBoundaryWaterLevelsChartData.NotifyObservers(); designWaterLevelChartData.NotifyObservers(); waterLevelsChartData.NotifyObservers(); + revetmentBaseChartData.NotifyObservers(); + revetmentChartData.NotifyObservers(); } private void UpdateChartTitle() @@ -179,14 +178,14 @@ WaveConditionsChartDataFactory.UpdateForeshoreGeometryChartDataName(foreshoreChartData, input); foreshoreChartData.Points = WaveConditionsChartDataPointsFactory.CreateForeshoreGeometryPoints(input); - revetmentBaseChartData.Points = WaveConditionsChartDataPointsFactory.CreateRevetmentBaseGeometryPoints(input); - revetmentChartData.Points = WaveConditionsChartDataPointsFactory.CreateRevetmentGeometryPoints(input); lowerBoundaryRevetmentChartData.Points = WaveConditionsChartDataPointsFactory.CreateLowerBoundaryRevetmentGeometryPoints(input); upperBoundaryRevetmentChartData.Points = WaveConditionsChartDataPointsFactory.CreateUpperBoundaryRevetmentGeometryPoints(input); lowerBoundaryWaterLevelsChartData.Points = WaveConditionsChartDataPointsFactory.CreateLowerBoundaryWaterLevelsGeometryPoints(input); upperBoundaryWaterLevelsChartData.Points = WaveConditionsChartDataPointsFactory.CreateUpperBoundaryWaterLevelsGeometryPoints(input); designWaterLevelChartData.Points = WaveConditionsChartDataPointsFactory.CreateDesignWaterLevelGeometryPoints(input); waterLevelsChartData.Lines = WaveConditionsChartDataPointsFactory.CreateWaterLevelsGeometryPoints(input); + revetmentBaseChartData.Points = WaveConditionsChartDataPointsFactory.CreateRevetmentBaseGeometryPoints(input); + revetmentChartData.Points = WaveConditionsChartDataPointsFactory.CreateRevetmentGeometryPoints(input); } } } \ No newline at end of file Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs =================================================================== diff -u -r5fb13b35ed6bba8b867b95826e85dddb064b7036 -re464d420d0ce85287a40d0aee40d5dbdd0ade68e --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs (.../WaveConditionsInputViewTest.cs) (revision 5fb13b35ed6bba8b867b95826e85dddb064b7036) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs (.../WaveConditionsInputViewTest.cs) (revision e464d420d0ce85287a40d0aee40d5dbdd0ade68e) @@ -33,7 +33,6 @@ using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.Common.Forms.Views; using Ringtoets.Revetment.Forms.TestUtil; using Ringtoets.Revetment.Forms.Views; using Ringtoets.Revetment.TestUtil; @@ -208,14 +207,6 @@ Assert.AreEqual(numberOfChartDataLayers, chartData.Collection.Count()); AssertForeshoreChartData(calculation.InputParameters.ForeshoreProfile, chartData.Collection.ElementAt(foreShoreChartDataIndex)); - AssertRevetmentChartData(calculation.InputParameters.ForeshoreGeometry.Last(), - calculation.InputParameters.LowerBoundaryRevetment, - calculation.InputParameters.UpperBoundaryRevetment, - chartData.Collection.ElementAt(revetmentChartDataIndex)); - AssertRevetmentBaseChartData(calculation.InputParameters.ForeshoreGeometry.Last(), - calculation.InputParameters.LowerBoundaryRevetment, - calculation.InputParameters.LowerBoundaryWaterLevels, - chartData.Collection.ElementAt(revetmentBaseChartDataIndex)); AssertChartData(calculation.InputParameters.ForeshoreGeometry, calculation.InputParameters.LowerBoundaryRevetment, chartData.Collection.ElementAt(lowerBoundaryRevetmentChartDataIndex), "Ondergrens bekleding"); @@ -233,6 +224,15 @@ AssertWaterLevelsChartData(calculation.InputParameters.ForeshoreGeometry, calculation.InputParameters.WaterLevels, chartData.Collection.ElementAt(waterLevelsChartDataIndex)); + + AssertRevetmentBaseChartData(calculation.InputParameters.ForeshoreGeometry.Last(), + calculation.InputParameters.LowerBoundaryRevetment, + calculation.InputParameters.LowerBoundaryWaterLevels, + chartData.Collection.ElementAt(revetmentBaseChartDataIndex)); + AssertRevetmentChartData(calculation.InputParameters.ForeshoreGeometry.Last(), + calculation.InputParameters.LowerBoundaryRevetment, + calculation.InputParameters.UpperBoundaryRevetment, + chartData.Collection.ElementAt(revetmentChartDataIndex)); } } @@ -331,24 +331,24 @@ }) { var foreshoreChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(foreShoreChartDataIndex); - var revetmentChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(revetmentChartDataIndex); - var revetmentBaseChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(revetmentBaseChartDataIndex); var lowerBoundaryRevetmentChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(lowerBoundaryRevetmentChartDataIndex); var upperBoundaryRevetmentChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(upperBoundaryRevetmentChartDataIndex); var lowerBoundaryWaterLevelsChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(lowerBoundaryWaterLevelsChartDataIndex); var upperBoundaryWaterLevelsChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(upperBoundaryWaterLevelsChartDataIndex); var designWaterLevelChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(designWaterLevelChartDataIndex); var waterLevelsChartData = (ChartMultipleLineData) view.Chart.Data.Collection.ElementAt(waterLevelsChartDataIndex); + var revetmentBaseChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(revetmentBaseChartDataIndex); + var revetmentChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(revetmentChartDataIndex); foreshoreChartData.Attach(observer); - revetmentChartData.Attach(observer); - revetmentBaseChartData.Attach(observer); lowerBoundaryRevetmentChartData.Attach(observer); upperBoundaryRevetmentChartData.Attach(observer); lowerBoundaryWaterLevelsChartData.Attach(observer); upperBoundaryWaterLevelsChartData.Attach(observer); designWaterLevelChartData.Attach(observer); waterLevelsChartData.Attach(observer); + revetmentBaseChartData.Attach(observer); + revetmentChartData.Attach(observer); ForeshoreProfile profile2 = new TestForeshoreProfile(new[] { @@ -364,22 +364,16 @@ // Assert Assert.AreSame(foreshoreChartData, (ChartLineData) view.Chart.Data.Collection.ElementAt(foreShoreChartDataIndex)); - Assert.AreSame(revetmentChartData, (ChartLineData) view.Chart.Data.Collection.ElementAt(revetmentChartDataIndex)); - Assert.AreSame(revetmentBaseChartData, (ChartLineData) view.Chart.Data.Collection.ElementAt(revetmentBaseChartDataIndex)); Assert.AreSame(lowerBoundaryRevetmentChartData, (ChartLineData) view.Chart.Data.Collection.ElementAt(lowerBoundaryRevetmentChartDataIndex)); Assert.AreSame(upperBoundaryRevetmentChartData, (ChartLineData) view.Chart.Data.Collection.ElementAt(upperBoundaryRevetmentChartDataIndex)); Assert.AreSame(lowerBoundaryWaterLevelsChartData, (ChartLineData) view.Chart.Data.Collection.ElementAt(lowerBoundaryWaterLevelsChartDataIndex)); Assert.AreSame(upperBoundaryWaterLevelsChartData, (ChartLineData) view.Chart.Data.Collection.ElementAt(upperBoundaryWaterLevelsChartDataIndex)); Assert.AreSame(designWaterLevelChartData, (ChartLineData) view.Chart.Data.Collection.ElementAt(designWaterLevelChartDataIndex)); Assert.AreSame(waterLevelsChartData, (ChartMultipleLineData) view.Chart.Data.Collection.ElementAt(waterLevelsChartDataIndex)); + Assert.AreSame(revetmentBaseChartData, (ChartLineData) view.Chart.Data.Collection.ElementAt(revetmentBaseChartDataIndex)); + Assert.AreSame(revetmentChartData, (ChartLineData) view.Chart.Data.Collection.ElementAt(revetmentChartDataIndex)); AssertForeshoreChartData(profile2, foreshoreChartData); - AssertRevetmentChartData(profile2.Geometry.Last(), calculation.InputParameters.LowerBoundaryRevetment, - calculation.InputParameters.UpperBoundaryRevetment, revetmentChartData); - AssertRevetmentBaseChartData(profile2.Geometry.Last(), - calculation.InputParameters.LowerBoundaryRevetment, - calculation.InputParameters.LowerBoundaryWaterLevels, - revetmentBaseChartData); AssertChartData(calculation.InputParameters.ForeshoreGeometry, calculation.InputParameters.LowerBoundaryRevetment, lowerBoundaryRevetmentChartData, "Ondergrens bekleding"); @@ -397,6 +391,13 @@ AssertWaterLevelsChartData(calculation.InputParameters.ForeshoreGeometry, calculation.InputParameters.WaterLevels, waterLevelsChartData); + + AssertRevetmentBaseChartData(profile2.Geometry.Last(), + calculation.InputParameters.LowerBoundaryRevetment, + calculation.InputParameters.LowerBoundaryWaterLevels, + revetmentBaseChartData); + AssertRevetmentChartData(profile2.Geometry.Last(), calculation.InputParameters.LowerBoundaryRevetment, + calculation.InputParameters.UpperBoundaryRevetment, revetmentChartData); } mocks.VerifyAll(); } @@ -436,24 +437,24 @@ }) { var foreshoreChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(foreShoreChartDataIndex); - var revetmentChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(revetmentChartDataIndex); - var revetmentBaseChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(revetmentBaseChartDataIndex); var lowerBoundaryRevetmentChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(lowerBoundaryRevetmentChartDataIndex); var upperBoundaryRevetmentChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(upperBoundaryRevetmentChartDataIndex); var lowerBoundaryWaterLevelsChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(lowerBoundaryWaterLevelsChartDataIndex); var upperBoundaryWaterLevelsChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(upperBoundaryWaterLevelsChartDataIndex); var designWaterLevelChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(designWaterLevelChartDataIndex); var waterLevelsChartData = (ChartMultipleLineData) view.Chart.Data.Collection.ElementAt(waterLevelsChartDataIndex); + var revetmentBaseChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(revetmentBaseChartDataIndex); + var revetmentChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(revetmentChartDataIndex); foreshoreChartData.Attach(observer); - revetmentChartData.Attach(observer); - revetmentBaseChartData.Attach(observer); lowerBoundaryRevetmentChartData.Attach(observer); upperBoundaryRevetmentChartData.Attach(observer); lowerBoundaryWaterLevelsChartData.Attach(observer); upperBoundaryWaterLevelsChartData.Attach(observer); designWaterLevelChartData.Attach(observer); waterLevelsChartData.Attach(observer); + revetmentBaseChartData.Attach(observer); + revetmentChartData.Attach(observer); var expectedWaterLevel = 6.0; testHydraulicBoundaryLocation.DesignWaterLevelOutput = new TestHydraulicBoundaryLocationOutput(expectedWaterLevel, CalculationConvergence.CalculatedConverged); @@ -463,22 +464,16 @@ // Assert Assert.AreSame(foreshoreChartData, (ChartLineData) view.Chart.Data.Collection.ElementAt(foreShoreChartDataIndex)); - Assert.AreSame(revetmentChartData, (ChartLineData) view.Chart.Data.Collection.ElementAt(revetmentChartDataIndex)); - Assert.AreSame(revetmentBaseChartData, (ChartLineData) view.Chart.Data.Collection.ElementAt(revetmentBaseChartDataIndex)); Assert.AreSame(lowerBoundaryRevetmentChartData, (ChartLineData) view.Chart.Data.Collection.ElementAt(lowerBoundaryRevetmentChartDataIndex)); Assert.AreSame(upperBoundaryRevetmentChartData, (ChartLineData) view.Chart.Data.Collection.ElementAt(upperBoundaryRevetmentChartDataIndex)); Assert.AreSame(lowerBoundaryWaterLevelsChartData, (ChartLineData) view.Chart.Data.Collection.ElementAt(lowerBoundaryWaterLevelsChartDataIndex)); Assert.AreSame(upperBoundaryWaterLevelsChartData, (ChartLineData) view.Chart.Data.Collection.ElementAt(upperBoundaryWaterLevelsChartDataIndex)); Assert.AreSame(designWaterLevelChartData, (ChartLineData) view.Chart.Data.Collection.ElementAt(designWaterLevelChartDataIndex)); Assert.AreSame(waterLevelsChartData, (ChartMultipleLineData) view.Chart.Data.Collection.ElementAt(waterLevelsChartDataIndex)); + Assert.AreSame(revetmentBaseChartData, (ChartLineData) view.Chart.Data.Collection.ElementAt(revetmentBaseChartDataIndex)); + Assert.AreSame(revetmentChartData, (ChartLineData) view.Chart.Data.Collection.ElementAt(revetmentChartDataIndex)); AssertForeshoreChartData(profile, foreshoreChartData); - AssertRevetmentChartData(profile.Geometry.Last(), calculation.InputParameters.LowerBoundaryRevetment, - calculation.InputParameters.UpperBoundaryRevetment, revetmentChartData); - AssertRevetmentBaseChartData(profile.Geometry.Last(), - calculation.InputParameters.LowerBoundaryRevetment, - calculation.InputParameters.LowerBoundaryWaterLevels, - revetmentBaseChartData); AssertChartData(calculation.InputParameters.ForeshoreGeometry, calculation.InputParameters.LowerBoundaryRevetment, lowerBoundaryRevetmentChartData, "Ondergrens bekleding"); @@ -496,6 +491,13 @@ AssertWaterLevelsChartData(calculation.InputParameters.ForeshoreGeometry, calculation.InputParameters.WaterLevels, waterLevelsChartData); + + AssertRevetmentBaseChartData(profile.Geometry.Last(), + calculation.InputParameters.LowerBoundaryRevetment, + calculation.InputParameters.LowerBoundaryWaterLevels, + revetmentBaseChartData); + AssertRevetmentChartData(profile.Geometry.Last(), calculation.InputParameters.LowerBoundaryRevetment, + calculation.InputParameters.UpperBoundaryRevetment, revetmentChartData); } mocks.VerifyAll(); } @@ -550,8 +552,8 @@ var upperBoundaryWaterLevelsData = (ChartLineData) chartDatasList[upperBoundaryWaterLevelsChartDataIndex]; var designWaterLevelData = (ChartLineData) chartDatasList[designWaterLevelChartDataIndex]; var waterLevelsData = (ChartMultipleLineData) chartDatasList[waterLevelsChartDataIndex]; - var revetmentData = (ChartLineData) chartDatasList[revetmentChartDataIndex]; var revetmentBaseData = (ChartLineData) chartDatasList[revetmentBaseChartDataIndex]; + var revetmentData = (ChartLineData) chartDatasList[revetmentChartDataIndex]; CollectionAssert.IsEmpty(foreshoreData.Points); CollectionAssert.IsEmpty(lowerBoundaryRevetmentData.Points); @@ -560,8 +562,8 @@ CollectionAssert.IsEmpty(upperBoundaryWaterLevelsData.Points); CollectionAssert.IsEmpty(designWaterLevelData.Points); CollectionAssert.IsEmpty(waterLevelsData.Lines); - CollectionAssert.IsEmpty(revetmentData.Points); CollectionAssert.IsEmpty(revetmentBaseData.Points); + CollectionAssert.IsEmpty(revetmentData.Points); Assert.AreEqual("Voorlandprofiel", foreshoreData.Name); Assert.AreEqual("Ondergrens bekleding", lowerBoundaryRevetmentData.Name); @@ -570,8 +572,8 @@ Assert.AreEqual("Bovengrens waterstanden", upperBoundaryWaterLevelsData.Name); Assert.AreEqual("Toetspeil", designWaterLevelData.Name); Assert.AreEqual("Waterstanden in berekening", waterLevelsData.Name); - Assert.AreEqual("Bekleding", revetmentData.Name); Assert.AreEqual("Hulplijn bekleding", revetmentBaseData.Name); + Assert.AreEqual("Bekleding", revetmentData.Name); } private static void AssertForeshoreChartData(ForeshoreProfile foreshoreProfile, ChartData chartData) @@ -587,25 +589,43 @@ Assert.AreEqual(expectedName, chartData.Name); } - private static void AssertRevetmentChartData(Point2D lastForeshorePoint, - double lowerBoundaryRevetment, - double upperBoundaryRevetment, - ChartData chartData) + private static void AssertChartData(RoundedPoint2DCollection foreshorePoints, + double value, + ChartData chartData, + string chartDataName) { Assert.IsInstanceOf(chartData); - var revetmentChartData = (ChartLineData) chartData; + var chartLineData = (ChartLineData) chartData; var expectedGeometry = new[] { - new Point2D(GetPointX(lowerBoundaryRevetment, lastForeshorePoint), lowerBoundaryRevetment), - new Point2D(GetPointX(upperBoundaryRevetment, lastForeshorePoint), upperBoundaryRevetment) + new Point2D(foreshorePoints.First().X, value), + new Point2D(GetPointX(value, foreshorePoints.Last()), value) }; - CollectionAssert.AreEqual(expectedGeometry, revetmentChartData.Points); + CollectionAssert.AreEqual(expectedGeometry, chartLineData.Points); - Assert.AreEqual("Bekleding", revetmentChartData.Name); + Assert.AreEqual(chartDataName, chartLineData.Name); } + private static void AssertWaterLevelsChartData(RoundedPoint2DCollection foreshorePoints, + IEnumerable waterLevels, + ChartData chartData) + { + Assert.IsInstanceOf(chartData); + var chartLineData = (ChartMultipleLineData) chartData; + + List expectedGeometry = waterLevels.Select(waterLevel => new[] + { + new Point2D(foreshorePoints.First().X, waterLevel), + new Point2D(GetPointX(waterLevel, foreshorePoints.Last()), waterLevel) + }).ToList(); + + CollectionAssert.AreEqual(expectedGeometry, chartLineData.Lines); + + Assert.AreEqual("Waterstanden in berekening", chartLineData.Name); + } + private static void AssertRevetmentBaseChartData(Point2D lastForeshorePoint, double lowerBoundaryRevetment, double lowerBoundaryWaterLevels, @@ -632,43 +652,25 @@ Assert.AreEqual("Hulplijn bekleding", revetmentChartData.Name); } - private static void AssertChartData(RoundedPoint2DCollection foreshorePoints, - double value, - ChartData chartData, - string chartDataName) + private static void AssertRevetmentChartData(Point2D lastForeshorePoint, + double lowerBoundaryRevetment, + double upperBoundaryRevetment, + ChartData chartData) { Assert.IsInstanceOf(chartData); - var chartLineData = (ChartLineData) chartData; + var revetmentChartData = (ChartLineData) chartData; var expectedGeometry = new[] { - new Point2D(foreshorePoints.First().X, value), - new Point2D(GetPointX(value, foreshorePoints.Last()), value) + new Point2D(GetPointX(lowerBoundaryRevetment, lastForeshorePoint), lowerBoundaryRevetment), + new Point2D(GetPointX(upperBoundaryRevetment, lastForeshorePoint), upperBoundaryRevetment) }; - CollectionAssert.AreEqual(expectedGeometry, chartLineData.Points); + CollectionAssert.AreEqual(expectedGeometry, revetmentChartData.Points); - Assert.AreEqual(chartDataName, chartLineData.Name); + Assert.AreEqual("Bekleding", revetmentChartData.Name); } - private static void AssertWaterLevelsChartData(RoundedPoint2DCollection foreshorePoints, - IEnumerable waterLevels, - ChartData chartData) - { - Assert.IsInstanceOf(chartData); - var chartLineData = (ChartMultipleLineData) chartData; - - List expectedGeometry = waterLevels.Select(waterLevel => new[] - { - new Point2D(foreshorePoints.First().X, waterLevel), - new Point2D(GetPointX(waterLevel, foreshorePoints.Last()), waterLevel) - }).ToList(); - - CollectionAssert.AreEqual(expectedGeometry, chartLineData.Lines); - - Assert.AreEqual("Waterstanden in berekening", chartLineData.Name); - } - private static double GetPointX(double pointY, Point2D lastForeshorePoint) { return ((pointY - lastForeshorePoint.Y) / 3) + lastForeshorePoint.X;