Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs =================================================================== diff -u -re918e9b8ba3f001601ab2803e935a6c73a16a69d -rf55e0223259971724d94b87cfbb9e7eb09206b29 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision e918e9b8ba3f001601ab2803e935a6c73a16a69d) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision f55e0223259971724d94b87cfbb9e7eb09206b29) @@ -77,7 +77,7 @@ // Assert Assert.AreEqual(2, view.Controls.Count); - var tableLayoutPanel = (TableLayoutPanel) new ControlTester("tableLayoutPanel").TheObject; + var tableLayoutPanel = (TableLayoutPanel) new ControlTester("TableLayoutPanel").TheObject; Assert.AreEqual(2, tableLayoutPanel.ColumnCount); Assert.AreEqual(1, tableLayoutPanel.RowCount); Assert.IsInstanceOf(tableLayoutPanel.GetControlFromPosition(1, 0)); @@ -87,6 +87,8 @@ Assert.IsInstanceOf(view); Assert.IsNull(view.Data); Assert.AreSame(failureMechanism, view.FailureMechanism); + + Assert.IsTrue(view.AssemblyResultUpdated); } } @@ -164,7 +166,7 @@ } [Test] - public void GivenFailureMechanismResultView_WhenFailureMechanismNotifiesObservers_ThenDataGridViewInvalidated() + public void GivenFailureMechanismResultView_WhenFailureMechanismNotifiesObservers_ThenDataGridViewInvalidatedAndAssemblyResultUpdated() { // Given TestFailureMechanismSectionResult sectionResult = FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResult(); @@ -179,6 +181,7 @@ var invalidated = false; var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; dataGridView.Invalidated += (sender, args) => invalidated = true; + view.AssemblyResultUpdated = false; // Precondition Assert.IsFalse(invalidated); @@ -188,6 +191,7 @@ // Then Assert.IsTrue(invalidated); + Assert.IsTrue(view.AssemblyResultUpdated); } } @@ -213,7 +217,7 @@ } [Test] - public void GivenFailureMechanismResultView_WhenSingleFailureMechanismSectionResultNotifiesObservers_ThenDataGridViewInvalidated() + public void GivenFailureMechanismResultView_WhenSingleFailureMechanismSectionResultNotifiesObservers_ThenDataGridViewInvalidatedAndAssemblyResultUpdated() { // Given TestFailureMechanismSectionResult sectionResult = FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResult(); @@ -223,20 +227,23 @@ sectionResult }; - using (ShowFailureMechanismResultsView(sectionResults)) + using (TestFailureMechanismResultView view = ShowFailureMechanismResultsView(sectionResults)) { var invalidated = false; var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; dataGridView.Invalidated += (sender, args) => invalidated = true; + view.AssemblyResultUpdated = false; // Precondition Assert.IsFalse(invalidated); + Assert.IsFalse(view.AssemblyResultUpdated); // When sectionResult.NotifyObservers(); // Then Assert.IsTrue(invalidated); + Assert.IsTrue(view.AssemblyResultUpdated); } } @@ -275,7 +282,7 @@ } [Test] - public void GivenFailureMechanismResultView_WhenRowUpdatedEventFiredAndSectionResultNotified_ThenRowNotUpdatedAndViewInvalidated() + public void GivenFailureMechanismResultView_WhenRowUpdatedEventFiredAndSectionResultNotified_ThenRowNotUpdatedAndViewInvalidatedAndAssemblyResultUpdated() { // Given TestFailureMechanismSectionResult sectionResult = FailureMechanismSectionResultTestFactory.CreateFailureMechanismSectionResult(); @@ -285,12 +292,13 @@ sectionResult }; - using (ShowFailureMechanismResultsView(sectionResults)) + using (TestFailureMechanismResultView view = ShowFailureMechanismResultsView(sectionResults)) { var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; var row = (TestRow) dataGridView.Rows[0].DataBoundItem; var invalidated = false; dataGridView.Invalidated += (sender, args) => invalidated = true; + view.AssemblyResultUpdated = false; // Precondition Assert.IsFalse(invalidated); @@ -304,6 +312,7 @@ // Then Assert.IsTrue(invalidated); Assert.IsFalse(row.Updated); + Assert.IsTrue(view.AssemblyResultUpdated); } } @@ -387,6 +396,8 @@ public TestFailureMechanismResultView(IObservableEnumerable failureMechanismSectionResults, TestFailureMechanism failureMechanism) : base(failureMechanismSectionResults, failureMechanism) {} + public bool AssemblyResultUpdated { get; set; } + protected override FailureMechanismSectionResultRow CreateFailureMechanismSectionResultRow(FailureMechanismSectionResult sectionResult) { return new TestRow(sectionResult); @@ -396,6 +407,11 @@ { DataGridViewControl.AddTextBoxColumn("Name", "Test", true); } + + protected override void UpdateFailureMechanismAssemblyResult() + { + AssemblyResultUpdated = true; + } } private class TestRow : FailureMechanismSectionResultRow