Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs =================================================================== diff -u -rc28810d9b3079290aeef62b6b9c0eb9fd6b49ac4 -r1cea8cc5989e286fec381ae2ca5b18a0f7ac6a38 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision c28810d9b3079290aeef62b6b9c0eb9fd6b49ac4) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision 1cea8cc5989e286fec381ae2ca5b18a0f7ac6a38) @@ -201,43 +201,39 @@ } [Test] - public void GivenFailureMechanismResultView_WhenFirstRowUpdatesInternally_ThenSecondRowNotUpdatedAndViewInvalidated() + public void GivenFailureMechanismResultView_WhenRowUpdatedEventFiredAndSectionResultNotified_ThenRowNotUpdatedAndViewInvalidated() { // Given - TestFailureMechanismSectionResult sectionResult1 = FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResult(); - TestFailureMechanismSectionResult sectionResult2 = FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResult(); + TestFailureMechanismSectionResult sectionResult = FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResult(); var sectionResults = new ObservableList { - sectionResult1, - sectionResult2 + sectionResult }; using (ShowFailureMechanismResultsView(sectionResults)) { var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; - var row1 = (TestRow) dataGridView.Rows[0].DataBoundItem; - var row2 = (TestRow) dataGridView.Rows[1].DataBoundItem; + var row = (TestRow) dataGridView.Rows[0].DataBoundItem; var invalidated = false; dataGridView.Invalidated += (sender, args) => invalidated = true; // Precondition Assert.IsFalse(invalidated); - Assert.IsFalse(row1.Updated); - Assert.IsFalse(row2.Updated); - + Assert.IsFalse(row.Updated); // When - row1.InternalUpdate(); + row.RowUpdated?.Invoke(row, EventArgs.Empty); + sectionResult.NotifyObservers(); + row.RowUpdateDone?.Invoke(row, EventArgs.Empty); // Then Assert.IsTrue(invalidated); - Assert.IsTrue(row1.Updated); - Assert.IsFalse(row2.Updated); + Assert.IsFalse(row.Updated); } } [Test] - public void GivenFailureMechanismResultView_WhenFirstSectionResultNotified_ThenAllRowsUpdatedAndViewInvalidated() + public void GivenFailureMechanismResultView_WhenSectionResultNotified_ThenAllRowsUpdatedAndViewInvalidated() { // Given TestFailureMechanismSectionResult sectionResult1 = FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResult(); @@ -335,13 +331,8 @@ ColumnStateDefinitions.Add(0, new DataGridViewColumnStateDefinition()); } - public bool Updated { get; set; } + public bool Updated { get; private set; } - public void InternalUpdate() - { - UpdateInternalData(); - } - public override void Update() { Updated = true;