Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs =================================================================== diff -u -r4f4a98421906484c72773077626b0366c85380ef -r31de6acdcc4050ca89a2226c3c8004b9a61fd812 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs (.../HeightStructuresFailureMechanismView.cs) (revision 4f4a98421906484c72773077626b0366c85380ef) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs (.../HeightStructuresFailureMechanismView.cs) (revision 31de6acdcc4050ca89a2226c3c8004b9a61fd812) @@ -35,7 +35,6 @@ using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Forms.Factories; using Ringtoets.HeightStructures.Data; -using Ringtoets.HeightStructures.Forms.PresentationObjects; using HeightStructuresDataResources = Ringtoets.HeightStructures.Data.Properties.Resources; namespace Ringtoets.HeightStructures.Forms.Views @@ -58,7 +57,6 @@ private RecursiveObserver foreshoreProfileObserver; private RecursiveObserver, HeightStructure> structureObserver; - private readonly MapDataCollection mapDataCollection; private readonly MapLineData referenceLineMapData; private readonly MapLineData sectionsMapData; private readonly MapPointData sectionsStartPointMapData; @@ -68,8 +66,6 @@ private readonly MapPointData structuresMapData; private readonly MapLineData calculationsMapData; - private HeightStructuresFailureMechanismContext data; - /// /// Creates a new instance of . /// @@ -96,7 +92,7 @@ CreateObservers(); - mapDataCollection = new MapDataCollection(HeightStructuresDataResources.HeightStructuresFailureMechanism_DisplayName); + var mapDataCollection = new MapDataCollection(HeightStructuresDataResources.HeightStructuresFailureMechanism_DisplayName); referenceLineMapData = RingtoetsMapDataFactory.CreateReferenceLineMapData(); hydraulicBoundaryLocationsMapData = RingtoetsMapDataFactory.CreateHydraulicBoundaryLocationsMapData(); foreshoreProfilesMapData = RingtoetsMapDataFactory.CreateForeshoreProfileMapData(); @@ -181,54 +177,8 @@ /// public IAssessmentSection AssessmentSection { get; } - public object Data - { - get - { - return data; - } - set - { - data = value as HeightStructuresFailureMechanismContext; + 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; - structuresObserver.Observable = null; - structureObserver.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.Parent.HydraulicBoundaryDatabase.Locations; - hydraulicBoundaryLocationObserver.Observable = data.Parent.HydraulicBoundaryDatabase.Locations; - foreshoreProfilesObserver.Observable = data.WrappedData.ForeshoreProfiles; - foreshoreProfileObserver.Observable = data.WrappedData.ForeshoreProfiles; - structuresObserver.Observable = data.WrappedData.HeightStructures; - structureObserver.Observable = data.WrappedData.HeightStructures; - calculationObserver.Observable = data.WrappedData.CalculationsGroup; - calculationInputObserver.Observable = data.WrappedData.CalculationsGroup; - calculationGroupObserver.Observable = data.WrappedData.CalculationsGroup; - calculationObserver.Observable = data.WrappedData.CalculationsGroup; - - SetMapDataFeatures(); - - ringtoetsMapControl.SetAllData(mapDataCollection, data.Parent.BackgroundData); - } - } - } - public IMapControl Map { get Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs =================================================================== diff -u -r9e16393c81aeaccdcd50fcfbe4f45f1d934bf822 -r31de6acdcc4050ca89a2226c3c8004b9a61fd812 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs (.../HeightStructuresFailureMechanismViewTest.cs) (revision 9e16393c81aeaccdcd50fcfbe4f45f1d934bf822) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs (.../HeightStructuresFailureMechanismViewTest.cs) (revision 31de6acdcc4050ca89a2226c3c8004b9a61fd812) @@ -39,7 +39,6 @@ using Ringtoets.Common.Forms.Views; using Ringtoets.HeightStructures.Data; using Ringtoets.HeightStructures.Data.TestUtil; -using Ringtoets.HeightStructures.Forms.PresentationObjects; using Ringtoets.HeightStructures.Forms.Views; namespace Ringtoets.HeightStructures.Forms.Test.Views @@ -103,116 +102,30 @@ Assert.AreEqual(1, view.Controls.Count); Assert.IsInstanceOf(view.Controls[0]); - Assert.AreSame(view.Map, ((RingtoetsMapControl)view.Controls[0]).MapControl); - Assert.AreEqual(DockStyle.Fill, ((Control)view.Map).Dock); + Assert.AreSame(view.Map, ((RingtoetsMapControl) view.Controls[0]).MapControl); + Assert.AreEqual(DockStyle.Fill, ((Control) view.Map).Dock); AssertEmptyMapData(view.Map.Data); } } [Test] - public void Data_HeightStructuresFailureMechanismContext_DataSet() + public void Constructor_AssessmentSectionWithBackgroundData_BackgroundDataSet() { // Setup - using (var view = new HeightStructuresFailureMechanismView(new HeightStructuresFailureMechanism(), new ObservableTestAssessmentSectionStub())) - { - var failureMechanismContext = new HeightStructuresFailureMechanismContext( - new HeightStructuresFailureMechanism(), new ObservableTestAssessmentSectionStub()); - - // Call - view.Data = failureMechanismContext; - - // Assert - Assert.AreSame(failureMechanismContext, view.Data); - } - } - - [Test] - public void Data_OtherThanHeightStructuresFailureMechanismContext_DataNull() - { - // Setup - using (var view = new HeightStructuresFailureMechanismView(new HeightStructuresFailureMechanism(), 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 HeightStructuresFailureMechanismView(new HeightStructuresFailureMechanism(), assessmentSection)) { - var failureMechanismContext = new HeightStructuresFailureMechanismContext( - new HeightStructuresFailureMechanism(), 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 HeightStructuresFailureMechanismView(new HeightStructuresFailureMechanism(), assessmentSection)) - { - var failureMechanismContext = new HeightStructuresFailureMechanismContext( - new HeightStructuresFailureMechanism(), assessmentSection); - - view.Data = failureMechanismContext; - - // Precondition - Assert.AreEqual(8, 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_EmptyHeightStructuresFailureMechanismContext_NoMapDataSet() - { - // Setup - var assessmentSection = new ObservableTestAssessmentSectionStub(); - - using (var view = new HeightStructuresFailureMechanismView(new HeightStructuresFailureMechanism(), assessmentSection)) - { - var failureMechanismContext = new HeightStructuresFailureMechanismContext( - new HeightStructuresFailureMechanism(), 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_HeightStructuresFailureMechanismContext_DataUpdatedToCollectionOfFilledMapData() - { - // Setup var calculationA = new StructuresCalculation { InputParameters = @@ -282,18 +195,12 @@ ReferenceLine = referenceLine }; + // Call using (var view = new HeightStructuresFailureMechanismView(failureMechanism, assessmentSection)) { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSection); - - // Call - view.Data = failureMechanismContext; - // Assert - Assert.AreSame(failureMechanismContext, view.Data); - MapDataCollection mapData = map.Data; Assert.IsInstanceOf(mapData); @@ -331,11 +238,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new HeightStructuresFailureMechanismContext(new HeightStructuresFailureMechanism(), - assessmentSection); - - view.Data = failureMechanismContext; - MapData hydraulicBoundaryLocationsMapData = map.Data.Collection.ElementAt(hydraulicBoundaryLocationsIndex); // Precondition @@ -373,10 +275,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new HeightStructuresFailureMechanismContext(new HeightStructuresFailureMechanism(), assessmentSection); - - view.Data = failureMechanismContext; - MapData hydraulicBoundaryLocationsMapData = map.Data.Collection.ElementAt(hydraulicBoundaryLocationsIndex); // Precondition @@ -418,11 +316,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new HeightStructuresFailureMechanismContext(new HeightStructuresFailureMechanism(), - assessmentSection); - - view.Data = failureMechanismContext; - MapData referenceLineMapData = map.Data.Collection.ElementAt(referenceLineIndex); // Precondition @@ -452,12 +345,7 @@ using (var view = new HeightStructuresFailureMechanismView(failureMechanism, new ObservableTestAssessmentSectionStub())) { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - - var failureMechanismContext = new HeightStructuresFailureMechanismContext(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); @@ -487,7 +375,7 @@ new Point2D(1, 1) }); - var failureMechanism = new HeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); failureMechanism.ForeshoreProfiles.AddRange(new[] { foreshoreProfile @@ -496,11 +384,7 @@ using (var view = new HeightStructuresFailureMechanismView(failureMechanism, new ObservableTestAssessmentSectionStub())) { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - - var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub()); - view.Data = failureMechanismContext; - MapData foreshoreProfileData = map.Data.Collection.ElementAt(foreshoreProfilesIndex); // Precondition @@ -538,11 +422,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, - new ObservableTestAssessmentSectionStub()); - - view.Data = failureMechanismContext; - MapData foreshoreProfileData = map.Data.Collection.ElementAt(foreshoreProfilesIndex); // Precondition @@ -571,7 +450,7 @@ { // Given var structure = new TestHeightStructure(new Point2D(0, 0), "Id"); - var failureMechanism = new HeightStructuresFailureMechanism(); + var failureMechanism = new HeightStructuresFailureMechanism(); failureMechanism.HeightStructures.AddRange(new[] { structure @@ -581,11 +460,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, - new ObservableTestAssessmentSectionStub()); - - view.Data = failureMechanismContext; - MapData structuresData = map.Data.Collection.ElementAt(structuresIndex); // Precondition @@ -616,11 +490,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, - new ObservableTestAssessmentSectionStub()); - - view.Data = failureMechanismContext; - MapData structuresData = map.Data.Collection.ElementAt(structuresIndex); // Precondition @@ -660,11 +529,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, - new ObservableTestAssessmentSectionStub()); - - view.Data = failureMechanismContext; - var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex); // Precondition @@ -707,12 +571,7 @@ using (var view = new HeightStructuresFailureMechanismView(failureMechanism, new ObservableTestAssessmentSectionStub())) { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - - var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, - new ObservableTestAssessmentSectionStub()); - view.Data = failureMechanismContext; - var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex); // Precondition @@ -749,11 +608,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, - new ObservableTestAssessmentSectionStub()); - - view.Data = failureMechanismContext; - var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex); // Precondition @@ -790,10 +644,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSection); - - view.Data = failureMechanismContext; - MapDataCollection mapData = map.Data; var dataToMove = (MapLineData) map.Data.Collection.ElementAt(referenceLineIndex); @@ -866,42 +716,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 oldHeightStructuresFailureMechanismContext = new HeightStructuresFailureMechanismContext( - new HeightStructuresFailureMechanism(), oldAssessmentSection); - var newHeightStructuresFailureMechanismContext = new HeightStructuresFailureMechanismContext( - new HeightStructuresFailureMechanism(), newAssessmentSection); - using (var view = new HeightStructuresFailureMechanismView(new HeightStructuresFailureMechanism(), oldAssessmentSection)) - { - IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - - view.Data = oldHeightStructuresFailureMechanismContext; - view.Data = newHeightStructuresFailureMechanismContext; - MapData dataBeforeUpdate = map.Data; - - newAssessmentSection.ReferenceLine.SetGeometry(Enumerable.Empty()); - - // Call - oldAssessmentSection.NotifyObservers(); - - // Assert - Assert.AreEqual(dataBeforeUpdate, map.Data); - } - } - private static void AssertCalculationsMapData(IEnumerable> calculations, MapData mapData) { Assert.IsInstanceOf(mapData); @@ -922,6 +736,7 @@ calculation.InputParameters.HydraulicBoundaryLocation.Location }, geometries[0].PointCollections.First()); } + Assert.AreEqual("Berekeningen", mapData.Name); }