Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs =================================================================== diff -u -r94f68f51cd9b8fd8c0c162cf874ef7e4580b0ee4 -rdcb7fe0e8ac59332707b6463971de491cdc7fdef --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs (.../GrassCoverSlipOffInwardsResultViewTest.cs) (revision 94f68f51cd9b8fd8c0c162cf874ef7e4580b0ee4) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs (.../GrassCoverSlipOffInwardsResultViewTest.cs) (revision dcb7fe0e8ac59332707b6463971de491cdc7fdef) @@ -22,13 +22,13 @@ 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; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Forms.Views; +using Ringtoets.Integration.Data.StandAlone; using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.Forms.Views.SectionResultViews; @@ -43,26 +43,40 @@ private const int assessmentLayerThreeIndex = 3; [Test] + public void Constructor_FailureMechanismNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => new GrassCoverSlipOffInwardsResultView(null, + new ObservableList()); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("failureMechanism", exception.ParamName); + } + + [Test] public void Constructor_ExpectedValues() { // Setup - var failureMechanismSectionResults = new ObservableList(); + var failureMechanism = new GrassCoverSlipOffInwardsFailureMechanism(); // Call - using (var view = new GrassCoverSlipOffInwardsResultView(failureMechanismSectionResults)) + using (var view = new GrassCoverSlipOffInwardsResultView(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() { // Given + var failureMechanism = new GrassCoverSlipOffInwardsFailureMechanism(); using (var form = new Form()) - using (var view = new GrassCoverSlipOffInwardsResultView(new ObservableList())) + using (var view = new GrassCoverSlipOffInwardsResultView(failureMechanism, failureMechanism.SectionResults)) { form.Controls.Add(view); @@ -88,9 +102,9 @@ } [Test] - public void GivenFormWithFailureMechanismResultView_WhenDataSourceWithFailureMechanismSectionResultAssigned_ThenSectionsAddedAsRows() + public void FailureMechanismResultView_WithFailureMechanismSectionResultAssigned_SectionsAddedAsRows() { - // Given + // Setup var section1 = new FailureMechanismSection("Section 1", new[] { new Point2D(0, 0) @@ -108,19 +122,19 @@ { AssessmentLayerOne = AssessmentLayerOneState.Sufficient, AssessmentLayerTwoA = AssessmentLayerTwoAResult.Failed, - AssessmentLayerThree = (RoundedDouble) random.NextDouble() + AssessmentLayerThree = random.NextRoundedDouble() }; var result2 = new GrassCoverSlipOffInwardsFailureMechanismSectionResult(section2) { AssessmentLayerOne = AssessmentLayerOneState.NotAssessed, AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful, - AssessmentLayerThree = (RoundedDouble) random.NextDouble() + AssessmentLayerThree = random.NextRoundedDouble() }; var result3 = new GrassCoverSlipOffInwardsFailureMechanismSectionResult(section3) { AssessmentLayerOne = AssessmentLayerOneState.NoVerdict, AssessmentLayerTwoA = AssessmentLayerTwoAResult.Successful, - AssessmentLayerThree = (RoundedDouble) random.NextDouble() + AssessmentLayerThree = random.NextRoundedDouble() }; var sectionResults = new ObservableList { @@ -129,16 +143,14 @@ result3 }; + // Call using (var form = new Form()) - using (var view = new GrassCoverSlipOffInwardsResultView(sectionResults)) + using (var view = new GrassCoverSlipOffInwardsResultView(new GrassCoverSlipOffInwardsFailureMechanism(), sectionResults)) { form.Controls.Add(view); form.Show(); - // When - view.Data = sectionResults; - - // Then + // Assert var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; DataGridViewRowCollection rows = dataGridView.Rows; @@ -191,21 +203,19 @@ { AssessmentLayerOne = assessmentLayerOneState, AssessmentLayerTwoA = AssessmentLayerTwoAResult.Failed, - AssessmentLayerThree = (RoundedDouble) random.NextDouble() + AssessmentLayerThree = random.NextRoundedDouble() }; var sectionResults = new ObservableList { result }; using (var form = new Form()) - using (var view = new GrassCoverSlipOffInwardsResultView(sectionResults)) + using (var view = new GrassCoverSlipOffInwardsResultView(new GrassCoverSlipOffInwardsFailureMechanism(), sectionResults)) { form.Controls.Add(view); form.Show(); - view.Data = sectionResults; - // When result.AssessmentLayerOne = AssessmentLayerOneState.Sufficient; result.NotifyObservers();