Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs =================================================================== diff -u -r2988d7cede0cda06700557f2f621b70dd0a9aec4 -r1da3afdee9bf535e09063ac003a188f95669d94b --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs (.../ClosingStructuresFailureMechanismView.cs) (revision 2988d7cede0cda06700557f2f621b70dd0a9aec4) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs (.../ClosingStructuresFailureMechanismView.cs) (revision 1da3afdee9bf535e09063ac003a188f95669d94b) @@ -27,7 +27,6 @@ using Core.Components.Gis.Data; using Core.Components.Gis.Forms; using Ringtoets.ClosingStructures.Data; -using Ringtoets.ClosingStructures.Forms.PresentationObjects; using Ringtoets.Common.Data; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Calculation; @@ -45,7 +44,6 @@ /// public partial class ClosingStructuresFailureMechanismView : 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, ClosingStructure> structureObserver; - private ClosingStructuresFailureMechanismContext data; - /// /// Creates a new instance of . /// @@ -95,7 +91,7 @@ CreateObservers(); - mapDataCollection = new MapDataCollection(ClosingStructuresDataResources.ClosingStructuresFailureMechanism_DisplayName); + var mapDataCollection = new MapDataCollection(ClosingStructuresDataResources.ClosingStructuresFailureMechanism_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 ClosingStructuresFailureMechanismContext; + 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.ClosingStructures; - structureObserver.Observable = data.WrappedData.ClosingStructures; - 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/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs =================================================================== diff -u -ref03fd73ab6ec035d4b01f0efe8a07914262227e -r1da3afdee9bf535e09063ac003a188f95669d94b --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs (.../ClosingStructuresFailureMechanismViewTest.cs) (revision ef03fd73ab6ec035d4b01f0efe8a07914262227e) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs (.../ClosingStructuresFailureMechanismViewTest.cs) (revision 1da3afdee9bf535e09063ac003a188f95669d94b) @@ -32,7 +32,6 @@ using Rhino.Mocks; using Ringtoets.ClosingStructures.Data; using Ringtoets.ClosingStructures.Data.TestUtil; -using Ringtoets.ClosingStructures.Forms.PresentationObjects; using Ringtoets.ClosingStructures.Forms.Views; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.FailureMechanism; @@ -110,112 +109,22 @@ } [Test] - public void Data_ClosingStructuresFailureMechanismContext_DataSet() + public void Constructor_AssessmentSectionWithBackgroundData_BackgroundDataSet() { // Setup - var assessmentSection = new ObservableTestAssessmentSectionStub(); - - using (var view = new ClosingStructuresFailureMechanismView(new ClosingStructuresFailureMechanism(), assessmentSection)) - { - var failureMechanismContext = new ClosingStructuresFailureMechanismContext( - new ClosingStructuresFailureMechanism(), assessmentSection); - - // Call - view.Data = failureMechanismContext; - - // Assert - Assert.AreSame(failureMechanismContext, view.Data); - } - } - - [Test] - public void Data_AssessmentSectionWithBackgroundData_BackgroundDataSet() - { - // Setup IAssessmentSection assessmentSection = new ObservableTestAssessmentSectionStub(); + // Call using (var view = new ClosingStructuresFailureMechanismView(new ClosingStructuresFailureMechanism(), assessmentSection)) { - var failureMechanismContext = new ClosingStructuresFailureMechanismContext( - new ClosingStructuresFailureMechanism(), assessmentSection); - - // Call - view.Data = failureMechanismContext; - // Assert MapDataTestHelper.AssertImageBasedMapData(assessmentSection.BackgroundData, view.Map.BackgroundMapData); } } [Test] - public void Data_OtherThanClosingStructuresFailureMechanismContext_DataNull() + public void Constructor_WithAllData_DataUpdatedToCollectionOfFilledMapData() { - // Setup - using (var view = new ClosingStructuresFailureMechanismView(new ClosingStructuresFailureMechanism(), new ObservableTestAssessmentSectionStub())) - { - var data = new object(); - - // Call - view.Data = data; - - // Assert - Assert.IsNull(view.Data); - } - } - - [Test] - public void Data_SetToNull_MapDataCleared() - { - // Setup - using (var view = new ClosingStructuresFailureMechanismView(new ClosingStructuresFailureMechanism(), new ObservableTestAssessmentSectionStub())) - { - var assessmentSection = new ObservableTestAssessmentSectionStub(); - - var failureMechanismContext = new ClosingStructuresFailureMechanismContext( - new ClosingStructuresFailureMechanism(), - 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_EmptyClosingStructuresFailureMechanismContext_NoMapDataSet() - { - // Setup - using (var view = new ClosingStructuresFailureMechanismView(new ClosingStructuresFailureMechanism(), new ObservableTestAssessmentSectionStub())) - { - var assessmentSection = new ObservableTestAssessmentSectionStub(); - - var failureMechanismContext = new ClosingStructuresFailureMechanismContext( - new ClosingStructuresFailureMechanism(), - 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_ClosingStructuresFailureMechanismContext_DataUpdatedToCollectionOfFilledMapData() - { // Setup var calculationA = new StructuresCalculation { @@ -285,18 +194,12 @@ ReferenceLine = referenceLine }; + // Call using (var view = new ClosingStructuresFailureMechanismView(failureMechanism, assessmentSection)) { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, assessmentSection); - - // Call - view.Data = failureMechanismContext; - // Assert - Assert.AreSame(failureMechanismContext, view.Data); - MapDataCollection mapData = map.Data; Assert.IsInstanceOf(mapData); @@ -334,10 +237,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new ClosingStructuresFailureMechanismContext(new ClosingStructuresFailureMechanism(), assessmentSection); - - view.Data = failureMechanismContext; - MapData hydraulicBoundaryLocationsMapData = map.Data.Collection.ElementAt(hydraulicBoundaryLocationsIndex); // Precondition @@ -373,10 +272,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new ClosingStructuresFailureMechanismContext(new ClosingStructuresFailureMechanism(), assessmentSection); - - view.Data = failureMechanismContext; - MapData hydraulicBoundaryLocationsMapData = map.Data.Collection.ElementAt(hydraulicBoundaryLocationsIndex); // Precondition @@ -418,10 +313,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new ClosingStructuresFailureMechanismContext(new ClosingStructuresFailureMechanism(), assessmentSection); - - view.Data = failureMechanismContext; - MapData referenceLineMapData = map.Data.Collection.ElementAt(referenceLineIndex); // Precondition @@ -450,10 +341,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new ClosingStructuresFailureMechanismContext(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); @@ -492,10 +379,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub()); - - view.Data = failureMechanismContext; - MapData foreshoreProfileData = map.Data.Collection.ElementAt(foreshoreProfilesIndex); // Precondition @@ -533,10 +416,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub()); - - view.Data = failureMechanismContext; - MapData foreshoreProfileData = map.Data.Collection.ElementAt(foreshoreProfilesIndex); // Precondition @@ -572,10 +451,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub()); - - view.Data = failureMechanismContext; - MapData structuresData = map.Data.Collection.ElementAt(structuresIndex); // Precondition @@ -606,11 +481,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, - new ObservableTestAssessmentSectionStub()); - - view.Data = failureMechanismContext; - MapData structuresData = map.Data.Collection.ElementAt(structuresIndex); // Precondition @@ -649,10 +519,7 @@ using (var view = new ClosingStructuresFailureMechanismView(failureMechanism, new ObservableTestAssessmentSectionStub())) { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub()); - view.Data = failureMechanismContext; - var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex); // Precondition @@ -696,10 +563,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub()); - - view.Data = failureMechanismContext; - var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex); // Precondition @@ -735,10 +598,6 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub()); - - view.Data = failureMechanismContext; - var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex); // Precondition @@ -772,11 +631,7 @@ using (var view = new ClosingStructuresFailureMechanismView(new ClosingStructuresFailureMechanism(), assessmentSection)) { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - var failureMechanism = new ClosingStructuresFailureMechanism(); - var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, assessmentSection); - view.Data = failureMechanismContext; - MapDataCollection mapData = map.Data; var dataToMove = (MapLineData) map.Data.Collection.ElementAt(referenceLineIndex); @@ -849,40 +704,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 oldClosingStructuresFailureMechanismContext = new ClosingStructuresFailureMechanismContext(new ClosingStructuresFailureMechanism(), oldAssessmentSection); - var newClosingStructuresFailureMechanismContext = new ClosingStructuresFailureMechanismContext(new ClosingStructuresFailureMechanism(), newAssessmentSection); - using (var view = new ClosingStructuresFailureMechanismView(new ClosingStructuresFailureMechanism(), oldAssessmentSection)) - { - IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; - - view.Data = oldClosingStructuresFailureMechanismContext; - view.Data = newClosingStructuresFailureMechanismContext; - 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);