Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.cs =================================================================== diff -u -ra8ed38259a76821932fd45682de35b18c1a12c51 -r5734a965a104ebe1afbf54206d05290eb9290092 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.cs (.../GrassCoverErosionOutwardsFailureMechanismView.cs) (revision a8ed38259a76821932fd45682de35b18c1a12c51) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.cs (.../GrassCoverErosionOutwardsFailureMechanismView.cs) (revision 5734a965a104ebe1afbf54206d05290eb9290092) @@ -34,7 +34,6 @@ using Ringtoets.Common.Forms.Factories; using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.GrassCoverErosionOutwards.Forms.Factories; -using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects; using Ringtoets.Revetment.Data; using GrassCoverErosionOutwardsDataResources = Ringtoets.GrassCoverErosionOutwards.Data.Properties.Resources; @@ -45,7 +44,6 @@ /// public partial class GrassCoverErosionOutwardsFailureMechanismView : UserControl, IMapView { - private readonly MapDataCollection mapDataCollection; private readonly MapLineData referenceLineMapData; private readonly MapLineData sectionsMapData; private readonly MapPointData sectionsStartPointMapData; @@ -64,8 +62,6 @@ private RecursiveObserver calculationObserver; private RecursiveObserver foreshoreProfileObserver; - private GrassCoverErosionOutwardsFailureMechanismContext data; - /// /// Creates a new instance of . /// @@ -89,7 +85,7 @@ CreateObservers(failureMechanism); - mapDataCollection = new MapDataCollection(GrassCoverErosionOutwardsDataResources.GrassCoverErosionOutwardsFailureMechanism_DisplayName); + var mapDataCollection = new MapDataCollection(GrassCoverErosionOutwardsDataResources.GrassCoverErosionOutwardsFailureMechanism_DisplayName); referenceLineMapData = RingtoetsMapDataFactory.CreateReferenceLineMapData(); hydraulicBoundaryLocationsMapData = RingtoetsMapDataFactory.CreateHydraulicBoundaryLocationsMapData(); foreshoreProfilesMapData = RingtoetsMapDataFactory.CreateForeshoreProfileMapData(); @@ -120,49 +116,8 @@ /// public IAssessmentSection AssessmentSection { get; } - public object Data - { - get - { - return data; - } - set - { - data = value as GrassCoverErosionOutwardsFailureMechanismContext; + public object Data { get; set; } - if (data == null) - { - failureMechanismObserver.Observable = null; - assessmentSectionObserver.Observable = null; - hydraulicBoundaryLocationsObserver.Observable = null; - hydraulicBoundaryLocationObserver.Observable = null; - foreshoreProfilesObserver.Observable = null; - foreshoreProfileObserver.Observable = null; - calculationInputObserver.Observable = null; - calculationGroupObserver.Observable = null; - calculationObserver.Observable = null; - - ringtoetsMapControl.RemoveAllData(); - } - else - { - failureMechanismObserver.Observable = data.WrappedData; - assessmentSectionObserver.Observable = data.Parent; - hydraulicBoundaryLocationsObserver.Observable = data.WrappedData.HydraulicBoundaryLocations; - hydraulicBoundaryLocationObserver.Observable = data.WrappedData.HydraulicBoundaryLocations; - foreshoreProfilesObserver.Observable = data.WrappedData.ForeshoreProfiles; - foreshoreProfileObserver.Observable = data.WrappedData.ForeshoreProfiles; - calculationInputObserver.Observable = data.WrappedData.WaveConditionsCalculationGroup; - calculationGroupObserver.Observable = data.WrappedData.WaveConditionsCalculationGroup; - calculationObserver.Observable = data.WrappedData.WaveConditionsCalculationGroup; - - SetMapDataFeatures(); - - ringtoetsMapControl.SetAllData(mapDataCollection, data.Parent.BackgroundData); - } - } - } - public IMapControl Map { get Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs =================================================================== diff -u -r3ac702c75112ae673b1fbf69185ed0950fff0f89 -r5734a965a104ebe1afbf54206d05290eb9290092 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs) (revision 3ac702c75112ae673b1fbf69185ed0950fff0f89) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs) (revision 5734a965a104ebe1afbf54206d05290eb9290092) @@ -38,7 +38,6 @@ using Ringtoets.Common.Forms.TestUtil; using Ringtoets.Common.Forms.Views; using Ringtoets.GrassCoverErosionOutwards.Data; -using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects; using Ringtoets.GrassCoverErosionOutwards.Forms.Views; namespace Ringtoets.GrassCoverErosionOutwards.Forms.Test.Views @@ -108,110 +107,23 @@ } [Test] - public void Data_GrassCoverErosionOutwardsFailureMechanismContext_DataSet() + public void Constructor_AssessmentSectionWithBackgroundData_BackgroundDataSet() { // Setup - using (var view = new GrassCoverErosionOutwardsFailureMechanismView(new GrassCoverErosionOutwardsFailureMechanism(), new ObservableTestAssessmentSectionStub())) - { - var assessmentSection = new ObservableTestAssessmentSectionStub(); - - var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(new GrassCoverErosionOutwardsFailureMechanism(), assessmentSection); - - // Call - view.Data = failureMechanismContext; - - // Assert - Assert.AreSame(failureMechanismContext, view.Data); - } - } - - [Test] - public void Data_OtherThanGrassCoverErosionOutwardsFailureMechanismContext_DataNull() - { - // Setup - using (var view = new GrassCoverErosionOutwardsFailureMechanismView(new GrassCoverErosionOutwardsFailureMechanism(), new ObservableTestAssessmentSectionStub())) - { - var data = new object(); - - // Call - view.Data = data; - - // Assert - Assert.IsNull(view.Data); - } - } - - [Test] - public void Data_AssessmentSectionWithBackgroundData_BackgroundDataSet() - { - // Setup IAssessmentSection assessmentSection = new ObservableTestAssessmentSectionStub(); + // Call using (var view = new GrassCoverErosionOutwardsFailureMechanismView(new GrassCoverErosionOutwardsFailureMechanism(), assessmentSection)) { - var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext( - new GrassCoverErosionOutwardsFailureMechanism(), assessmentSection); - - // Call - view.Data = failureMechanismContext; - // Assert MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData); } } [Test] - public void Data_SetToNull_MapDataCleared() + public void Constructor_WithAllData_DataUpdatedToCollectionOfFilledMapData() { // Setup - var assessmentSection = new ObservableTestAssessmentSectionStub(); - - using (var view = new GrassCoverErosionOutwardsFailureMechanismView(new GrassCoverErosionOutwardsFailureMechanism(), assessmentSection)) - { - var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext( - new GrassCoverErosionOutwardsFailureMechanism(), assessmentSection); - - view.Data = failureMechanismContext; - - // Precondition - Assert.AreEqual(7, view.Map.Data.Collection.Count()); - MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData); - - // Call - view.Data = null; - - // Assert - Assert.IsNull(view.Data); - Assert.IsNull(view.Map.Data); - Assert.IsNull(view.Map.BackgroundMapData); - } - } - - [Test] - public void Data_EmptyGrassCoverErosionOutwardsFailureMechanismContext_NoMapDataSet() - { - // Setup - var assessmentSection = new ObservableTestAssessmentSectionStub(); - - using (var view = new GrassCoverErosionOutwardsFailureMechanismView(new GrassCoverErosionOutwardsFailureMechanism(), assessmentSection)) - { - var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext( - new GrassCoverErosionOutwardsFailureMechanism(), assessmentSection); - - // Call - view.Data = failureMechanismContext; - - // Assert - Assert.AreSame(failureMechanismContext, view.Data); - AssertEmptyMapData(view.Map.Data); - MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData); - } - } - - [Test] - public void Data_GrassCoverErosionOutwardsFailureMechanismContext_DataUpdatedToCollectionOfFilledMapData() - { - // Setup var referenceLine = new ReferenceLine(); referenceLine.SetGeometry(new[] { @@ -274,18 +186,12 @@ failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationB); failureMechanism.HydraulicBoundaryLocations.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0)); + // Call using (var view = new GrassCoverErosionOutwardsFailureMechanismView(failureMechanism, assessmentSection)) { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(failureMechanism, assessmentSection); - - // Call - view.Data = failureMechanismContext; - // Assert - Assert.AreSame(failureMechanismContext, view.Data); - MapDataCollection mapData = map.Data; Assert.IsInstanceOf(mapData); @@ -319,9 +225,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(failureMechanism, assessmentSection); - view.Data = failureMechanismContext; - MapData hydraulicBoundaryLocationsMapData = map.Data.Collection.ElementAt(hydraulicBoundaryLocationsIndex); // Precondition @@ -355,9 +258,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(failureMechanism, assessmentSection); - view.Data = failureMechanismContext; - MapData hydraulicBoundaryLocationsMapData = map.Data.Collection.ElementAt(hydraulicBoundaryLocationsIndex); // Precondition @@ -391,9 +291,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(new GrassCoverErosionOutwardsFailureMechanism(), assessmentSection); - view.Data = failureMechanismContext; - MapData referenceLineMapData = map.Data.Collection.ElementAt(referenceLineIndex); // Precondition @@ -422,9 +319,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub()); - view.Data = failureMechanismContext; - var sectionMapData = (MapLineData) map.Data.Collection.ElementAt(sectionsIndex); var sectionStartsMapData = (MapPointData) map.Data.Collection.ElementAt(sectionsStartPointIndex); var sectionsEndsMapData = (MapPointData) map.Data.Collection.ElementAt(sectionsEndPointIndex); @@ -464,9 +358,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub()); - view.Data = failureMechanismContext; - MapData foreshoreProfileData = map.Data.Collection.ElementAt(foreshoreProfilesIndex); // Precondition @@ -504,9 +395,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub()); - view.Data = failureMechanismContext; - MapData foreshoreProfileData = map.Data.Collection.ElementAt(foreshoreProfilesIndex); // Precondition @@ -547,9 +435,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub()); - view.Data = failureMechanismContext; - var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex); // Precondition @@ -591,9 +476,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub()); - view.Data = failureMechanismContext; - var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex); // Precondition @@ -627,9 +509,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub()); - view.Data = failureMechanismContext; - var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex); // Precondition @@ -662,10 +541,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(failureMechanism, assessmentSection); - - view.Data = failureMechanismContext; - MapDataCollection mapData = map.Data; var dataToMove = (MapLineData) map.Data.Collection.ElementAt(referenceLineIndex); @@ -732,40 +607,6 @@ } } - [Test] - public void NotifyObservers_DataUpdatedNotifyObserversOnOldData_NoUpdateInViewData() - { - // Setup - IAssessmentSection oldAssessmentSection = new ObservableTestAssessmentSectionStub(); - IAssessmentSection newAssessmentSection = new ObservableTestAssessmentSectionStub(); - - newAssessmentSection.ReferenceLine = new ReferenceLine(); - newAssessmentSection.ReferenceLine.SetGeometry(new[] - { - new Point2D(2, 4), - new Point2D(3, 4) - }); - - var oldGrassCoverErosionOutwardsFailureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(new GrassCoverErosionOutwardsFailureMechanism(), oldAssessmentSection); - var newGrassCoverErosionOutwardsFailureMechanismContext = new GrassCoverErosionOutwardsFailureMechanismContext(new GrassCoverErosionOutwardsFailureMechanism(), newAssessmentSection); - using (var view = new GrassCoverErosionOutwardsFailureMechanismView(new GrassCoverErosionOutwardsFailureMechanism(), oldAssessmentSection)) - { - IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - - view.Data = oldGrassCoverErosionOutwardsFailureMechanismContext; - view.Data = newGrassCoverErosionOutwardsFailureMechanismContext; - MapData dataBeforeUpdate = map.Data; - - newAssessmentSection.ReferenceLine.SetGeometry(Enumerable.Empty()); - - // Call - oldAssessmentSection.NotifyObservers(); - - // Assert - Assert.AreEqual(dataBeforeUpdate, map.Data); - } - } - private static void AssertHydraulicBoundaryLocationOutputsMapData(IEnumerable hydraulicBoundaryLocations, MapData mapData) {