Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs =================================================================== diff -u -re9d34986f2e90e63bbf6ebba579c24055c1c3853 -r50a5a31ec15cff3b6df08b80b03659b7dba9ab9a --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs (.../ClosingStructuresFailureMechanismView.cs) (revision e9d34986f2e90e63bbf6ebba579c24055c1c3853) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs (.../ClosingStructuresFailureMechanismView.cs) (revision 50a5a31ec15cff3b6df08b80b03659b7dba9ab9a) @@ -92,6 +92,7 @@ calculationGroupObserver = new RecursiveObserver(UpdateCalculationsMapData, pcg => pcg.Children); calculationObserver = new RecursiveObserver>(UpdateCalculationsMapData, pcg => pcg.Children); foreshoreProfileObserver = new RecursiveObserver(UpdateForeshoreProfilesMapData, coll => coll); + foreshoreProfileObserver = new RecursiveObserver(UpdateMapData, coll => coll); mapDataCollection = new MapDataCollection(ClosingStructuresDataResources.ClosingStructuresFailureMechanism_DisplayName); referenceLineMapData = RingtoetsMapDataFactory.CreateReferenceLineMapData(); Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs =================================================================== diff -u -r970b9cc4f1ec36d6be67bcc2fb5ffdfe126044a2 -r50a5a31ec15cff3b6df08b80b03659b7dba9ab9a --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs (.../ClosingStructuresFailureMechanismViewTest.cs) (revision 970b9cc4f1ec36d6be67bcc2fb5ffdfe126044a2) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs (.../ClosingStructuresFailureMechanismViewTest.cs) (revision 50a5a31ec15cff3b6df08b80b03659b7dba9ab9a) @@ -22,14 +22,12 @@ 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; using Core.Components.Gis.Forms; using Core.Components.Gis.Geometries; using NUnit.Framework; -using Rhino.Mocks; using Ringtoets.ClosingStructures.Data; using Ringtoets.ClosingStructures.Data.TestUtil; using Ringtoets.ClosingStructures.Forms.PresentationObjects; @@ -332,18 +330,6 @@ view.Data = failureMechanismContext; - var mocks = new MockRepository(); - IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); - observers[referenceLineIndex].Expect(obs => obs.UpdateObserver()); - observers[sectionsIndex].Expect(obs => obs.UpdateObserver()); - observers[sectionsStartPointIndex].Expect(obs => obs.UpdateObserver()); - observers[sectionsEndPointIndex].Expect(obs => obs.UpdateObserver()); - observers[hydraulicBoundaryLocationsIndex].Expect(obs => obs.UpdateObserver()); - observers[foreshoreProfilesIndex].Expect(obs => obs.UpdateObserver()); - observers[structuresIndex].Expect(obs => obs.UpdateObserver()); - observers[calculationsIndex].Expect(obs => obs.UpdateObserver()); - mocks.ReplayAll(); - MapData hydraulicBoundaryLocationsMapData = map.Data.Collection.ElementAt(hydraulicBoundaryLocationsIndex); // Precondition @@ -355,7 +341,6 @@ // Assert MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(hydraulicBoundaryDatabase2.Locations, hydraulicBoundaryLocationsMapData); - mocks.VerifyAll(); } } @@ -384,11 +369,6 @@ view.Data = failureMechanismContext; - 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 @@ -400,7 +380,6 @@ // Assert MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(hydraulicBoundaryDatabase.Locations, hydraulicBoundaryLocationsMapData); - mocks.VerifyAll(); } } @@ -434,18 +413,6 @@ view.Data = new ClosingStructuresFailureMechanismContext(new ClosingStructuresFailureMechanism(), assessmentSection); - var mocks = new MockRepository(); - IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); - observers[referenceLineIndex].Expect(obs => obs.UpdateObserver()); - observers[sectionsIndex].Expect(obs => obs.UpdateObserver()); - observers[sectionsStartPointIndex].Expect(obs => obs.UpdateObserver()); - observers[sectionsEndPointIndex].Expect(obs => obs.UpdateObserver()); - observers[hydraulicBoundaryLocationsIndex].Expect(obs => obs.UpdateObserver()).Repeat.Twice(); - observers[foreshoreProfilesIndex].Expect(obs => obs.UpdateObserver()); - observers[structuresIndex].Expect(obs => obs.UpdateObserver()); - observers[calculationsIndex].Expect(obs => obs.UpdateObserver()); - mocks.ReplayAll(); - MapData hydraulicBoundaryLocationsMapData = map.Data.Collection.ElementAt(hydraulicBoundaryLocationsIndex); // Precondition @@ -459,7 +426,6 @@ // Then MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(newHydraulicBoundaryDatabase.Locations, hydraulicBoundaryLocationsMapData); - mocks.VerifyAll(); } } @@ -493,18 +459,6 @@ view.Data = failureMechanismContext; - var mocks = new MockRepository(); - IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); - observers[referenceLineIndex].Expect(obs => obs.UpdateObserver()); - observers[sectionsIndex].Expect(obs => obs.UpdateObserver()); - observers[sectionsStartPointIndex].Expect(obs => obs.UpdateObserver()); - observers[sectionsEndPointIndex].Expect(obs => obs.UpdateObserver()); - observers[hydraulicBoundaryLocationsIndex].Expect(obs => obs.UpdateObserver()); - observers[foreshoreProfilesIndex].Expect(obs => obs.UpdateObserver()); - observers[structuresIndex].Expect(obs => obs.UpdateObserver()); - observers[calculationsIndex].Expect(obs => obs.UpdateObserver()); - mocks.ReplayAll(); - MapData referenceLineMapData = map.Data.Collection.ElementAt(referenceLineIndex); // Precondition @@ -516,7 +470,6 @@ // Assert MapDataTestHelper.AssertReferenceLineMapData(assessmentSection.ReferenceLine, referenceLineMapData); - mocks.VerifyAll(); } } @@ -537,18 +490,6 @@ var sectionStartsMapData = (MapPointData) map.Data.Collection.ElementAt(sectionsStartPointIndex); var sectionsEndsMapData = (MapPointData) map.Data.Collection.ElementAt(sectionsEndPointIndex); - var mocks = new MockRepository(); - IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); - observers[referenceLineIndex].Expect(obs => obs.UpdateObserver()); - observers[sectionsIndex].Expect(obs => obs.UpdateObserver()); - observers[sectionsStartPointIndex].Expect(obs => obs.UpdateObserver()); - observers[sectionsEndPointIndex].Expect(obs => obs.UpdateObserver()); - observers[hydraulicBoundaryLocationsIndex].Expect(obs => obs.UpdateObserver()); - observers[foreshoreProfilesIndex].Expect(obs => obs.UpdateObserver()); - observers[structuresIndex].Expect(obs => obs.UpdateObserver()); - observers[calculationsIndex].Expect(obs => obs.UpdateObserver()); - mocks.ReplayAll(); - // Call failureMechanism.AddSection(new FailureMechanismSection(string.Empty, new[] { @@ -561,7 +502,6 @@ MapDataTestHelper.AssertFailureMechanismSectionsMapData(failureMechanism.Sections, sectionMapData); MapDataTestHelper.AssertFailureMechanismSectionsStartPointMapData(failureMechanism.Sections, sectionStartsMapData); MapDataTestHelper.AssertFailureMechanismSectionsEndPointMapData(failureMechanism.Sections, sectionsEndsMapData); - mocks.VerifyAll(); } } @@ -588,11 +528,6 @@ view.Data = failureMechanismContext; - 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 @@ -609,7 +544,6 @@ // Assert MapDataTestHelper.AssertForeshoreProfilesMapData(failureMechanism.ForeshoreProfiles, foreshoreProfileData); - mocks.VerifyAll(); } } @@ -635,11 +569,6 @@ view.Data = failureMechanismContext; - 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 @@ -658,7 +587,6 @@ // Assert MapDataTestHelper.AssertForeshoreProfilesMapData(failureMechanism.ForeshoreProfiles, foreshoreProfileData); - mocks.VerifyAll(); } } @@ -682,11 +610,6 @@ MapData structuresData = map.Data.Collection.ElementAt(structuresIndex); - var mocks = new MockRepository(); - IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); - observers[structuresIndex].Expect(obs => obs.UpdateObserver()); - mocks.ReplayAll(); - // Precondition AssertStructures(failureMechanism.ClosingStructures, structuresData); @@ -699,7 +622,6 @@ // Assert AssertStructures(failureMechanism.ClosingStructures, structuresData); - mocks.VerifyAll(); } } @@ -746,17 +668,11 @@ failureMechanism.CalculationsGroup.Children.Add(calculationB); - var mocks = new MockRepository(); - IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); - observers[calculationsIndex].Expect(obs => obs.UpdateObserver()); - mocks.ReplayAll(); - // Call failureMechanism.CalculationsGroup.NotifyObservers(); // Assert AssertCalculationsMapData(failureMechanism.Calculations.Cast>(), calculationMapData); - mocks.VerifyAll(); } } @@ -790,19 +706,13 @@ var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex); - var mocks = new MockRepository(); - IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); - observers[calculationsIndex].Expect(obs => obs.UpdateObserver()); - mocks.ReplayAll(); - calculationA.InputParameters.Structure = new TestClosingStructure(calculationLocationB); // Call calculationA.InputParameters.NotifyObservers(); // Assert AssertCalculationsMapData(failureMechanism.Calculations.Cast>(), calculationMapData); - mocks.VerifyAll(); } } @@ -835,19 +745,13 @@ var calculationMapData = (MapLineData) map.Data.Collection.ElementAt(calculationsIndex); - var mocks = new MockRepository(); - IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); - observers[calculationsIndex].Expect(obs => obs.UpdateObserver()); - mocks.ReplayAll(); - calculationA.Name = "new name"; // Call calculationA.NotifyObservers(); // Assert AssertCalculationsMapData(failureMechanism.Calculations.Cast>(), calculationMapData); - mocks.VerifyAll(); } } @@ -1056,53 +960,5 @@ 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