Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs =================================================================== diff -u -r66964d0c53eb0d904f7ada3e3bbc1e9604e241e7 -re444a84b4fbf8411cd3237eb2e836df68790652b --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs (.../GrassCoverErosionInwardsInputViewTest.cs) (revision 66964d0c53eb0d904f7ada3e3bbc1e9604e241e7) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs (.../GrassCoverErosionInwardsInputViewTest.cs) (revision e444a84b4fbf8411cd3237eb2e836df68790652b) @@ -240,32 +240,33 @@ } [Test] - public void UpdateObserver_OtherCalculationNameUpdated_ChartTitleNotUpdated() + public void UpdateObserver_PreviousCalculationNameUpdated_ChartTitleNotUpdated() { // Setup using (var view = new GrassCoverErosionInwardsInputView()) { const string initialName = "Initial name"; const string updatedName = "Updated name"; - var calculation1 = new GrassCoverErosionInwardsCalculation + var calculation = new GrassCoverErosionInwardsCalculation { Name = initialName }; - var calculation2 = new GrassCoverErosionInwardsCalculation - { - Name = initialName - }; - view.Data = calculation1; + view.Data = calculation; // Precondition Assert.AreEqual(initialName, view.Chart.ChartTitle); - calculation2.Name = updatedName; + view.Data = new GrassCoverErosionInwardsCalculation + { + Name = initialName + }; + calculation.Name = updatedName; + // Call - calculation1.NotifyObservers(); + calculation.NotifyObservers(); // Assert Assert.AreEqual(initialName, view.Chart.ChartTitle); @@ -322,7 +323,7 @@ } [Test] - public void UpdateObserver_OtherGrassCoverErosionInwardsCalculationUpdated_ChartDataNotUpdated() + public void UpdateObserver_PreviousGrassCoverErosionInwardsCalculationUpdated_ChartDataNotUpdated() { // Setup var mocks = new MockRepository(); @@ -331,25 +332,16 @@ using (var view = new GrassCoverErosionInwardsInputView()) { - DikeProfile dikeProfile = GetDikeProfileWithGeometry(); - var calculation1 = new GrassCoverErosionInwardsCalculation + var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { - DikeProfile = dikeProfile + DikeProfile = GetDikeProfileWithGeometry() } }; - var calculation2 = new GrassCoverErosionInwardsCalculation - { - InputParameters = - { - DikeProfile = dikeProfile - } - }; + view.Data = calculation; - view.Data = calculation1; - var dikeProfileChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(dikeProfileIndex); var foreshoreChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(foreshoreIndex); var dikeHeightChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(dikeHeightIndex); @@ -358,16 +350,21 @@ foreshoreChartData.Attach(observer); dikeHeightChartData.Attach(observer); - DikeProfile dikeProfile2 = GetSecondDikeProfileWithGeometry(); + view.Data = new GrassCoverErosionInwardsCalculation + { + InputParameters = + { + DikeProfile = GetDikeProfileWithGeometry() + } + }; - calculation2.InputParameters.DikeProfile = dikeProfile2; + calculation.InputParameters.DikeProfile = GetSecondDikeProfileWithGeometry(); // Call - calculation2.InputParameters.NotifyObservers(); + calculation.InputParameters.NotifyObservers(); // Assert - Assert.AreEqual(calculation1, view.Data); - mocks.VerifyAll(); // no update observer expected + mocks.VerifyAll(); // No update observer expected } } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs =================================================================== diff -u -rf85578eb9fbbd05088386a9b17f9687f832b051a -re444a84b4fbf8411cd3237eb2e836df68790652b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs (.../MacroStabilityInwardsInputViewTest.cs) (revision f85578eb9fbbd05088386a9b17f9687f832b051a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs (.../MacroStabilityInwardsInputViewTest.cs) (revision e444a84b4fbf8411cd3237eb2e836df68790652b) @@ -442,7 +442,7 @@ } [Test] - public void UpdateObserver_OtherCalculationUpdated_ChartTitleNotUpdated() + public void UpdateObserver_PreviousCalculationUpdated_ChartTitleNotUpdated() { // Setup using (var view = new MacroStabilityInwardsInputView()) @@ -460,13 +460,11 @@ // Precondition Assert.AreEqual(initialName, view.Chart.ChartTitle); - var calculation2 = new MacroStabilityInwardsCalculationScenario + view.Data = new MacroStabilityInwardsCalculationScenario { Name = initialName }; - view.Data = calculation2; - calculation.Name = updatedName; // Call @@ -704,7 +702,7 @@ } [Test] - public void UpdateObserver_OtherCalculationUpdated_ChartDataNotUpdated() + public void UpdateObserver_PreviousCalculationUpdated_ChartDataNotUpdated() { // Setup var mocks = new MockRepository(); @@ -713,34 +711,32 @@ using (var view = new MacroStabilityInwardsInputView()) { - var calculation1 = new MacroStabilityInwardsCalculationScenario + var calculation = new MacroStabilityInwardsCalculationScenario { InputParameters = { SurfaceLine = GetSurfaceLineWithGeometry() } }; - view.Data = calculation1; - ChartDataCollection dataBeforeUpdate = view.Chart.Data; + view.Data = calculation; + ChartDataCollection dataBeforeUpdate = view.Chart.Data; foreach (ChartData chartData in dataBeforeUpdate.Collection) { chartData.Attach(observer); } view.Data = new MacroStabilityInwardsCalculationScenario(); - MacroStabilityInwardsSurfaceLine surfaceLine2 = GetSecondSurfaceLineWithGeometry(); + calculation.InputParameters.SurfaceLine = GetSecondSurfaceLineWithGeometry(); - calculation1.InputParameters.SurfaceLine = surfaceLine2; - // Call - calculation1.InputParameters.NotifyObservers(); + calculation.InputParameters.NotifyObservers(); // Assert Assert.AreEqual(dataBeforeUpdate, view.Chart.Data); - mocks.VerifyAll(); // no update observer expected + mocks.VerifyAll(); // No update observer expected } } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs =================================================================== diff -u -r66964d0c53eb0d904f7ada3e3bbc1e9604e241e7 -re444a84b4fbf8411cd3237eb2e836df68790652b --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs (.../PipingInputViewTest.cs) (revision 66964d0c53eb0d904f7ada3e3bbc1e9604e241e7) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs (.../PipingInputViewTest.cs) (revision e444a84b4fbf8411cd3237eb2e836df68790652b) @@ -313,7 +313,7 @@ } [Test] - public void UpdateObserver_OtherCalculationUpdated_ChartTitleNotUpdated() + public void UpdateObserver_PreviousCalculationUpdated_ChartTitleNotUpdated() { // Setup using (var view = new PipingInputView()) @@ -331,13 +331,11 @@ // Precondition Assert.AreEqual(initialName, view.Chart.ChartTitle); - var calculation2 = new PipingCalculationScenario(new GeneralPipingInput()) + view.Data = new PipingCalculationScenario(new GeneralPipingInput()) { Name = initialName }; - view.Data = calculation2; - calculation.Name = updatedName; // Call @@ -578,7 +576,7 @@ } [Test] - public void UpdateObserver_OtherCalculationUpdated_ChartDataNotUpdated() + public void UpdateObserver_PreviousCalculationUpdated_ChartDataNotUpdated() { // Setup var mocks = new MockRepository(); @@ -587,33 +585,28 @@ using (var view = new PipingInputView()) { - PipingSurfaceLine surfaceLine = GetSurfaceLineWithGeometry(); - var calculation1 = new PipingCalculationScenario(new GeneralPipingInput()) + var calculation = new PipingCalculationScenario(new GeneralPipingInput()) { InputParameters = { - SurfaceLine = surfaceLine + SurfaceLine = GetSurfaceLineWithGeometry() } }; - var calculation2 = new PipingCalculationScenario(new GeneralPipingInput()); + view.Data = calculation; - view.Data = calculation1; ChartDataCollection dataBeforeUpdate = view.Chart.Data; - foreach (ChartData chartData in dataBeforeUpdate.Collection) { chartData.Attach(observer); } - view.Data = calculation2; + view.Data = new PipingCalculationScenario(new GeneralPipingInput()); - PipingSurfaceLine surfaceLine2 = GetSecondSurfaceLineWithGeometry(); + calculation.InputParameters.SurfaceLine = GetSecondSurfaceLineWithGeometry(); - calculation1.InputParameters.SurfaceLine = surfaceLine2; - // Call - calculation1.InputParameters.NotifyObservers(); + calculation.InputParameters.NotifyObservers(); // Assert Assert.AreEqual(dataBeforeUpdate, view.Chart.Data); Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Factories/WaveConditionsChartDataPointsFactoryTest.cs =================================================================== diff -u -r7d7b7e2a678a3cb63cf7e629754a9642abb7034f -re444a84b4fbf8411cd3237eb2e836df68790652b --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Factories/WaveConditionsChartDataPointsFactoryTest.cs (.../WaveConditionsChartDataPointsFactoryTest.cs) (revision 7d7b7e2a678a3cb63cf7e629754a9642abb7034f) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Factories/WaveConditionsChartDataPointsFactoryTest.cs (.../WaveConditionsChartDataPointsFactoryTest.cs) (revision e444a84b4fbf8411cd3237eb2e836df68790652b) @@ -921,7 +921,7 @@ IEnumerable foreshoreProfileGeometry) { // Setup - var normativeAssessmentLevel = (RoundedDouble) 6.01; + var normativeAssessmentLevel = GetTestNormativeAssessmentLevel(); var input = new WaveConditionsInput { ForeshoreProfile = new TestForeshoreProfile(foreshoreProfileGeometry), Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -r54d81da9b5622275aef0c85397d3c7f23e08c67b -re444a84b4fbf8411cd3237eb2e836df68790652b --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs (.../WaveConditionsInputContextPropertiesTest.cs) (revision 54d81da9b5622275aef0c85397d3c7f23e08c67b) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs (.../WaveConditionsInputContextPropertiesTest.cs) (revision e444a84b4fbf8411cd3237eb2e836df68790652b) @@ -32,6 +32,7 @@ using Core.Common.Util; using NUnit.Framework; using Rhino.Mocks; +using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.TestUtil; @@ -68,12 +69,14 @@ private const int revetmentTypePropertyIndex = 14; private MockRepository mockRepository; + private IAssessmentSection assessmentSection; private IObservablePropertyChangeHandler handler; [SetUp] public void SetUp() { mockRepository = new MockRepository(); + assessmentSection = mockRepository.Stub(); handler = mockRepository.Stub(); mockRepository.ReplayAll(); } @@ -644,7 +647,7 @@ }; var calculation = new TestWaveConditionsCalculation(); - var inputContext = new TestWaveConditionsInputContext(input, calculation, new ObservableTestAssessmentSectionStub(), new ForeshoreProfile[0], locations); + var inputContext = new TestWaveConditionsInputContext(input, calculation, assessmentSection, new ForeshoreProfile[0], locations); var otherProfile = new TestForeshoreProfile(new Point2D(0, 190)); var customHandler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty()); @@ -691,7 +694,7 @@ Assert.AreSame(locations, availableForeshoreProfiles); } - private static void SetPropertyAndVerifyNotificationsAndOutputForCalculation(Action setProperty) + private void SetPropertyAndVerifyNotificationsAndOutputForCalculation(Action setProperty) { // Setup var mocks = new MockRepository(); @@ -705,7 +708,7 @@ var context = new TestWaveConditionsInputContext(input, calculation, - new ObservableTestAssessmentSectionStub(), + assessmentSection, new ForeshoreProfile[0], new HydraulicBoundaryLocation[0]); Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs =================================================================== diff -u -r3532beeb1f50288aa925b3fdb7d88371a9a7f040 -re444a84b4fbf8411cd3237eb2e836df68790652b --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs (.../WaveConditionsInputViewTest.cs) (revision 3532beeb1f50288aa925b3fdb7d88371a9a7f040) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs (.../WaveConditionsInputViewTest.cs) (revision e444a84b4fbf8411cd3237eb2e836df68790652b) @@ -284,32 +284,33 @@ } [Test] - public void UpdateObserver_OtherCalculationNameUpdated_ChartTitleNotUpdated() + public void UpdateObserver_PreviousCalculationNameUpdated_ChartTitleNotUpdated() { // Setup using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), GetTestNormativeAssessmentLevel)) { const string initialName = "Initial name"; const string updatedName = "Updated name"; - var calculation1 = new TestWaveConditionsCalculation + var calculation = new TestWaveConditionsCalculation { Name = initialName }; - var calculation2 = new TestWaveConditionsCalculation - { - Name = initialName - }; - view.Data = calculation1; + view.Data = calculation; // Precondition Assert.AreEqual(initialName, view.Chart.ChartTitle); - calculation2.Name = updatedName; + view.Data = new TestWaveConditionsCalculation + { + Name = initialName + }; + calculation.Name = updatedName; + // Call - calculation1.NotifyObservers(); + calculation.NotifyObservers(); // Assert Assert.AreEqual(initialName, view.Chart.ChartTitle); @@ -422,39 +423,37 @@ } [Test] - public void UpdateObserver_OtherCalculationUpdated_ChartDataNotUpdated() + public void UpdateObserver_PreviousCalculationUpdated_ChartDataNotUpdated() { // Setup var mocks = new MockRepository(); var observer = mocks.StrictMock(); mocks.ReplayAll(); - var calculation1 = new TestWaveConditionsCalculation(); + var calculation = new TestWaveConditionsCalculation(); + using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle(), GetTestNormativeAssessmentLevel) { - Data = calculation1 + Data = calculation }) { ((ChartLineData) view.Chart.Data.Collection.ElementAt(foreShoreChartDataIndex)).Attach(observer); - var calculation2 = new TestWaveConditionsCalculation(); - ForeshoreProfile profile2 = new TestForeshoreProfile(new[] + view.Data = new TestWaveConditionsCalculation(); + + calculation.InputParameters.ForeshoreProfile = new TestForeshoreProfile(new[] { new Point2D(0, 0), new Point2D(3, 3), new Point2D(8, 8) }); - calculation2.InputParameters.ForeshoreProfile = profile2; - // Call - calculation2.InputParameters.NotifyObservers(); + calculation.InputParameters.NotifyObservers(); // Assert - Assert.AreEqual(calculation1, view.Data); + mocks.VerifyAll(); // No update observer expected } - - mocks.VerifyAll(); // no update observer expected } [Test]