Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs =================================================================== diff -u -r7f80815f667036fe5000fb938d61aee1edd157e0 -ra116692d59b7634613a5a9e1ac9aeb80e0e126c5 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision a116692d59b7634613a5a9e1ac9aeb80e0e126c5) @@ -59,7 +59,7 @@ var failureMechanism = new TestFailureMechanism(); // Call - using (var view = new TestFailureMechanismResultView(failureMechanism, failureMechanism.SectionResults)) + using (var view = new TestFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism)) { // Assert Assert.IsInstanceOf(view); @@ -72,9 +72,7 @@ public void Constructor_FailureMechanismNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => new TestFailureMechanismResultView( - null, - new ObservableList()); + TestDelegate call = () => new TestFailureMechanismResultView(new ObservableList(), null); // Assert var exception = Assert.Throws(call); @@ -160,7 +158,7 @@ private TestFailureMechanismResultView ShowFailureMechanismResultsView(IObservableEnumerable sectionResults) { - var failureMechanismResultView = new TestFailureMechanismResultView(new TestFailureMechanism(), sectionResults); + var failureMechanismResultView = new TestFailureMechanismResultView(sectionResults, new TestFailureMechanism()); testForm.Controls.Add(failureMechanismResultView); testForm.Show(); @@ -170,7 +168,7 @@ public class TestFailureMechanismResultView : FailureMechanismResultView { - public TestFailureMechanismResultView(TestFailureMechanism failureMechanism, IObservableEnumerable failureMechanismSectionResults) + public TestFailureMechanismResultView(IObservableEnumerable failureMechanismSectionResults, TestFailureMechanism failureMechanism) : base(failureMechanismSectionResults, failureMechanism) { UpdateDataGridViewDataSource(); Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs =================================================================== diff -u -r7f80815f667036fe5000fb938d61aee1edd157e0 -ra116692d59b7634613a5a9e1ac9aeb80e0e126c5 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs (.../GrassCoverErosionInwardsFailureMechanismResultView.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs (.../GrassCoverErosionInwardsFailureMechanismResultView.cs) (revision a116692d59b7634613a5a9e1ac9aeb80e0e126c5) @@ -49,12 +49,14 @@ /// /// Creates a new instance of . /// + /// + /// /// The assessment section the failure mechanism section results belongs to. /// public GrassCoverErosionInwardsFailureMechanismResultView( - IAssessmentSection assessmentSection, + IObservableEnumerable failureMechanismSectionResults, GrassCoverErosionInwardsFailureMechanism failureMechanism, - IObservableEnumerable failureMechanismSectionResults) + IAssessmentSection assessmentSection) : base(failureMechanismSectionResults, failureMechanism) { if (assessmentSection == null) @@ -104,7 +106,7 @@ protected override object CreateFailureMechanismSectionResultRow(GrassCoverErosionInwardsFailureMechanismSectionResult sectionResult) { - return new GrassCoverErosionInwardsFailureMechanismSectionResultRow(sectionResult, + return new GrassCoverErosionInwardsFailureMechanismSectionResultRow(sectionResult, FailureMechanism, assessmentSection); } Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs =================================================================== diff -u -r133c9a406ae0fe1d3084fd3cef818070d95b666f -ra116692d59b7634613a5a9e1ac9aeb80e0e126c5 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 133c9a406ae0fe1d3084fd3cef818070d95b666f) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision a116692d59b7634613a5a9e1ac9aeb80e0e126c5) @@ -199,9 +199,9 @@ CloseForData = CloseFailureMechanismResultViewForData, GetViewData = context => context.WrappedData, CreateInstance = context => new GrassCoverErosionInwardsFailureMechanismResultView( - context.AssessmentSection, + context.WrappedData, (GrassCoverErosionInwardsFailureMechanism) context.FailureMechanism, - context.WrappedData) + context.AssessmentSection) }; yield return new ViewInfo Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -r7f80815f667036fe5000fb938d61aee1edd157e0 -ra116692d59b7634613a5a9e1ac9aeb80e0e126c5 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision 7f80815f667036fe5000fb938d61aee1edd157e0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision a116692d59b7634613a5a9e1ac9aeb80e0e126c5) @@ -74,7 +74,7 @@ var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); // Call - using (var view = new GrassCoverErosionInwardsFailureMechanismResultView(assessmentSection, failureMechanism, failureMechanism.SectionResults)) + using (var view = new GrassCoverErosionInwardsFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection)) { // Assert Assert.IsInstanceOf new GrassCoverErosionInwardsFailureMechanismResultView(null, - failureMechanism, - failureMechanism.SectionResults); + TestDelegate call = () => new GrassCoverErosionInwardsFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, null); // Assert var exception = Assert.Throws(call); Assert.AreEqual("assessmentSection", exception.ParamName); @@ -549,9 +547,9 @@ private GrassCoverErosionInwardsFailureMechanismResultView ShowFailureMechanismResultsView( IObservableEnumerable sectionResults) { - var failureMechanismResultView = new GrassCoverErosionInwardsFailureMechanismResultView(new ObservableTestAssessmentSectionStub(), + var failureMechanismResultView = new GrassCoverErosionInwardsFailureMechanismResultView(sectionResults, new GrassCoverErosionInwardsFailureMechanism(), - sectionResults); + new ObservableTestAssessmentSectionStub()); testForm.Controls.Add(failureMechanismResultView); testForm.Show(); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -r6351c078e52e7a091c3307337ba66e18fde91525 -ra116692d59b7634613a5a9e1ac9aeb80e0e126c5 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsFailureMechanismResultViewInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewInfoTest.cs) (revision 6351c078e52e7a091c3307337ba66e18fde91525) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsFailureMechanismResultViewInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewInfoTest.cs) (revision a116692d59b7634613a5a9e1ac9aeb80e0e126c5) @@ -120,7 +120,7 @@ mocks.ReplayAll(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var view = new GrassCoverErosionInwardsFailureMechanismResultView(assessmentSection, failureMechanism, failureMechanism.SectionResults); + var view = new GrassCoverErosionInwardsFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection); // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -144,7 +144,7 @@ var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var view = new GrassCoverErosionInwardsFailureMechanismResultView(assessmentSection, failureMechanism, failureMechanism.SectionResults); + var view = new GrassCoverErosionInwardsFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection); // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -169,7 +169,7 @@ }); mocks.ReplayAll(); - var view = new GrassCoverErosionInwardsFailureMechanismResultView(assessmentSection, failureMechanism, failureMechanism.SectionResults); + var view = new GrassCoverErosionInwardsFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection); // Call bool closeForData = info.CloseForData(view, assessmentSection); @@ -189,7 +189,7 @@ var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var view = new GrassCoverErosionInwardsFailureMechanismResultView(assessmentSection, failureMechanism, failureMechanism.SectionResults); + var view = new GrassCoverErosionInwardsFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection); // Call bool closeForData = info.CloseForData(view, failureMechanism); @@ -209,7 +209,7 @@ var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var view = new GrassCoverErosionInwardsFailureMechanismResultView(assessmentSection, failureMechanism, failureMechanism.SectionResults); + var view = new GrassCoverErosionInwardsFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection); // Call bool closeForData = info.CloseForData(view, new GrassCoverErosionInwardsFailureMechanism()); @@ -230,7 +230,7 @@ var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var failureMechanismContext = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSection); - var view = new GrassCoverErosionInwardsFailureMechanismResultView(assessmentSection, failureMechanism, failureMechanism.SectionResults); + var view = new GrassCoverErosionInwardsFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection); // Call bool closeForData = info.CloseForData(view, failureMechanismContext); @@ -249,7 +249,7 @@ mocks.ReplayAll(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var view = new GrassCoverErosionInwardsFailureMechanismResultView(assessmentSection, failureMechanism, failureMechanism.SectionResults); + var view = new GrassCoverErosionInwardsFailureMechanismResultView(failureMechanism.SectionResults, failureMechanism, assessmentSection); var failureMechanismContext = new GrassCoverErosionInwardsFailureMechanismContext(new GrassCoverErosionInwardsFailureMechanism(), assessmentSection); @@ -272,9 +272,10 @@ IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - var context = new ProbabilityFailureMechanismSectionResultContext(failureMechanism.SectionResults, - failureMechanism, - assessmentSection); + var context = new ProbabilityFailureMechanismSectionResultContext( + failureMechanism.SectionResults, + failureMechanism, + assessmentSection); // Call IView view = info.CreateInstance(context);