Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs =================================================================== diff -u -rf9e4051a952ce1fce47f78c3b5ec1f1c01b70073 -rc11536a43d4ade2dcb3ceb0139f37184ab9bbdce --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs (.../StabilityPointStructuresFailureMechanismView.cs) (revision f9e4051a952ce1fce47f78c3b5ec1f1c01b70073) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs (.../StabilityPointStructuresFailureMechanismView.cs) (revision c11536a43d4ade2dcb3ceb0139f37184ab9bbdce) @@ -35,7 +35,6 @@ using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Forms.Factories; using Ringtoets.StabilityPointStructures.Data; -using Ringtoets.StabilityPointStructures.Forms.PresentationObjects; using StabilityPointStructuresDataResources = Ringtoets.StabilityPointStructures.Data.Properties.Resources; namespace Ringtoets.StabilityPointStructures.Forms.Views @@ -45,7 +44,6 @@ /// public partial class StabilityPointStructuresFailureMechanismView : UserControl, IMapView { - private readonly MapDataCollection mapDataCollection; private readonly MapLineData referenceLineMapData; private readonly MapLineData sectionsMapData; private readonly MapPointData sectionsStartPointMapData; @@ -67,8 +65,6 @@ private RecursiveObserver foreshoreProfileObserver; private RecursiveObserver, StabilityPointStructure> structureObserver; - private StabilityPointStructuresFailureMechanismContext data; - /// /// Creates a new instance of . /// @@ -95,7 +91,7 @@ CreateObservers(); - mapDataCollection = new MapDataCollection(StabilityPointStructuresDataResources.StabilityPointStructuresFailureMechanism_DisplayName); + var mapDataCollection = new MapDataCollection(StabilityPointStructuresDataResources.StabilityPointStructuresFailureMechanism_DisplayName); referenceLineMapData = RingtoetsMapDataFactory.CreateReferenceLineMapData(); hydraulicBoundaryLocationsMapData = RingtoetsMapDataFactory.CreateHydraulicBoundaryLocationsMapData(); foreshoreProfilesMapData = RingtoetsMapDataFactory.CreateForeshoreProfileMapData(); @@ -128,53 +124,8 @@ /// public IAssessmentSection AssessmentSection { get; } - public object Data - { - get - { - return data; - } - set - { - data = value as StabilityPointStructuresFailureMechanismContext; + 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.StabilityPointStructures; - structureObserver.Observable = data.WrappedData.StabilityPointStructures; - 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/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs =================================================================== diff -u -r8e761caf9d9a0440b655a16a3c4b25d7fb87f5c2 -rc11536a43d4ade2dcb3ceb0139f37184ab9bbdce --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs (.../StabilityPointStructuresFailureMechanismViewTest.cs) (revision 8e761caf9d9a0440b655a16a3c4b25d7fb87f5c2) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs (.../StabilityPointStructuresFailureMechanismViewTest.cs) (revision c11536a43d4ade2dcb3ceb0139f37184ab9bbdce) @@ -39,7 +39,6 @@ using Ringtoets.Common.Forms.Views; using Ringtoets.StabilityPointStructures.Data; using Ringtoets.StabilityPointStructures.Data.TestUtil; -using Ringtoets.StabilityPointStructures.Forms.PresentationObjects; using Ringtoets.StabilityPointStructures.Forms.Views; namespace Ringtoets.StabilityPointStructures.Forms.Test.Views @@ -103,118 +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_StabilityPointStructuresFailureMechanismContext_DataSet() + public void Constructor_AssessmentSectionWithBackgroundData_BackgroundDataSet() { // Setup - using (var view = new StabilityPointStructuresFailureMechanismView(new StabilityPointStructuresFailureMechanism(), new ObservableTestAssessmentSectionStub())) - { - var assessmentSection = new ObservableTestAssessmentSectionStub(); - - var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext( - new StabilityPointStructuresFailureMechanism(), assessmentSection); - - // Call - view.Data = failureMechanismContext; - - // Assert - Assert.AreSame(failureMechanismContext, view.Data); - } - } - - [Test] - public void Data_OtherThanStabilityPointStructuresFailureMechanismContext_DataNull() - { - // Setup - using (var view = new StabilityPointStructuresFailureMechanismView(new StabilityPointStructuresFailureMechanism(), 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 StabilityPointStructuresFailureMechanismView(new StabilityPointStructuresFailureMechanism(), assessmentSection)) { - var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext( - new StabilityPointStructuresFailureMechanism(), 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 StabilityPointStructuresFailureMechanismView(new StabilityPointStructuresFailureMechanism(), assessmentSection)) - { - var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext( - new StabilityPointStructuresFailureMechanism(), 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_EmptyStabilityPointStructuresFailureMechanismContext_NoMapDataSet() - { - // Setup - var assessmentSection = new ObservableTestAssessmentSectionStub(); - - using (var view = new StabilityPointStructuresFailureMechanismView(new StabilityPointStructuresFailureMechanism(), assessmentSection)) - { - var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext( - new StabilityPointStructuresFailureMechanism(), 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_StabilityPointStructuresFailureMechanismContext_DataUpdatedToCollectionOfFilledMapData() - { - // Setup var calculationA = new StructuresCalculation { InputParameters = @@ -284,18 +195,12 @@ ReferenceLine = referenceLine }; + // Call using (var view = new StabilityPointStructuresFailureMechanismView(failureMechanism, assessmentSection)) { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(failureMechanism, assessmentSection); - - // Call - view.Data = failureMechanismContext; - // Assert - Assert.AreSame(failureMechanismContext, view.Data); - MapDataCollection mapData = map.Data; Assert.IsInstanceOf(mapData); @@ -333,10 +238,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(new StabilityPointStructuresFailureMechanism(), assessmentSection); - - view.Data = failureMechanismContext; - MapData hydraulicBoundaryLocationsMapData = map.Data.Collection.ElementAt(hydraulicBoundaryLocationsIndex); // Precondition @@ -372,10 +273,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(new StabilityPointStructuresFailureMechanism(), assessmentSection); - - view.Data = failureMechanismContext; - MapData hydraulicBoundaryLocationsMapData = map.Data.Collection.ElementAt(hydraulicBoundaryLocationsIndex); // Precondition @@ -417,10 +314,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(new StabilityPointStructuresFailureMechanism(), assessmentSection); - - view.Data = failureMechanismContext; - MapData referenceLineMapData = map.Data.Collection.ElementAt(referenceLineIndex); // Precondition @@ -448,11 +341,7 @@ using (var view = new StabilityPointStructuresFailureMechanismView(failureMechanism, new ObservableTestAssessmentSectionStub())) { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - - var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(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); @@ -482,7 +371,6 @@ new Point2D(1, 1) }); - var failureMechanism = new StabilityPointStructuresFailureMechanism(); failureMechanism.ForeshoreProfiles.AddRange(new[] { @@ -492,9 +380,6 @@ using (var view = new StabilityPointStructuresFailureMechanismView(failureMechanism, new ObservableTestAssessmentSectionStub())) { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - - var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub()); - view.Data = failureMechanismContext; MapData foreshoreProfileData = map.Data.Collection.ElementAt(foreshoreProfilesIndex); @@ -533,10 +418,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub()); - - view.Data = failureMechanismContext; - MapData foreshoreProfileData = map.Data.Collection.ElementAt(foreshoreProfilesIndex); // Precondition @@ -573,11 +454,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(failureMechanism, - new ObservableTestAssessmentSectionStub()); - - view.Data = failureMechanismContext; - MapData structuresData = map.Data.Collection.ElementAt(structuresIndex); // Precondition @@ -609,11 +485,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(failureMechanism, - new ObservableTestAssessmentSectionStub()); - - view.Data = failureMechanismContext; - MapData structuresData = map.Data.Collection.ElementAt(structuresIndex); // Precondition @@ -653,9 +524,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub()); - view.Data = failureMechanismContext; - var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex); // Precondition @@ -698,9 +566,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub()); - view.Data = failureMechanismContext; - var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex); // Precondition @@ -734,9 +599,6 @@ using (var view = new StabilityPointStructuresFailureMechanismView(failureMechanism, new ObservableTestAssessmentSectionStub())) { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - - var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub()); - view.Data = failureMechanismContext; var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex); @@ -773,10 +635,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(failureMechanism, assessmentSection); - - view.Data = failureMechanismContext; - MapDataCollection mapData = map.Data; var dataToMove = (MapLineData) map.Data.Collection.ElementAt(referenceLineIndex); @@ -849,40 +707,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 oldStabilityPointStructuresFailureMechanismContext = new StabilityPointStructuresFailureMechanismContext(new StabilityPointStructuresFailureMechanism(), oldAssessmentSection); - var newStabilityPointStructuresFailureMechanismContext = new StabilityPointStructuresFailureMechanismContext(new StabilityPointStructuresFailureMechanism(), newAssessmentSection); - using (var view = new StabilityPointStructuresFailureMechanismView(new StabilityPointStructuresFailureMechanism(), oldAssessmentSection)) - { - IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - - view.Data = oldStabilityPointStructuresFailureMechanismContext; - view.Data = newStabilityPointStructuresFailureMechanismContext; - 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); @@ -903,6 +727,7 @@ calculation.InputParameters.HydraulicBoundaryLocation.Location }, geometries[0].PointCollections.First()); } + Assert.AreEqual("Berekeningen", mapData.Name); }