Fisheye: Tag 3f04e937728302a2f33c338fe8e8b619292dbd03 refers to a dead (removed) revision in file `Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Factories/DuneErosionAssemblyMapDataFeaturesFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneErosionFailurePathView.cs =================================================================== diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -r3f04e937728302a2f33c338fe8e8b619292dbd03 --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneErosionFailurePathView.cs (.../DuneErosionFailurePathView.cs) (revision dfd2e82406d3cafb83004a065b3ea1f943ced729) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneErosionFailurePathView.cs (.../DuneErosionFailurePathView.cs) (revision 3f04e937728302a2f33c338fe8e8b619292dbd03) @@ -23,11 +23,12 @@ using System.Collections.Generic; using Core.Common.Base; using Core.Components.Gis.Data; +using Riskeer.Common.Data.AssemblyTool; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Forms.Factories; +using Riskeer.Common.Forms.MapLayers; using Riskeer.DuneErosion.Data; -using Riskeer.DuneErosion.Forms.Factories; using DuneErosionDataResources = Riskeer.DuneErosion.Data.Properties.Resources; namespace Riskeer.DuneErosion.Forms.Views @@ -41,15 +42,10 @@ private MapPointData sectionsStartPointMapData; private MapPointData sectionsEndPointMapData; - private MapLineData simpleAssemblyMapData; - private MapLineData detailedAssemblyMapData; - private MapLineData tailorMadeAssemblyMapData; - private MapLineData combinedAssemblyMapData; + private NonCalculatableFailureMechanismSectionResultsMapLayer assemblyResultMapLayer; private Observer failureMechanismObserver; - private RecursiveObserver, DuneErosionFailureMechanismSectionResultOld> sectionResultObserver; - /// /// Creates a new instance of . /// @@ -63,9 +59,8 @@ protected override void Dispose(bool disposing) { failureMechanismObserver.Dispose(); + assemblyResultMapLayer.Dispose(); - sectionResultObserver.Dispose(); - base.Dispose(disposing); } @@ -77,12 +72,6 @@ { Observable = FailureMechanism }; - - sectionResultObserver = new RecursiveObserver, - DuneErosionFailureMechanismSectionResultOld>(UpdateAssemblyMapData, sr => sr) - { - Observable = FailureMechanism.SectionResultsOld - }; } protected override void CreateMapData() @@ -94,30 +83,22 @@ sectionsStartPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsStartPointMapData(); sectionsEndPointMapData = RiskeerMapDataFactory.CreateFailureMechanismSectionsEndPointMapData(); - MapDataCollection assemblyMapDataCollection = AssemblyMapDataFactory.CreateAssemblyMapDataCollection(); - tailorMadeAssemblyMapData = AssemblyMapDataFactory.CreateTailorMadeAssemblyMapData(); - detailedAssemblyMapData = AssemblyMapDataFactory.CreateDetailedAssemblyMapData(); - simpleAssemblyMapData = AssemblyMapDataFactory.CreateSimpleAssemblyMapData(); - combinedAssemblyMapData = AssemblyMapDataFactory.CreateCombinedAssemblyMapData(); + assemblyResultMapLayer = new NonCalculatableFailureMechanismSectionResultsMapLayer( + FailureMechanism, sr => FailureMechanismSectionAssemblyResultFactory.AssembleSection(sr, AssessmentSection)); sectionsMapDataCollection.Add(sectionsMapData); sectionsMapDataCollection.Add(sectionsStartPointMapData); sectionsMapDataCollection.Add(sectionsEndPointMapData); MapDataCollection.Insert(1, sectionsMapDataCollection); - assemblyMapDataCollection.Add(tailorMadeAssemblyMapData); - assemblyMapDataCollection.Add(detailedAssemblyMapData); - assemblyMapDataCollection.Add(simpleAssemblyMapData); - assemblyMapDataCollection.Add(combinedAssemblyMapData); - MapDataCollection.Insert(2, assemblyMapDataCollection); + MapDataCollection.Insert(2, assemblyResultMapLayer.MapData); } protected override void SetAllMapDataFeatures() { base.SetAllMapDataFeatures(); SetFailureMechanismMapData(); - SetAssemblyMapData(); } #region FailureMechanism MapData @@ -128,8 +109,6 @@ sectionsMapData.NotifyObservers(); sectionsStartPointMapData.NotifyObservers(); sectionsEndPointMapData.NotifyObservers(); - - UpdateAssemblyMapData(); } private void SetFailureMechanismMapData() @@ -141,26 +120,5 @@ } #endregion - - #region Assembly MapData - - private void UpdateAssemblyMapData() - { - SetAssemblyMapData(); - simpleAssemblyMapData.NotifyObservers(); - detailedAssemblyMapData.NotifyObservers(); - tailorMadeAssemblyMapData.NotifyObservers(); - combinedAssemblyMapData.NotifyObservers(); - } - - private void SetAssemblyMapData() - { - simpleAssemblyMapData.Features = DuneErosionAssemblyMapDataFeaturesFactory.CreateSimpleAssemblyFeatures(FailureMechanism); - detailedAssemblyMapData.Features = DuneErosionAssemblyMapDataFeaturesFactory.CreateDetailedAssemblyFeatures(FailureMechanism); - tailorMadeAssemblyMapData.Features = DuneErosionAssemblyMapDataFeaturesFactory.CreateTailorMadeAssemblyFeatures(FailureMechanism); - combinedAssemblyMapData.Features = DuneErosionAssemblyMapDataFeaturesFactory.CreateCombinedAssemblyFeatures(FailureMechanism); - } - - #endregion } } \ No newline at end of file Fisheye: Tag 3f04e937728302a2f33c338fe8e8b619292dbd03 refers to a dead (removed) revision in file `Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Factories/DuneErosionAssemblyMapDataFeaturesFactoryTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneErosionFailurePathViewTest.cs =================================================================== diff -u -r3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7 -r3f04e937728302a2f33c338fe8e8b619292dbd03 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneErosionFailurePathViewTest.cs (.../DuneErosionFailurePathViewTest.cs) (revision 3a4cc52eb9f7524ca64d6c2ab3a90230db2149c7) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneErosionFailurePathViewTest.cs (.../DuneErosionFailurePathViewTest.cs) (revision 3f04e937728302a2f33c338fe8e8b619292dbd03) @@ -59,18 +59,9 @@ private const int sectionsStartPointIndex = 1; private const int sectionsEndPointIndex = 2; - private const int tailorMadeAssemblyIndex = 0; - private const int detailedAssemblyIndex = 1; - private const int simpleAssemblyIndex = 2; - private const int combinedAssemblyIndex = 3; - private const int sectionsObserverIndex = 0; private const int sectionsStartPointObserverIndex = 1; private const int sectionsEndPointObserverIndex = 2; - private const int simpleAssemblyObserverIndex = 3; - private const int detailedAssemblyObserverIndex = 4; - private const int tailorMadeAssemblyObserverIndex = 5; - private const int combinedAssemblyObserverIndex = 6; private Form testForm; @@ -142,21 +133,15 @@ new FailureMechanismSection("C", geometryPoints.Skip(2).Take(2)) }); - var expectedSimpleAssembly = new FailureMechanismSectionAssemblyOld(random.NextDouble(), random.NextEnumValue()); - var expectedDetailedAssemblyCategory = random.NextEnumValue(); - var expectedTailorMadeAssemblyCategory = random.NextEnumValue(); - var expectedCombinedAssemblyCategory = random.NextEnumValue(); - - using (new AssemblyToolCalculatorFactoryConfigOld()) + using (new AssemblyToolCalculatorFactoryConfig()) { - var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismSectionAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; + var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; + var failureMechanismSectionAssemblyResult = new FailureMechanismSectionAssemblyResult( + random.NextDouble(), random.NextDouble(), random.NextDouble(), + random.NextEnumValue()); + calculator.FailureMechanismSectionAssemblyResultOutput = failureMechanismSectionAssemblyResult; - calculator.SimpleAssessmentAssemblyOutput = expectedSimpleAssembly; - calculator.DetailedAssessmentAssemblyGroupOutput = expectedDetailedAssemblyCategory; - calculator.TailorMadeAssemblyCategoryOutput = expectedTailorMadeAssemblyCategory; - calculator.CombinedAssemblyCategoryOutput = expectedCombinedAssemblyCategory; - // Call DuneErosionFailurePathView view = CreateView(failureMechanism, assessmentSection); @@ -177,18 +162,13 @@ AssertDuneLocationsMapData(failureMechanism, mapDataList[duneLocationsIndex]); - MapDataTestHelper.AssertAssemblyMapDataCollection(expectedSimpleAssembly.Group, - expectedDetailedAssemblyCategory, - expectedTailorMadeAssemblyCategory, - expectedCombinedAssemblyCategory, - (MapDataCollection) mapDataList[assemblyResultsIndex], - failureMechanism); + MapDataTestHelper.AssertAssemblyMapData(failureMechanism, failureMechanismSectionAssemblyResult, mapDataList[assemblyResultsIndex]); } } [Test] [Apartment(ApartmentState.STA)] - public void GivenViewWithFailureMechanismSectionsData_WhenFailureMechanismSectionsUpdatedAndNotified_ThenMapDataUpdated() + public void GivenViewWithFailureMechanismSectionsData_WhenFailureMechanismUpdatedAndNotified_ThenMapDataUpdated() { // Given var failureMechanism = new DuneErosionFailureMechanism(); @@ -207,10 +187,6 @@ observers[sectionsObserverIndex].Expect(obs => obs.UpdateObserver()); observers[sectionsStartPointObserverIndex].Expect(obs => obs.UpdateObserver()); observers[sectionsEndPointObserverIndex].Expect(obs => obs.UpdateObserver()); - observers[simpleAssemblyObserverIndex].Expect(obs => obs.UpdateObserver()); - observers[detailedAssemblyObserverIndex].Expect(obs => obs.UpdateObserver()); - observers[tailorMadeAssemblyObserverIndex].Expect(obs => obs.UpdateObserver()); - observers[combinedAssemblyObserverIndex].Expect(obs => obs.UpdateObserver()); mocks.ReplayAll(); // When @@ -233,148 +209,11 @@ [Test] [Apartment(ApartmentState.STA)] - public void GivenViewWithAssemblyData_WhenFailureMechanismNotified_ThenMapDataUpdated() - { - // Given - var random = new Random(39); - var failureMechanism = new DuneErosionFailureMechanism(); - FailureMechanismTestHelper.AddSections(failureMechanism, random.Next(1, 10)); - - var originalSimpleAssembly = new FailureMechanismSectionAssemblyOld(random.NextDouble(), random.NextEnumValue()); - var originalDetailedAssemblyCategory = random.NextEnumValue(); - var originalTailorMadeAssemblyCategory = random.NextEnumValue(); - var originalCombinedAssemblyCategory = random.NextEnumValue(); - - using (new AssemblyToolCalculatorFactoryConfigOld()) - { - var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismSectionAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; - - calculator.SimpleAssessmentAssemblyOutput = originalSimpleAssembly; - calculator.DetailedAssessmentAssemblyGroupOutput = originalDetailedAssemblyCategory; - calculator.TailorMadeAssemblyCategoryOutput = originalTailorMadeAssemblyCategory; - calculator.CombinedAssemblyCategoryOutput = originalCombinedAssemblyCategory; - - DuneErosionFailurePathView view = CreateView(failureMechanism, new AssessmentSectionStub()); - - IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl; - - var mocks = new MockRepository(); - IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); - observers[sectionsObserverIndex].Expect(obs => obs.UpdateObserver()); - observers[sectionsStartPointObserverIndex].Expect(obs => obs.UpdateObserver()); - observers[sectionsEndPointObserverIndex].Expect(obs => obs.UpdateObserver()); - observers[simpleAssemblyObserverIndex].Expect(obs => obs.UpdateObserver()); - observers[detailedAssemblyObserverIndex].Expect(obs => obs.UpdateObserver()); - observers[tailorMadeAssemblyObserverIndex].Expect(obs => obs.UpdateObserver()); - observers[combinedAssemblyObserverIndex].Expect(obs => obs.UpdateObserver()); - mocks.ReplayAll(); - - // Precondition - var assemblyMapData = (MapDataCollection) map.Data.Collection.ElementAt(assemblyResultsIndex); - MapDataTestHelper.AssertAssemblyMapDataCollection(originalSimpleAssembly.Group, - originalDetailedAssemblyCategory, - originalTailorMadeAssemblyCategory, - originalCombinedAssemblyCategory, - assemblyMapData, - failureMechanism); - - // When - var updatedSimpleAssembly = new FailureMechanismSectionAssemblyOld(random.NextDouble(), random.NextEnumValue()); - var updatedDetailedAssemblyCategory = random.NextEnumValue(); - var updatedTailorMadeAssemblyCategory = random.NextEnumValue(); - var updatedCombinedAssemblyCategory = random.NextEnumValue(); - calculator.SimpleAssessmentAssemblyOutput = updatedSimpleAssembly; - calculator.DetailedAssessmentAssemblyGroupOutput = updatedDetailedAssemblyCategory; - calculator.TailorMadeAssemblyCategoryOutput = updatedTailorMadeAssemblyCategory; - calculator.CombinedAssemblyCategoryOutput = updatedCombinedAssemblyCategory; - failureMechanism.NotifyObservers(); - - // Then - MapDataTestHelper.AssertAssemblyMapDataCollection(updatedSimpleAssembly.Group, - updatedDetailedAssemblyCategory, - updatedTailorMadeAssemblyCategory, - updatedCombinedAssemblyCategory, - assemblyMapData, - failureMechanism); - mocks.VerifyAll(); - } - } - - [Test] - [Apartment(ApartmentState.STA)] - public void GivenViewWithAssemblyData_WhenFailureMechanismSectionResultNotified_ThenMapDataUpdated() - { - // Given - var random = new Random(39); - var failureMechanism = new DuneErosionFailureMechanism(); - FailureMechanismTestHelper.AddSections(failureMechanism, random.Next(1, 10)); - - var originalSimpleAssembly = new FailureMechanismSectionAssemblyOld(random.NextDouble(), random.NextEnumValue()); - var originalDetailedAssemblyCategory = random.NextEnumValue(); - var originalTailorMadeAssemblyCategory = random.NextEnumValue(); - var originalCombinedAssemblyCategory = random.NextEnumValue(); - - using (new AssemblyToolCalculatorFactoryConfigOld()) - { - var calculatorFactory = (TestAssemblyToolCalculatorFactoryOld) AssemblyToolCalculatorFactoryOld.Instance; - FailureMechanismSectionAssemblyCalculatorOldStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator; - - calculator.SimpleAssessmentAssemblyOutput = originalSimpleAssembly; - calculator.DetailedAssessmentAssemblyGroupOutput = originalDetailedAssemblyCategory; - calculator.TailorMadeAssemblyCategoryOutput = originalTailorMadeAssemblyCategory; - calculator.CombinedAssemblyCategoryOutput = originalCombinedAssemblyCategory; - - DuneErosionFailurePathView view = CreateView(failureMechanism, new AssessmentSectionStub()); - - IMapControl map = ((RiskeerMapControl) view.Controls[0]).MapControl; - - var mocks = new MockRepository(); - IObserver[] observers = AttachMapDataObservers(mocks, map.Data.Collection); - observers[simpleAssemblyObserverIndex].Expect(obs => obs.UpdateObserver()); - observers[detailedAssemblyObserverIndex].Expect(obs => obs.UpdateObserver()); - observers[tailorMadeAssemblyObserverIndex].Expect(obs => obs.UpdateObserver()); - observers[combinedAssemblyObserverIndex].Expect(obs => obs.UpdateObserver()); - mocks.ReplayAll(); - - // Precondition - var assemblyMapData = (MapDataCollection) map.Data.Collection.ElementAt(assemblyResultsIndex); - MapDataTestHelper.AssertAssemblyMapDataCollection(originalSimpleAssembly.Group, - originalDetailedAssemblyCategory, - originalTailorMadeAssemblyCategory, - originalCombinedAssemblyCategory, - assemblyMapData, - failureMechanism); - - // When - var updatedSimpleAssembly = new FailureMechanismSectionAssemblyOld(random.NextDouble(), random.NextEnumValue()); - var updatedDetailedAssemblyCategory = random.NextEnumValue(); - var updatedTailorMadeAssemblyCategory = random.NextEnumValue(); - var updatedCombinedAssemblyCategory = random.NextEnumValue(); - calculator.SimpleAssessmentAssemblyOutput = updatedSimpleAssembly; - calculator.DetailedAssessmentAssemblyGroupOutput = updatedDetailedAssemblyCategory; - calculator.TailorMadeAssemblyCategoryOutput = updatedTailorMadeAssemblyCategory; - calculator.CombinedAssemblyCategoryOutput = updatedCombinedAssemblyCategory; - failureMechanism.SectionResultsOld.First().NotifyObservers(); - - // Then - MapDataTestHelper.AssertAssemblyMapDataCollection(updatedSimpleAssembly.Group, - updatedDetailedAssemblyCategory, - updatedTailorMadeAssemblyCategory, - updatedCombinedAssemblyCategory, - assemblyMapData, - failureMechanism); - mocks.VerifyAll(); - } - } - - [Test] - [Apartment(ApartmentState.STA)] public void UpdateObserver_DataUpdated_MapLayersSameOrder() { // Setup const int updatedReferenceLineLayerIndex = referenceLineIndex + 3; - const int updatedSectionsCollectionLayerIndex = sectionsCollectionIndex - 1; + const int updatedSectionsLayerIndex = sectionsCollectionIndex - 1; const int updatedAssemblyResultsCollectionIndex = assemblyResultsIndex - 1; const int updatedDuneLocationsLayerIndex = duneLocationsIndex - 1; @@ -397,11 +236,11 @@ var referenceLineData = (MapLineData) mapDataCollection.ElementAt(updatedReferenceLineLayerIndex); Assert.AreEqual("Referentielijn", referenceLineData.Name); - var sectionsData = (MapDataCollection) mapDataCollection.ElementAt(updatedSectionsCollectionLayerIndex); + var sectionsData = (MapDataCollection) mapDataCollection.ElementAt(updatedSectionsLayerIndex); Assert.AreEqual("Vakindeling", sectionsData.Name); - var assemblyResultsData = (MapDataCollection) mapDataCollection.ElementAt(updatedAssemblyResultsCollectionIndex); - Assert.AreEqual("Toetsoordeel", assemblyResultsData.Name); + var assemblyResultsData = (MapLineData) mapDataCollection.ElementAt(updatedAssemblyResultsCollectionIndex); + Assert.AreEqual("Duidingsklasse per vak", assemblyResultsData.Name); var duneLocationsData = (MapPointData) mapDataCollection.ElementAt(updatedDuneLocationsLayerIndex); Assert.AreEqual("Hydraulische belastingen", duneLocationsData.Name); @@ -422,11 +261,11 @@ var actualReferenceLineData = (MapLineData) mapDataCollection.ElementAt(updatedReferenceLineLayerIndex); Assert.AreEqual("Referentielijn", actualReferenceLineData.Name); - var actualSectionsData = (MapDataCollection) mapDataCollection.ElementAt(updatedSectionsCollectionLayerIndex); + var actualSectionsData = (MapDataCollection) mapDataCollection.ElementAt(updatedSectionsLayerIndex); Assert.AreEqual("Vakindeling", actualSectionsData.Name); - var actualAssemblyResultsData = (MapDataCollection) mapDataCollection.ElementAt(updatedAssemblyResultsCollectionIndex); - Assert.AreEqual("Toetsoordeel", actualAssemblyResultsData.Name); + var actualAssemblyResultsData = (MapLineData) mapDataCollection.ElementAt(updatedAssemblyResultsCollectionIndex); + Assert.AreEqual("Duidingsklasse per vak", actualAssemblyResultsData.Name); var actualDuneLocationsData = (MapPointData) mapDataCollection.ElementAt(updatedDuneLocationsLayerIndex); Assert.AreEqual("Hydraulische belastingen", actualDuneLocationsData.Name); @@ -451,12 +290,15 @@ Assert.AreEqual(4, mapDataList.Count); var referenceLineMapData = (MapLineData) mapDataList[referenceLineIndex]; + var assemblyResultsMapData = (MapLineData) mapDataList[assemblyResultsIndex]; var hydraulicBoundaryLocationsMapData = (MapPointData) mapDataList[duneLocationsIndex]; CollectionAssert.IsEmpty(referenceLineMapData.Features); + CollectionAssert.IsEmpty(assemblyResultsMapData.Features); CollectionAssert.IsEmpty(hydraulicBoundaryLocationsMapData.Features); Assert.AreEqual("Referentielijn", referenceLineMapData.Name); + Assert.AreEqual("Duidingsklasse per vak", assemblyResultsMapData.Name); Assert.AreEqual("Hydraulische belastingen", hydraulicBoundaryLocationsMapData.Name); var sectionsMapDataCollection = (MapDataCollection) mapDataList[sectionsCollectionIndex]; @@ -475,26 +317,6 @@ Assert.AreEqual("Vakindeling (eindpunten)", sectionsEndPointMapData.Name); Assert.AreEqual("Vakindeling (startpunten)", sectionsStartPointMapData.Name); Assert.AreEqual("Vakindeling", sectionsMapData.Name); - - var assemblyResultsMapDataCollection = (MapDataCollection) mapDataList[assemblyResultsIndex]; - Assert.AreEqual("Toetsoordeel", assemblyResultsMapDataCollection.Name); - List assemblyMapDataList = assemblyResultsMapDataCollection.Collection.ToList(); - Assert.AreEqual(4, assemblyMapDataList.Count); - - var combinedAssemblyMapData = (MapLineData) assemblyMapDataList[combinedAssemblyIndex]; - var simpleAssemblyMapData = (MapLineData) assemblyMapDataList[simpleAssemblyIndex]; - var detailedAssemblyMapData = (MapLineData) assemblyMapDataList[detailedAssemblyIndex]; - var tailorMadeAssemblyMapData = (MapLineData) assemblyMapDataList[tailorMadeAssemblyIndex]; - - CollectionAssert.IsEmpty(combinedAssemblyMapData.Features); - CollectionAssert.IsEmpty(simpleAssemblyMapData.Features); - CollectionAssert.IsEmpty(detailedAssemblyMapData.Features); - CollectionAssert.IsEmpty(tailorMadeAssemblyMapData.Features); - - Assert.AreEqual("Gecombineerd toetsoordeel", combinedAssemblyMapData.Name); - Assert.AreEqual("Toetsoordeel eenvoudige toets", simpleAssemblyMapData.Name); - Assert.AreEqual("Toetsoordeel gedetailleerde toets", detailedAssemblyMapData.Name); - Assert.AreEqual("Toetsoordeel toets op maat", tailorMadeAssemblyMapData.Name); } /// @@ -518,28 +340,11 @@ var sectionsEndPointMapDataObserver = mocks.StrictMock(); sectionsCollection[sectionsEndPointIndex].Attach(sectionsEndPointMapDataObserver); - MapData[] assemblyResultsCollection = ((MapDataCollection) mapDataArray[assemblyResultsIndex]).Collection.ToArray(); - var simpleAssemblyMapDataObserver = mocks.StrictMock(); - assemblyResultsCollection[simpleAssemblyIndex].Attach(simpleAssemblyMapDataObserver); - - var detailedAssemblyMapDataObserver = mocks.StrictMock(); - assemblyResultsCollection[detailedAssemblyIndex].Attach(detailedAssemblyMapDataObserver); - - var tailorMadeAssemblyMapDataObserver = mocks.StrictMock(); - assemblyResultsCollection[tailorMadeAssemblyIndex].Attach(tailorMadeAssemblyMapDataObserver); - - var combinedAssemblyMapDataObserver = mocks.StrictMock(); - assemblyResultsCollection[combinedAssemblyIndex].Attach(combinedAssemblyMapDataObserver); - return new[] { sectionsMapDataObserver, sectionsStartPointMapDataObserver, - sectionsEndPointMapDataObserver, - simpleAssemblyMapDataObserver, - detailedAssemblyMapDataObserver, - tailorMadeAssemblyMapDataObserver, - combinedAssemblyMapDataObserver + sectionsEndPointMapDataObserver }; }