Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs =================================================================== diff -u -rc11536a43d4ade2dcb3ceb0139f37184ab9bbdce -r937968b44037ca18425f578d1d9dcad45f3c821e --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs (.../StabilityPointStructuresFailureMechanismView.cs) (revision c11536a43d4ade2dcb3ceb0139f37184ab9bbdce) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs (.../StabilityPointStructuresFailureMechanismView.cs) (revision 937968b44037ca18425f578d1d9dcad45f3c821e) @@ -158,88 +158,165 @@ private void CreateObservers() { - failureMechanismObserver = new Observer(UpdateMapData) + failureMechanismObserver = new Observer(UpdateSectionsMapData) { Observable = FailureMechanism }; - assessmentSectionObserver = new Observer(UpdateMapData) + assessmentSectionObserver = new Observer(UpdateReferenceLineMapData) { Observable = AssessmentSection }; - hydraulicBoundaryLocationsObserver = new Observer(UpdateMapData) + hydraulicBoundaryLocationsObserver = new Observer(UpdateHydraulicBoundaryLocationsMapData) { Observable = AssessmentSection.HydraulicBoundaryDatabase.Locations }; - foreshoreProfilesObserver = new Observer(UpdateMapData) + foreshoreProfilesObserver = new Observer(UpdateForeshoreProfilesMapData) { Observable = FailureMechanism.ForeshoreProfiles }; - structuresObserver = new Observer(UpdateMapData) + structuresObserver = new Observer(UpdateStructuresMapData) { Observable = FailureMechanism.StabilityPointStructures }; hydraulicBoundaryLocationObserver = new RecursiveObserver, HydraulicBoundaryLocation>( - UpdateMapData, hbl => hbl) + UpdateHydraulicBoundaryLocationsMapData, hbl => hbl) { Observable = AssessmentSection.HydraulicBoundaryDatabase.Locations }; calculationInputObserver = new RecursiveObserver( - UpdateMapData, pcg => pcg.Children.Concat(pcg.Children.OfType>().Select(pc => pc.InputParameters))) + UpdateCalculationsMapData, pcg => pcg.Children.Concat(pcg.Children.OfType>() + .Select(pc => pc.InputParameters))) { Observable = FailureMechanism.CalculationsGroup }; - calculationGroupObserver = new RecursiveObserver(UpdateMapData, pcg => pcg.Children) + calculationGroupObserver = new RecursiveObserver(UpdateCalculationsMapData, pcg => pcg.Children) { Observable = FailureMechanism.CalculationsGroup }; - calculationObserver = new RecursiveObserver>(UpdateMapData, pcg => pcg.Children) + calculationObserver = new RecursiveObserver>(UpdateCalculationsMapData, pcg => pcg.Children) { Observable = FailureMechanism.CalculationsGroup }; - foreshoreProfileObserver = new RecursiveObserver(UpdateMapData, coll => coll) + foreshoreProfileObserver = new RecursiveObserver(UpdateForeshoreProfilesMapData, coll => coll) { Observable = FailureMechanism.ForeshoreProfiles }; - structureObserver = new RecursiveObserver, StabilityPointStructure>(UpdateMapData, coll => coll) + structureObserver = new RecursiveObserver, StabilityPointStructure>(UpdateStructuresMapData, coll => coll) { Observable = FailureMechanism.StabilityPointStructures }; } - private void UpdateMapData() + private void SetMapDataFeatures() { - SetMapDataFeatures(); + SetReferenceLineMapData(); + SetSectionsMapData(); + SetHydraulicBoundaryLocationsMapData(); + SetForeshoreProfilesMapData(); + SetStructuresMapData(); + SetCalculationsMapData(); + } + #region Calculations MapData + + private void UpdateCalculationsMapData() + { + SetCalculationsMapData(); + calculationsMapData.NotifyObservers(); + } + + private void SetCalculationsMapData() + { + IEnumerable> calculations = + FailureMechanism.CalculationsGroup.GetCalculations().Cast>(); + calculationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateStructureCalculationsFeatures(calculations); + } + + #endregion + + #region HydraulicBoundaryLocations MapData + + private void UpdateHydraulicBoundaryLocationsMapData() + { + SetHydraulicBoundaryLocationsMapData(); + hydraulicBoundaryLocationsMapData.NotifyObservers(); + } + + private void SetHydraulicBoundaryLocationsMapData() + { + hydraulicBoundaryLocationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(AssessmentSection.HydraulicBoundaryDatabase); + } + + #endregion + + #region ReferenceLine MapData + + private void UpdateReferenceLineMapData() + { + SetReferenceLineMapData(); referenceLineMapData.NotifyObservers(); + } + + private void SetReferenceLineMapData() + { + ReferenceLine referenceLine = AssessmentSection.ReferenceLine; + referenceLineMapData.Features = RingtoetsMapDataFeaturesFactory.CreateReferenceLineFeatures(referenceLine, AssessmentSection.Id, AssessmentSection.Name); + } + + #endregion + + #region Sections MapData + + private void UpdateSectionsMapData() + { + SetSectionsMapData(); sectionsMapData.NotifyObservers(); sectionsStartPointMapData.NotifyObservers(); sectionsEndPointMapData.NotifyObservers(); - hydraulicBoundaryLocationsMapData.NotifyObservers(); - foreshoreProfilesMapData.NotifyObservers(); - structuresMapData.NotifyObservers(); - calculationsMapData.NotifyObservers(); } - private void SetMapDataFeatures() + private void SetSectionsMapData() { - ReferenceLine referenceLine = AssessmentSection.ReferenceLine; IEnumerable failureMechanismSections = FailureMechanism.Sections; - HydraulicBoundaryDatabase hydraulicBoundaryDatabase = AssessmentSection.HydraulicBoundaryDatabase; - IEnumerable foreshoreProfiles = FailureMechanism.ForeshoreProfiles; - IEnumerable structures = FailureMechanism.StabilityPointStructures; - IEnumerable> calculations = - FailureMechanism.CalculationsGroup.GetCalculations().Cast>(); - referenceLineMapData.Features = RingtoetsMapDataFeaturesFactory.CreateReferenceLineFeatures(referenceLine, AssessmentSection.Id, AssessmentSection.Name); sectionsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionFeatures(failureMechanismSections); sectionsStartPointMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionStartPointFeatures(failureMechanismSections); sectionsEndPointMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionEndPointFeatures(failureMechanismSections); - hydraulicBoundaryLocationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateHydraulicBoundaryDatabaseFeatures(hydraulicBoundaryDatabase); - foreshoreProfilesMapData.Features = RingtoetsMapDataFeaturesFactory.CreateForeshoreProfilesFeatures(foreshoreProfiles); + } + + #endregion + + #region Structures MapData + + private void UpdateStructuresMapData() + { + SetStructuresMapData(); + structuresMapData.NotifyObservers(); + } + + private void SetStructuresMapData() + { + IEnumerable structures = FailureMechanism.StabilityPointStructures; structuresMapData.Features = RingtoetsMapDataFeaturesFactory.CreateStructuresFeatures(structures); - calculationsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateStructureCalculationsFeatures - (calculations); } + + #endregion + + #region Foreshore Profiles MapData + + private void UpdateForeshoreProfilesMapData() + { + SetForeshoreProfilesMapData(); + foreshoreProfilesMapData.NotifyObservers(); + } + + private void SetForeshoreProfilesMapData() + { + IEnumerable foreshoreProfiles = FailureMechanism.ForeshoreProfiles; + foreshoreProfilesMapData.Features = RingtoetsMapDataFeaturesFactory.CreateForeshoreProfilesFeatures(foreshoreProfiles); + } + + #endregion } } \ No newline at end of file Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs =================================================================== diff -u -rc11536a43d4ade2dcb3ceb0139f37184ab9bbdce -r937968b44037ca18425f578d1d9dcad45f3c821e --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs (.../StabilityPointStructuresFailureMechanismViewTest.cs) (revision c11536a43d4ade2dcb3ceb0139f37184ab9bbdce) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs (.../StabilityPointStructuresFailureMechanismViewTest.cs) (revision 937968b44037ca18425f578d1d9dcad45f3c821e) @@ -23,6 +23,7 @@ using System.Collections.Generic; using System.Linq; using System.Windows.Forms; +using Core.Common.Base; using Core.Common.Base.Geometry; using Core.Components.Gis.Data; using Core.Components.Gis.Features; @@ -238,6 +239,11 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; + var mocks = new MockRepository(); + IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); + observers[hydraulicBoundaryLocationsIndex].Expect(obs => obs.UpdateObserver()); + mocks.ReplayAll(); + MapData hydraulicBoundaryLocationsMapData = map.Data.Collection.ElementAt(hydraulicBoundaryLocationsIndex); // Precondition @@ -249,6 +255,7 @@ // Then MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(assessmentSection.HydraulicBoundaryDatabase.Locations, hydraulicBoundaryLocationsMapData); + mocks.VerifyAll(); } } @@ -273,6 +280,11 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; + var mocks = new MockRepository(); + IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); + observers[hydraulicBoundaryLocationsIndex].Expect(obs => obs.UpdateObserver()); + mocks.ReplayAll(); + MapData hydraulicBoundaryLocationsMapData = map.Data.Collection.ElementAt(hydraulicBoundaryLocationsIndex); // Precondition @@ -293,6 +305,7 @@ // Then MapDataTestHelper.AssertHydraulicBoundaryLocationOutputsMapData(assessmentSection.HydraulicBoundaryDatabase.Locations, hydraulicBoundaryLocationsMapData); + mocks.VerifyAll(); } } @@ -314,6 +327,11 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; + var mocks = new MockRepository(); + IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); + observers[referenceLineIndex].Expect(obs => obs.UpdateObserver()); + mocks.ReplayAll(); + MapData referenceLineMapData = map.Data.Collection.ElementAt(referenceLineIndex); // Precondition @@ -329,6 +347,7 @@ // Then MapDataTestHelper.AssertReferenceLineMapData(assessmentSection.ReferenceLine, referenceLineMapData); + mocks.VerifyAll(); } } @@ -342,6 +361,13 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; + var mocks = new MockRepository(); + IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); + observers[sectionsIndex].Expect(obs => obs.UpdateObserver()); + observers[sectionsStartPointIndex].Expect(obs => obs.UpdateObserver()); + observers[sectionsEndPointIndex].Expect(obs => obs.UpdateObserver()); + mocks.ReplayAll(); + var sectionMapData = (MapLineData) map.Data.Collection.ElementAt(sectionsIndex); var sectionStartsMapData = (MapPointData) map.Data.Collection.ElementAt(sectionsStartPointIndex); var sectionsEndsMapData = (MapPointData) map.Data.Collection.ElementAt(sectionsEndPointIndex); @@ -358,6 +384,7 @@ MapDataTestHelper.AssertFailureMechanismSectionsMapData(failureMechanism.Sections, sectionMapData); MapDataTestHelper.AssertFailureMechanismSectionsStartPointMapData(failureMechanism.Sections, sectionStartsMapData); MapDataTestHelper.AssertFailureMechanismSectionsEndPointMapData(failureMechanism.Sections, sectionsEndsMapData); + mocks.VerifyAll(); } } @@ -381,6 +408,11 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; + var mocks = new MockRepository(); + IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); + observers[foreshoreProfilesIndex].Expect(obs => obs.UpdateObserver()); + mocks.ReplayAll(); + MapData foreshoreProfileData = map.Data.Collection.ElementAt(foreshoreProfilesIndex); // Precondition @@ -397,6 +429,7 @@ // Then MapDataTestHelper.AssertForeshoreProfilesMapData(failureMechanism.ForeshoreProfiles, foreshoreProfileData); + mocks.VerifyAll(); } } @@ -418,6 +451,11 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; + var mocks = new MockRepository(); + IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); + observers[foreshoreProfilesIndex].Expect(obs => obs.UpdateObserver()); + mocks.ReplayAll(); + MapData foreshoreProfileData = map.Data.Collection.ElementAt(foreshoreProfilesIndex); // Precondition @@ -436,6 +474,7 @@ // Then MapDataTestHelper.AssertForeshoreProfilesMapData(failureMechanism.ForeshoreProfiles, foreshoreProfileData); + mocks.VerifyAll(); } } @@ -454,6 +493,11 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; + var mocks = new MockRepository(); + IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); + observers[structuresIndex].Expect(obs => obs.UpdateObserver()); + mocks.ReplayAll(); + MapData structuresData = map.Data.Collection.ElementAt(structuresIndex); // Precondition @@ -467,6 +511,7 @@ // Then MapDataTestHelper.AssertStructuresMapData(failureMechanism.StabilityPointStructures, structuresData); + mocks.VerifyAll(); } } @@ -485,6 +530,11 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; + var mocks = new MockRepository(); + IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); + observers[structuresIndex].Expect(obs => obs.UpdateObserver()); + mocks.ReplayAll(); + MapData structuresData = map.Data.Collection.ElementAt(structuresIndex); // Precondition @@ -502,6 +552,7 @@ // Then MapDataTestHelper.AssertStructuresMapData(failureMechanism.StabilityPointStructures, structuresData); + mocks.VerifyAll(); } } @@ -524,6 +575,11 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; + var mocks = new MockRepository(); + IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); + observers[calculationsIndex].Expect(obs => obs.UpdateObserver()); + mocks.ReplayAll(); + var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex); // Precondition @@ -544,6 +600,7 @@ // Then AssertCalculationsMapData(failureMechanism.Calculations.Cast>(), calculationMapData); + mocks.VerifyAll(); } } @@ -566,6 +623,11 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; + var mocks = new MockRepository(); + IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); + observers[calculationsIndex].Expect(obs => obs.UpdateObserver()); + mocks.ReplayAll(); + var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex); // Precondition @@ -578,6 +640,7 @@ // Then AssertCalculationsMapData(failureMechanism.Calculations.Cast>(), calculationMapData); + mocks.VerifyAll(); } } @@ -600,6 +663,11 @@ { IMapControl map = ((RingtoetsMapControl) view.Controls[0]).MapControl; + var mocks = new MockRepository(); + IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); + observers[calculationsIndex].Expect(obs => obs.UpdateObserver()); + mocks.ReplayAll(); + var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex); // Precondition @@ -612,6 +680,7 @@ // Then AssertCalculationsMapData(failureMechanism.Calculations.Cast>(), calculationMapData); + mocks.VerifyAll(); } } @@ -766,5 +835,53 @@ Assert.AreEqual("Hydraulische randvoorwaarden", hydraulicBoundaryLocationsMapData.Name); Assert.AreEqual("Berekeningen", calculationsMapData.Name); } + + /// + /// Attaches mocked observers to all map data components. + /// + /// The . + /// The map data collection containing the + /// elements. + /// An array of mocked observers attached to the data in . + private static IObserver[] AttachMapDataObservers(MockRepository mocks, IEnumerable mapData) + { + MapData[] mapDataArray = mapData.ToArray(); + + var referenceLineMapDataObserver = mocks.StrictMock(); + mapDataArray[referenceLineIndex].Attach(referenceLineMapDataObserver); + + var sectionsMapDataObserver = mocks.StrictMock(); + mapDataArray[sectionsIndex].Attach(sectionsMapDataObserver); + + var sectionsStartPointMapDataObserver = mocks.StrictMock(); + mapDataArray[sectionsStartPointIndex].Attach(sectionsStartPointMapDataObserver); + + var sectionsEndPointMapDataObserver = mocks.StrictMock(); + mapDataArray[sectionsEndPointIndex].Attach(sectionsEndPointMapDataObserver); + + var hydraulicBoundaryLocationsMapDataObserver = mocks.StrictMock(); + mapDataArray[hydraulicBoundaryLocationsIndex].Attach(hydraulicBoundaryLocationsMapDataObserver); + + var foreshoreProfilesMapDataObserver = mocks.StrictMock(); + mapDataArray[foreshoreProfilesIndex].Attach(foreshoreProfilesMapDataObserver); + + var structuresMapDataObserver = mocks.StrictMock(); + mapDataArray[structuresIndex].Attach(structuresMapDataObserver); + + var calculationsMapDataObserver = mocks.StrictMock(); + mapDataArray[calculationsIndex].Attach(calculationsMapDataObserver); + + return new[] + { + referenceLineMapDataObserver, + sectionsMapDataObserver, + sectionsStartPointMapDataObserver, + sectionsEndPointMapDataObserver, + hydraulicBoundaryLocationsMapDataObserver, + foreshoreProfilesMapDataObserver, + structuresMapDataObserver, + calculationsMapDataObserver + }; + } } } \ No newline at end of file