Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -r218e7a0206204401ad7fe9d94ea3532dc456f33e -ra9f365502f44e8c5cc83c4c777c50053beb9b283 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 218e7a0206204401ad7fe9d94ea3532dc456f33e) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision a9f365502f44e8c5cc83c4c777c50053beb9b283) @@ -189,13 +189,13 @@ { Image = RingtoetsCommonFormsResources.GenericInputOutputIcon, GetViewName = (view, context) => RingtoetsCommonFormsResources.Calculation_Input, - GetViewData = context => context.Calculation, CloseForData = RingtoetsPluginHelper.ShouldCloseViewWithCalculationData, - CreateInstance = context => new WaveConditionsInputView(new GrassCoverErosionOutwardsWaveConditionsInputViewStyle(), + CreateInstance = context => new WaveConditionsInputView(context.Calculation, () => context.FailureMechanism.GetAssessmentLevel( context.AssessmentSection, context.Calculation.InputParameters.HydraulicBoundaryLocation, - context.Calculation.InputParameters.CategoryType)) + context.Calculation.InputParameters.CategoryType), + new GrassCoverErosionOutwardsWaveConditionsInputViewStyle()) }; } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs =================================================================== diff -u -r412c54c9a315e683f0cd733409f44b5b8c9d8507 -ra9f365502f44e8c5cc83c4c777c50053beb9b283 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs) (revision 412c54c9a315e683f0cd733409f44b5b8c9d8507) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs) (revision a9f365502f44e8c5cc83c4c777c50053beb9b283) @@ -89,23 +89,6 @@ } [Test] - public void GetViewData_Always_ReturnsWrappedCalculation() - { - // Setup - var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation(); - var context = new GrassCoverErosionOutwardsWaveConditionsInputContext(calculation.InputParameters, - calculation, - new AssessmentSectionStub(), - new GrassCoverErosionOutwardsFailureMechanism()); - - // Call - object viewData = info.GetViewData(context); - - // Assert - Assert.AreSame(calculation, viewData); - } - - [Test] public void CreateInstance_GrassCoverErosionOutwardsWaveConditionsInputContext_ReturnViewWithStylingApplied() { // Setup @@ -125,7 +108,6 @@ // Call var view = (WaveConditionsInputView) info.CreateInstance(context); - view.Data = context.Calculation; // Assert ChartDataCollection chartData = view.Chart.Data; @@ -172,7 +154,6 @@ // Call var view = (WaveConditionsInputView) info.CreateInstance(context); - view.Data = context.Calculation; // Assert ChartDataCollection chartData = view.Chart.Data; @@ -190,11 +171,9 @@ protected override IView GetView(ICalculation data) { - return new WaveConditionsInputView(new GrassCoverErosionOutwardsWaveConditionsInputViewStyle(), - () => (RoundedDouble) 1.1) - { - Data = data - }; + return new WaveConditionsInputView((ICalculation) data, + () => (RoundedDouble) 1.1, + new GrassCoverErosionOutwardsWaveConditionsInputViewStyle()); } protected override ICalculation GetCalculation() Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Views/WaveConditionsInputView.cs =================================================================== diff -u -r8ce51e30daf6665658c57d67ba01a8a97f3489ad -ra9f365502f44e8c5cc83c4c777c50053beb9b283 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Views/WaveConditionsInputView.cs (.../WaveConditionsInputView.cs) (revision 8ce51e30daf6665658c57d67ba01a8a97f3489ad) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Views/WaveConditionsInputView.cs (.../WaveConditionsInputView.cs) (revision a9f365502f44e8c5cc83c4c777c50053beb9b283) @@ -56,27 +56,34 @@ private readonly ChartLineData revetmentBaseChartData; private readonly ChartLineData revetmentChartData; - private ICalculation data; + private readonly ICalculation calculation; /// /// Creates a new instance of . /// - /// The style which should be applied to the . + /// The calculation to show in the view. /// for obtaining the assessment level. + /// The style which should be applied to the . /// Thrown when any input parameter is null. - public WaveConditionsInputView(IWaveConditionsInputViewStyle inputViewStyle, - Func getAssessmentLevelFunc) + public WaveConditionsInputView(ICalculation calculation, + Func getAssessmentLevelFunc, + IWaveConditionsInputViewStyle inputViewStyle) { - if (inputViewStyle == null) + if (calculation == null) { - throw new ArgumentNullException(nameof(inputViewStyle)); + throw new ArgumentNullException(nameof(calculation)); } if (getAssessmentLevelFunc == null) { throw new ArgumentNullException(nameof(getAssessmentLevelFunc)); } + if (inputViewStyle == null) + { + throw new ArgumentNullException(nameof(inputViewStyle)); + } + InitializeComponent(); this.getAssessmentLevelFunc = getAssessmentLevelFunc; @@ -85,6 +92,12 @@ calculationInputObserver = new Observer(UpdateCalculationInput); hydraulicBoundaryLocationObserver = new Observer(UpdateChartData); + this.calculation = calculation; + + calculationObserver.Observable = calculation; + calculationInputObserver.Observable = calculation.InputParameters; + hydraulicBoundaryLocationObserver.Observable = calculation.InputParameters.HydraulicBoundaryLocation; + chartDataCollection = new ChartDataCollection(RingtoetsCommonFormsResources.Calculation_Input); foreshoreChartData = RingtoetsChartDataFactory.CreateForeshoreGeometryChartData(); lowerBoundaryRevetmentChartData = WaveConditionsChartDataFactory.CreateLowerRevetmentBoundaryChartData(inputViewStyle.RevetmentLineColor); @@ -105,35 +118,20 @@ chartDataCollection.Add(waterLevelsChartData); chartDataCollection.Add(revetmentBaseChartData); chartDataCollection.Add(revetmentChartData); + + SetChartData(); + + chartControl.Data = chartDataCollection; + UpdateChartTitle(); } public object Data { get { - return data; + return calculation; } - set - { - data = value as ICalculation; - - calculationObserver.Observable = data; - calculationInputObserver.Observable = data?.InputParameters; - hydraulicBoundaryLocationObserver.Observable = data?.InputParameters.HydraulicBoundaryLocation; - - if (data == null) - { - chartControl.Data = null; - chartControl.ChartTitle = string.Empty; - } - else - { - SetChartData(); - - chartControl.Data = chartDataCollection; - UpdateChartTitle(); - } - } + set {} } public IChartControl Chart @@ -160,7 +158,7 @@ private void UpdateCalculationInput() { - hydraulicBoundaryLocationObserver.Observable = data?.InputParameters.HydraulicBoundaryLocation; + hydraulicBoundaryLocationObserver.Observable = calculation?.InputParameters.HydraulicBoundaryLocation; UpdateChartData(); } @@ -173,12 +171,12 @@ private void UpdateChartTitle() { - chartControl.ChartTitle = data.Name; + chartControl.ChartTitle = calculation.Name; } private void SetChartData() { - WaveConditionsInput input = data.InputParameters; + WaveConditionsInput input = calculation.InputParameters; WaveConditionsChartDataFactory.UpdateForeshoreGeometryChartDataName(foreshoreChartData, input); Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs =================================================================== diff -u -r1b61e079b5ce825f3966ecac688d65e9ff567237 -ra9f365502f44e8c5cc83c4c777c50053beb9b283 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs (.../WaveConditionsInputViewTest.cs) (revision 1b61e079b5ce825f3966ecac688d65e9ff567237) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs (.../WaveConditionsInputViewTest.cs) (revision a9f365502f44e8c5cc83c4c777c50053beb9b283) @@ -81,8 +81,7 @@ public void Constructor_InputViewStyleNull_ThrowArgumentNullException() { // Call - TestDelegate test = () => new WaveConditionsInputView(null, - AssessmentSectionHelper.GetTestAssessmentLevel); + TestDelegate test = () => new WaveConditionsInputView(CreateTestCalculation(), AssessmentSectionHelper.GetTestAssessmentLevel, null); // Assert var exception = Assert.Throws(test); @@ -93,139 +92,77 @@ public void Constructor_GetAssessmentLevelFuncNull_ThrowArgumentNullException() { // Call - TestDelegate test = () => new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), null); + TestDelegate test = () => new WaveConditionsInputView(CreateTestCalculation(), null, new TestWaveConditionsInputViewStyle()); // Assert var exception = Assert.Throws(test); Assert.AreEqual("getAssessmentLevelFunc", exception.ParamName); } [Test] - public void Constructor_ExpectedValues() + public void Constructor_CalculationNull_ThrowArgumentNullException() { // Call - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), - AssessmentSectionHelper.GetTestAssessmentLevel)) - { - // Assert - Assert.IsInstanceOf(view); - Assert.IsInstanceOf(view); - Assert.IsNotNull(view.Chart); - Assert.IsNull(view.Data); - Assert.AreEqual(1, view.Controls.Count); - } + TestDelegate test = () => new WaveConditionsInputView(null, AssessmentSectionHelper.GetTestAssessmentLevel, new TestWaveConditionsInputViewStyle()); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("calculation", exception.ParamName); } [Test] - public void Constructor_Always_AddEmptyChartControl() + public void Constructor_ExpectedValues() { // Call - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), - AssessmentSectionHelper.GetTestAssessmentLevel)) + TestWaveConditionsCalculation calculation = CreateTestCalculation(); + using (var view = new WaveConditionsInputView(calculation, AssessmentSectionHelper.GetTestAssessmentLevel, new TestWaveConditionsInputViewStyle())) { // Assert - var chartControl = (IChartControl) view.Controls.Find("chartControl", true).First(); - Assert.IsInstanceOf(chartControl); - Assert.AreEqual(DockStyle.Fill, ((Control) chartControl).Dock); - Assert.AreEqual("Afstand [m]", chartControl.BottomAxisTitle); - Assert.AreEqual("Hoogte [m+NAP]", chartControl.LeftAxisTitle); - Assert.IsNull(chartControl.Data); - } - } - - [Test] - public void Data_IWaveConditionsCalculation_DataSet() - { - // Setup - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), - AssessmentSectionHelper.GetTestAssessmentLevel)) - { - var calculation = new TestWaveConditionsCalculation(new TestWaveConditionsInput()); - - // Call - view.Data = calculation; - - // Assert + Assert.IsInstanceOf(view); + Assert.IsInstanceOf(view); + Assert.IsNotNull(view.Chart); Assert.AreSame(calculation, view.Data); + Assert.AreEqual(1, view.Controls.Count); } } [Test] - public void Data_OtherThanWaveConditionsCalculation_DataNull() + public void Constructor_WithValidParameters_ChartDataSet() { // Setup - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), - AssessmentSectionHelper.GetTestAssessmentLevel)) - { - var calculation = new object(); - - // Call - view.Data = calculation; - - // Assert - Assert.IsNull(view.Data); - } - } - - [Test] - public void Data_SetToNull_ChartDataCleared() - { - // Setup - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), - AssessmentSectionHelper.GetTestAssessmentLevel) - { - Data = new TestWaveConditionsCalculation(new TestWaveConditionsInput()) - }) - { - // Precondition - Assert.AreEqual(numberOfChartDataLayers, view.Chart.Data.Collection.Count()); - Assert.AreEqual("Nieuwe berekening", view.Chart.ChartTitle); - - // Call - view.Data = null; - - // Assert - Assert.IsNull(view.Data); - Assert.IsNull(view.Chart.Data); - Assert.IsEmpty(view.Chart.ChartTitle); - } - } - - [Test] - public void Data_SetChartData_ChartDataSet() - { - // Setup const string calculationName = "Calculation name"; var assessmentLevel = (RoundedDouble) 6; - - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), () => assessmentLevel)) + var calculation = new TestWaveConditionsCalculation(new TestWaveConditionsInput()) { - var calculation = new TestWaveConditionsCalculation(new TestWaveConditionsInput()) + Name = calculationName, + InputParameters = { - Name = calculationName, - InputParameters = + ForeshoreProfile = new TestForeshoreProfile(new[] { - ForeshoreProfile = new TestForeshoreProfile(new[] - { - new Point2D(0.0, 0.0), - new Point2D(1.0, 1.0), - new Point2D(2.0, 2.0) - }), - LowerBoundaryRevetment = (RoundedDouble) 5, - UpperBoundaryRevetment = (RoundedDouble) 8, - LowerBoundaryWaterLevels = (RoundedDouble) 3, - UpperBoundaryWaterLevels = (RoundedDouble) 9 - } - }; + new Point2D(0.0, 0.0), + new Point2D(1.0, 1.0), + new Point2D(2.0, 2.0) + }), + LowerBoundaryRevetment = (RoundedDouble) 5, + UpperBoundaryRevetment = (RoundedDouble) 8, + LowerBoundaryWaterLevels = (RoundedDouble) 3, + UpperBoundaryWaterLevels = (RoundedDouble) 9 + } + }; - // Call - view.Data = calculation; - + // Call + using (var view = new WaveConditionsInputView(calculation, () => assessmentLevel, new TestWaveConditionsInputViewStyle())) + { // Assert - Assert.AreSame(calculation, view.Data); - Assert.AreEqual(calculationName, view.Chart.ChartTitle); + IChartControl chartControl = view.Chart; + Assert.IsInstanceOf(chartControl); + Assert.AreEqual(DockStyle.Fill, ((Control) chartControl).Dock); + Assert.AreEqual("Afstand [m]", chartControl.BottomAxisTitle); + Assert.AreEqual("Hoogte [m+NAP]", chartControl.LeftAxisTitle); - ChartDataCollection chartData = view.Chart.Data; + Assert.AreEqual(calculationName, chartControl.ChartTitle); + + ChartDataCollection chartData = chartControl.Data; Assert.IsInstanceOf(chartData); Assert.AreEqual(numberOfChartDataLayers, chartData.Collection.Count()); @@ -263,19 +200,16 @@ public void UpdateObserver_CalculationNameUpdated_ChartTitleUpdated() { // Setup - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), - AssessmentSectionHelper.GetTestAssessmentLevel)) + const string initialName = "Initial name"; + const string updatedName = "Updated name"; + + var calculation = new TestWaveConditionsCalculation(new TestWaveConditionsInput()) { - const string initialName = "Initial name"; - const string updatedName = "Updated name"; + Name = initialName + }; - var calculation = new TestWaveConditionsCalculation(new TestWaveConditionsInput()) - { - Name = initialName - }; - - view.Data = calculation; - + using (var view = new WaveConditionsInputView(calculation, AssessmentSectionHelper.GetTestAssessmentLevel, new TestWaveConditionsInputViewStyle())) + { // Precondition Assert.AreEqual(initialName, view.Chart.ChartTitle); @@ -290,41 +224,6 @@ } [Test] - public void UpdateObserver_PreviousCalculationNameUpdated_ChartTitleNotUpdated() - { - // Setup - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), - AssessmentSectionHelper.GetTestAssessmentLevel)) - { - const string initialName = "Initial name"; - const string updatedName = "Updated name"; - - var calculation = new TestWaveConditionsCalculation(new TestWaveConditionsInput()) - { - Name = initialName - }; - - view.Data = calculation; - - // Precondition - Assert.AreEqual(initialName, view.Chart.ChartTitle); - - view.Data = new TestWaveConditionsCalculation(new TestWaveConditionsInput()) - { - Name = initialName - }; - - calculation.Name = updatedName; - - // Call - calculation.NotifyObservers(); - - // Assert - Assert.AreEqual(initialName, view.Chart.ChartTitle); - } - } - - [Test] public void UpdateObserver_ForeshoreProfileUpdated_ChartDataUpdatedAndObserversNotified() { // Setup @@ -351,11 +250,8 @@ } }; - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), () => assessmentLevel) + using (var view = new WaveConditionsInputView(calculation, () => assessmentLevel, new TestWaveConditionsInputViewStyle())) { - Data = calculation - }) - { var foreshoreChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(foreShoreChartDataIndex); var lowerBoundaryRevetmentChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(lowerBoundaryRevetmentChartDataIndex); var upperBoundaryRevetmentChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(upperBoundaryRevetmentChartDataIndex); @@ -430,41 +326,6 @@ } [Test] - public void UpdateObserver_PreviousCalculationUpdated_ChartDataNotUpdated() - { - // Setup - var mocks = new MockRepository(); - var observer = mocks.StrictMock(); - mocks.ReplayAll(); - - var calculation = new TestWaveConditionsCalculation(new TestWaveConditionsInput()); - - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), - AssessmentSectionHelper.GetTestAssessmentLevel) - { - Data = calculation - }) - { - ((ChartLineData) view.Chart.Data.Collection.ElementAt(foreShoreChartDataIndex)).Attach(observer); - - view.Data = new TestWaveConditionsCalculation(new TestWaveConditionsInput()); - - calculation.InputParameters.ForeshoreProfile = new TestForeshoreProfile(new[] - { - new Point2D(0, 0), - new Point2D(3, 3), - new Point2D(8, 8) - }); - - // Call - calculation.InputParameters.NotifyObservers(); - - // Assert - mocks.VerifyAll(); // No update observer expected - } - } - - [Test] [TestCaseSource(nameof(NotifyChange))] public void GivenViewWithInputData_WhenChangeNotified_ThenUpdatedDataIsShownInChart(Action notifyChange) { @@ -490,11 +351,8 @@ var assessmentLevel = (RoundedDouble) 6; Func getAssessmentLevel = () => assessmentLevel; - using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), getAssessmentLevel) + using (var view = new WaveConditionsInputView(calculation, getAssessmentLevel, new TestWaveConditionsInputViewStyle())) { - Data = calculation - }) - { var foreshoreChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(foreShoreChartDataIndex); var lowerBoundaryRevetmentChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(lowerBoundaryRevetmentChartDataIndex); var upperBoundaryRevetmentChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(upperBoundaryRevetmentChartDataIndex); @@ -548,6 +406,11 @@ } } + private static TestWaveConditionsCalculation CreateTestCalculation() + { + return new TestWaveConditionsCalculation(new TestWaveConditionsInput()); + } + private static void AssertForeshoreChartData(ForeshoreProfile foreshoreProfile, ChartData chartData) { Assert.IsInstanceOf(chartData); Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs =================================================================== diff -u -r1323a36fea2639e67dcf6f2273ad5b423d8c6b0a -ra9f365502f44e8c5cc83c4c777c50053beb9b283 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 1323a36fea2639e67dcf6f2273ad5b423d8c6b0a) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision a9f365502f44e8c5cc83c4c777c50053beb9b283) @@ -110,11 +110,11 @@ { Image = RingtoetsCommonFormsResources.GenericInputOutputIcon, GetViewName = (view, context) => RingtoetsCommonFormsResources.Calculation_Input, - GetViewData = context => context.Calculation, CloseForData = RingtoetsPluginHelper.ShouldCloseViewWithCalculationData, - CreateInstance = context => new WaveConditionsInputView(new StabilityStoneCoverWaveConditionsInputViewStyle(), + CreateInstance = context => new WaveConditionsInputView(context.Calculation, () => context.AssessmentSection.GetAssessmentLevel(context.Calculation.InputParameters.HydraulicBoundaryLocation, - context.Calculation.InputParameters.CategoryType)) + context.Calculation.InputParameters.CategoryType), + new StabilityStoneCoverWaveConditionsInputViewStyle()) }; } Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ViewInfos/StabilityStoneCoverWaveConditionsInputViewInfoTest.cs =================================================================== diff -u -rd05654718000a34dc822015a143df7f141afa302 -ra9f365502f44e8c5cc83c4c777c50053beb9b283 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ViewInfos/StabilityStoneCoverWaveConditionsInputViewInfoTest.cs (.../StabilityStoneCoverWaveConditionsInputViewInfoTest.cs) (revision d05654718000a34dc822015a143df7f141afa302) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ViewInfos/StabilityStoneCoverWaveConditionsInputViewInfoTest.cs (.../StabilityStoneCoverWaveConditionsInputViewInfoTest.cs) (revision a9f365502f44e8c5cc83c4c777c50053beb9b283) @@ -90,23 +90,6 @@ } [Test] - public void GetViewData_Always_ReturnsWrappedCalculation() - { - // Setup - var calculation = new StabilityStoneCoverWaveConditionsCalculation(); - var context = new StabilityStoneCoverWaveConditionsInputContext(calculation.InputParameters, - calculation, - new AssessmentSectionStub(), - new ForeshoreProfile[0]); - - // Call - object viewData = info.GetViewData(context); - - // Assert - Assert.AreSame(calculation, viewData); - } - - [Test] public void CreateInstance_StabilityStoneCoverWaveConditionsInputContext_ReturnViewWithStylingApplied() { // Setup @@ -126,7 +109,6 @@ // Call var view = (WaveConditionsInputView) info.CreateInstance(context); - view.Data = context.Calculation; // Assert ChartDataCollection chartData = view.Chart.Data; @@ -173,7 +155,6 @@ // Call var view = (WaveConditionsInputView) info.CreateInstance(context); - view.Data = context.Calculation; // Assert ChartDataCollection chartData = view.Chart.Data; @@ -190,11 +171,9 @@ protected override IView GetView(ICalculation data) { - return new WaveConditionsInputView(new StabilityStoneCoverWaveConditionsInputViewStyle(), - () => (RoundedDouble) 1.1) - { - Data = data - }; + return new WaveConditionsInputView((ICalculation) data, + () => (RoundedDouble) 1.1, + new StabilityStoneCoverWaveConditionsInputViewStyle()); } protected override ICalculation GetCalculation() Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -r8588a6a0d9c1d11a496590ef3eaaccd5cf3a1108 -ra9f365502f44e8c5cc83c4c777c50053beb9b283 --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 8588a6a0d9c1d11a496590ef3eaaccd5cf3a1108) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision a9f365502f44e8c5cc83c4c777c50053beb9b283) @@ -110,11 +110,11 @@ { Image = RingtoetsCommonFormsResources.GenericInputOutputIcon, GetViewName = (view, context) => RingtoetsCommonFormsResources.Calculation_Input, - GetViewData = context => context.Calculation, CloseForData = RingtoetsPluginHelper.ShouldCloseViewWithCalculationData, - CreateInstance = context => new WaveConditionsInputView(new WaveImpactAsphaltCoverWaveConditionsInputViewStyle(), + CreateInstance = context => new WaveConditionsInputView(context.Calculation, () => context.AssessmentSection.GetAssessmentLevel(context.Calculation.InputParameters.HydraulicBoundaryLocation, - context.Calculation.InputParameters.CategoryType)) + context.Calculation.InputParameters.CategoryType), + new WaveImpactAsphaltCoverWaveConditionsInputViewStyle()) }; } Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs =================================================================== diff -u -rfd6040f4814eeb7d853f0dca5cd9b281028a0147 -ra9f365502f44e8c5cc83c4c777c50053beb9b283 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs) (revision fd6040f4814eeb7d853f0dca5cd9b281028a0147) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsInputViewInfoTest.cs) (revision a9f365502f44e8c5cc83c4c777c50053beb9b283) @@ -90,23 +90,6 @@ } [Test] - public void GetViewData_Always_ReturnsWrappedCalculation() - { - // Setup - var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation(); - var context = new WaveImpactAsphaltCoverWaveConditionsInputContext(calculation.InputParameters, - calculation, - new AssessmentSectionStub(), - new ForeshoreProfile[0]); - - // Call - object viewData = info.GetViewData(context); - - // Assert - Assert.AreSame(calculation, viewData); - } - - [Test] public void CreateInstance_WaveImpactAsphaltCoverWaveConditionsInputContext_ReturnViewWithStylingApplied() { // Setup @@ -126,7 +109,6 @@ // Call var view = (WaveConditionsInputView) info.CreateInstance(context); - view.Data = context.Calculation; // Assert ChartDataCollection chartData = view.Chart.Data; @@ -173,7 +155,6 @@ // Call var view = (WaveConditionsInputView) info.CreateInstance(context); - view.Data = context.Calculation; // Assert ChartDataCollection chartData = view.Chart.Data; @@ -190,11 +171,9 @@ protected override IView GetView(ICalculation data) { - return new WaveConditionsInputView(new WaveImpactAsphaltCoverWaveConditionsInputViewStyle(), - () => (RoundedDouble) 1.1) - { - Data = data - }; + return new WaveConditionsInputView((ICalculation) data, + () => (RoundedDouble) 1.1, + new WaveImpactAsphaltCoverWaveConditionsInputViewStyle()); } protected override ICalculation GetCalculation()