Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs =================================================================== diff -u -rd831947ee7defd3a0b22ef43a3a41490f7e87ac7 -rd77847d0615cd770516f4a3f32628756d56faf2a --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision d831947ee7defd3a0b22ef43a3a41490f7e87ac7) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision d77847d0615cd770516f4a3f32628756d56faf2a) @@ -40,6 +40,7 @@ protected const int AssessmentLayerOneColumnIndex = 1; private readonly Observer failureMechanismSectionResultObserver; private readonly IObservableEnumerable failureMechanismSectionResults; + private readonly RecursiveObserver, T> failureMechanismSectionResultsObserver; /// /// Creates a new instance of . @@ -62,6 +63,13 @@ { Observable = failureMechanismSectionResults }; + + failureMechanismSectionResultsObserver = new RecursiveObserver, T>( + DataGridViewControl.RefreshDataGridView, + sr => sr) + { + Observable = failureMechanismSectionResults + }; } /// @@ -91,6 +99,7 @@ protected override void Dispose(bool disposing) { failureMechanismSectionResultObserver?.Dispose(); + failureMechanismSectionResultsObserver?.Dispose(); if (disposing) { Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs =================================================================== diff -u -rd831947ee7defd3a0b22ef43a3a41490f7e87ac7 -rd77847d0615cd770516f4a3f32628756d56faf2a --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision d831947ee7defd3a0b22ef43a3a41490f7e87ac7) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision d77847d0615cd770516f4a3f32628756d56faf2a) @@ -19,7 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Collections.Generic; +using System.Drawing; using System.Windows.Forms; using Core.Common.Base; using Core.Common.Base.Geometry; @@ -53,7 +53,7 @@ public void DefaultConstructor_DefaultValues() { // Setup - var failureMechanismSectionResults = new ObservableList(); + var failureMechanismSectionResults = new ObservableList(); // Call using (var view = new TestFailureMechanismResultView(failureMechanismSectionResults)) @@ -73,7 +73,7 @@ const int assessmentLayerOneIndex = 1; // Call - using (ShowFailureMechanismResultsView(new ObservableList())) + using (ShowFailureMechanismResultsView(new ObservableList())) { // Assert var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; @@ -87,8 +87,66 @@ } } - private TestFailureMechanismResultView ShowFailureMechanismResultsView(IObservableEnumerable sectionResults) + [Test] + public void GivenFailureMechanismResultView_WhenFailureMechanismSectionResultCollectionUpdated_ThenObserverNotified() { + // Given + var sectionResults = new ObservableList(); + using (ShowFailureMechanismResultsView(sectionResults)) + { + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + + // Precondition + Assert.AreEqual(0, dataGridView.RowCount); + + // When + sectionResults.Add(new TestFailureMechanismSectionResult(new FailureMechanismSection("a", new[] + { + new Point2D(0, 0) + }))); + sectionResults.NotifyObservers(); + + // Then + Assert.AreEqual(1, dataGridView.RowCount); + } + } + + [Test] + public void GivenFailureMechanismResultView_WhenSingleFailureMechanismSectionResultUpdated_ThenObserverNotified() + { + // Given + var sectionResult = new TestFailureMechanismSectionResult(new FailureMechanismSection("a", new[] + { + new Point2D(0, 0) + })) + { + AssessmentLayerOne = AssessmentLayerOneState.NoVerdict + }; + var sectionResults = new ObservableList + { + sectionResult + }; + + using (ShowFailureMechanismResultsView(sectionResults)) + { + // Precondition + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + DataGridViewCell dataGridViewCell = dataGridView.Rows[0].Cells[0]; + Assert.AreEqual(Color.FromKnownColor(KnownColor.ControlText), dataGridViewCell.Style.ForeColor); + Assert.AreEqual(Color.FromKnownColor(KnownColor.White), dataGridViewCell.Style.BackColor); + + // When + sectionResult.AssessmentLayerOne = AssessmentLayerOneState.Sufficient; + sectionResult.NotifyObservers(); + + // Then + Assert.AreEqual(Color.FromKnownColor(KnownColor.GrayText), dataGridViewCell.Style.ForeColor); + Assert.AreEqual(Color.FromKnownColor(KnownColor.DarkGray), dataGridViewCell.Style.BackColor); + } + } + + private TestFailureMechanismResultView ShowFailureMechanismResultsView(IObservableEnumerable sectionResults) + { var failureMechanismResultView = new TestFailureMechanismResultView(sectionResults); testForm.Controls.Add(failureMechanismResultView); testForm.Show(); @@ -97,23 +155,38 @@ } } - public class TestFailureMechanismResultView : FailureMechanismResultView + public class TestFailureMechanismResultView : FailureMechanismResultView { - public TestFailureMechanismResultView(IObservableEnumerable failureMechanismSectionResults) : base(failureMechanismSectionResults) {} + public TestFailureMechanismResultView(IObservableEnumerable failureMechanismSectionResults) : base(failureMechanismSectionResults) + { + DataGridViewControl.CellFormatting += OnCellFormatting; + AddDataGridColumns(); + UpdateDataGridViewDataSource(); + } - protected override object CreateFailureMechanismSectionResultRow(FailureMechanismSectionResult sectionResult) + protected override object CreateFailureMechanismSectionResultRow(TestFailureMechanismSectionResult sectionResult) { return new TestRow(sectionResult); } - } - public class TestRow - { - public TestRow(FailureMechanismSectionResult sectionResult) + private void OnCellFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs) { - Name = sectionResult.Section.Name; + if (eventArgs.ColumnIndex < AssessmentLayerOneColumnIndex) + { + if (HasPassedLevelOne(eventArgs.RowIndex)) + { + DataGridViewControl.DisableCell(eventArgs.RowIndex, eventArgs.ColumnIndex); + } + else + { + DataGridViewControl.RestoreCell(eventArgs.RowIndex, eventArgs.ColumnIndex); + } + } } + } - public string Name { get; } + public class TestRow : FailureMechanismSectionResultRow + { + public TestRow(TestFailureMechanismSectionResult sectionResult) : base(sectionResult) {} } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs =================================================================== diff -u -r94f68f51cd9b8fd8c0c162cf874ef7e4580b0ee4 -rd77847d0615cd770516f4a3f32628756d56faf2a --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs (.../GrassCoverErosionOutwardsFailureMechanismResultView.cs) (revision 94f68f51cd9b8fd8c0c162cf874ef7e4580b0ee4) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismResultView.cs (.../GrassCoverErosionOutwardsFailureMechanismResultView.cs) (revision d77847d0615cd770516f4a3f32628756d56faf2a) @@ -39,13 +39,26 @@ /// /// Creates a new instance of . /// + /// The failure mechanism this view belongs to. /// The collection of failure mechanism section results. + /// Thrown when any input parameter is null. public GrassCoverErosionOutwardsFailureMechanismResultView( + GrassCoverErosionOutwardsFailureMechanism failureMechanism, IObservableEnumerable failureMechanismSectionResults) : base(failureMechanismSectionResults) { + if (failureMechanism == null) + { + throw new ArgumentNullException(nameof(failureMechanism)); + } + + FailureMechanism = failureMechanism; DataGridViewControl.CellFormatting += OnCellFormatting; + + UpdateDataGridViewDataSource(); } + public GrassCoverErosionOutwardsFailureMechanism FailureMechanism { get; } + protected override object CreateFailureMechanismSectionResultRow(GrassCoverErosionOutwardsFailureMechanismSectionResult sectionResult) { return new GrassCoverErosionOutwardsFailureMechanismSectionResultRow(sectionResult); Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -rf603458169b1e2544bc933b05f169cc1637d59b2 -rd77847d0615cd770516f4a3f32628756d56faf2a --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision f603458169b1e2544bc933b05f169cc1637d59b2) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision d77847d0615cd770516f4a3f32628756d56faf2a) @@ -143,8 +143,9 @@ Image = RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, CloseForData = CloseFailureMechanismResultViewForData, GetViewData = context => context.WrappedData, - AfterCreate = (view, context) => view.FailureMechanism = context.FailureMechanism, - CreateInstance = context => new GrassCoverErosionOutwardsFailureMechanismResultView(context.WrappedData) + CreateInstance = context => new GrassCoverErosionOutwardsFailureMechanismResultView( + (GrassCoverErosionOutwardsFailureMechanism) context.FailureMechanism, + context.WrappedData) }; yield return new ViewInfo< @@ -367,15 +368,15 @@ return assessmentSection .GetFailureMechanisms() .OfType() - .Any(fm => ReferenceEquals(view.Data, fm.SectionResults)); + .Any(fm => ReferenceEquals(view.FailureMechanism.SectionResults, fm.SectionResults)); } if (failureMechanismContext != null) { failureMechanism = failureMechanismContext.WrappedData; } - return failureMechanism != null && ReferenceEquals(view.Data, failureMechanism.SectionResults); + return failureMechanism != null && ReferenceEquals(view.FailureMechanism.SectionResults, failureMechanism.SectionResults); } #endregion Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -r94f68f51cd9b8fd8c0c162cf874ef7e4580b0ee4 -rd77847d0615cd770516f4a3f32628756d56faf2a --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs) (revision 94f68f51cd9b8fd8c0c162cf874ef7e4580b0ee4) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs) (revision d77847d0615cd770516f4a3f32628756d56faf2a) @@ -22,7 +22,6 @@ using System; using System.Windows.Forms; using Core.Common.Base; -using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Extensions.Forms; @@ -46,25 +45,27 @@ public void Constructor_ExpectedValues() { // Setup - var failureMechanismSectionResults = new ObservableList(); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); // Call - using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(failureMechanismSectionResults)) + using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(failureMechanism, failureMechanism.SectionResults)) { // Assert Assert.IsInstanceOf>(view); - Assert.AreSame(failureMechanismSectionResults, view.Data); + Assert.IsNull(view.Data); + Assert.AreSame(failureMechanism, view.FailureMechanism); } } [Test] - public void GivenFormWithFailureMechanismResultView_WhenShown_ThenExpectedColumnsAreVisible() + public void GivenFormWithGrassCoverErosionOutwardsFailureMechanismResultView_WhenShown_ThenExpectedColumnsAreVisible() { // Given + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); + using (var form = new Form()) { - using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView( - new ObservableList())) + using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(failureMechanism, failureMechanism.SectionResults)) { form.Controls.Add(view); @@ -91,9 +92,9 @@ } [Test] - public void GivenFormWithFailureMechanismResultView_WhenDataSourceWithFailureMechanismSectionResultAssigned_ThenSectionsAddedAsRows() + public void GrassCoverErosionOutwardsFailureMechanismResultView_WithFailureMechanismSectionResultAssigned_SectionsAddedAsRows() { - // Given + // Setup var section1 = new FailureMechanismSection("Section 1", new[] { new Point2D(0, 0) @@ -112,19 +113,19 @@ { AssessmentLayerOne = AssessmentLayerOneState.Sufficient, AssessmentLayerTwoA = AssessmentLayerTwoAResult.Failed, - AssessmentLayerThree = (RoundedDouble) random.NextDouble() + AssessmentLayerThree = random.NextRoundedDouble() }; var result2 = new GrassCoverErosionOutwardsFailureMechanismSectionResult(section2) { AssessmentLayerOne = AssessmentLayerOneState.NotAssessed, AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful, - AssessmentLayerThree = (RoundedDouble) random.NextDouble() + AssessmentLayerThree = random.NextRoundedDouble() }; var result3 = new GrassCoverErosionOutwardsFailureMechanismSectionResult(section3) { AssessmentLayerOne = AssessmentLayerOneState.NoVerdict, AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful, - AssessmentLayerThree = (RoundedDouble) random.NextDouble() + AssessmentLayerThree = random.NextRoundedDouble() }; var sectionResults = new ObservableList { @@ -133,52 +134,49 @@ result3 }; + // Call using (var form = new Form()) + using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(new GrassCoverErosionOutwardsFailureMechanism(), + sectionResults)) { - using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(sectionResults)) - { - form.Controls.Add(view); - form.Show(); + form.Controls.Add(view); + form.Show(); - // When - view.Data = sectionResults; + // Assert + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; - // Then - var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + DataGridViewRowCollection rows = dataGridView.Rows; + Assert.AreEqual(3, rows.Count); - DataGridViewRowCollection rows = dataGridView.Rows; - Assert.AreEqual(3, rows.Count); + DataGridViewCellCollection cells = rows[0].Cells; + Assert.AreEqual(4, cells.Count); + Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); + Assert.AreEqual(result1.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); + Assert.AreEqual(result1.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); + Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - DataGridViewCellCollection cells = rows[0].Cells; - Assert.AreEqual(4, cells.Count); - Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); - Assert.AreEqual(result1.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); - Assert.AreEqual(result1.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); - Assert.AreEqual(result1.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); + DataGridViewTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); + DataGridViewTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); - DataGridViewTestHelper.AssertCellIsDisabled(cells[assessmentLayerTwoAIndex]); - DataGridViewTestHelper.AssertCellIsDisabled(cells[assessmentLayerThreeIndex]); + cells = rows[1].Cells; + Assert.AreEqual(4, cells.Count); + Assert.AreEqual("Section 2", cells[nameColumnIndex].FormattedValue); + Assert.AreEqual(result2.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); + Assert.AreEqual(result2.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); + Assert.AreEqual(result2.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - cells = rows[1].Cells; - Assert.AreEqual(4, cells.Count); - Assert.AreEqual("Section 2", cells[nameColumnIndex].FormattedValue); - Assert.AreEqual(result2.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); - Assert.AreEqual(result2.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); - Assert.AreEqual(result2.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); + DataGridViewTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); + DataGridViewTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); - DataGridViewTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - DataGridViewTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); + cells = rows[2].Cells; + Assert.AreEqual(4, cells.Count); + Assert.AreEqual("Section 3", cells[nameColumnIndex].FormattedValue); + Assert.AreEqual(result3.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); + Assert.AreEqual(result3.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); + Assert.AreEqual(result3.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - cells = rows[2].Cells; - Assert.AreEqual(4, cells.Count); - Assert.AreEqual("Section 3", cells[nameColumnIndex].FormattedValue); - Assert.AreEqual(result3.AssessmentLayerOne, cells[assessmentLayerOneIndex].Value); - Assert.AreEqual(result3.AssessmentLayerTwoA, cells[assessmentLayerTwoAIndex].Value); - Assert.AreEqual(result3.AssessmentLayerThree.ToString(), cells[assessmentLayerThreeIndex].FormattedValue); - - DataGridViewTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); - DataGridViewTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); - } + DataGridViewTestHelper.AssertCellIsEnabled(cells[assessmentLayerTwoAIndex]); + DataGridViewTestHelper.AssertCellIsEnabled(cells[assessmentLayerThreeIndex]); } } @@ -197,7 +195,7 @@ { AssessmentLayerOne = assessmentLayerOneState, AssessmentLayerTwoA = AssessmentLayerTwoAResult.Failed, - AssessmentLayerThree = (RoundedDouble) random.NextDouble() + AssessmentLayerThree = random.NextRoundedDouble() }; var sectionResults = new ObservableList { @@ -206,13 +204,12 @@ using (var form = new Form()) { - using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(sectionResults)) + using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(new GrassCoverErosionOutwardsFailureMechanism(), + sectionResults)) { form.Controls.Add(view); form.Show(); - view.Data = sectionResults; - // When result.AssessmentLayerOne = AssessmentLayerOneState.Sufficient; result.NotifyObservers(); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -rf603458169b1e2544bc933b05f169cc1637d59b2 -rd77847d0615cd770516f4a3f32628756d56faf2a --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsFailureMechanismResultViewInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismResultViewInfoTest.cs) (revision f603458169b1e2544bc933b05f169cc1637d59b2) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsFailureMechanismResultViewInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismResultViewInfoTest.cs) (revision d77847d0615cd770516f4a3f32628756d56faf2a) @@ -86,7 +86,7 @@ { // Setup var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(failureMechanism.SectionResults)) + using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(failureMechanism, failureMechanism.SectionResults)) { // Call string viewName = info.GetViewName(view, failureMechanism.SectionResults); @@ -146,7 +146,7 @@ var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(failureMechanism.SectionResults)) + using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(failureMechanism, failureMechanism.SectionResults)) { view.Data = failureMechanism.SectionResults; @@ -175,7 +175,7 @@ mocks.ReplayAll(); - using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(failureMechanism.SectionResults)) + using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(failureMechanism, failureMechanism.SectionResults)) { view.Data = failureMechanism.SectionResults; @@ -204,7 +204,7 @@ mocks.ReplayAll(); - using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(failureMechanism.SectionResults)) + using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(failureMechanism, failureMechanism.SectionResults)) { view.Data = failureMechanism.SectionResults; @@ -224,7 +224,7 @@ // Setup var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(failureMechanism.SectionResults)) + using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(failureMechanism, failureMechanism.SectionResults)) { view.Data = failureMechanism.SectionResults; @@ -242,7 +242,7 @@ // Setup var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(failureMechanism.SectionResults)) + using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(failureMechanism, failureMechanism.SectionResults)) { view.Data = failureMechanism.SectionResults; @@ -265,7 +265,7 @@ mocks.ReplayAll(); - using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(failureMechanism.SectionResults)) + using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(failureMechanism, failureMechanism.SectionResults)) { view.Data = failureMechanism.SectionResults; @@ -290,7 +290,7 @@ var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(failureMechanism.SectionResults)) + using (var view = new GrassCoverErosionOutwardsFailureMechanismResultView(failureMechanism, failureMechanism.SectionResults)) { view.Data = failureMechanism.SectionResults; @@ -305,25 +305,6 @@ } [Test] - public void AfterCreate_Always_SetsSpecificPropertiesToView() - { - // Setup - var view = mocks.StrictMock(); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - var context = new FailureMechanismSectionResultContext(failureMechanism.SectionResults, failureMechanism); - - view.Expect(v => v.FailureMechanism = failureMechanism); - - mocks.ReplayAll(); - - // Call - info.AfterCreate(view, context); - - // Assert - mocks.VerifyAll(); - } - - [Test] public void CreateInstance_Always_ReturnsView() { // Setup