Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.cs =================================================================== diff -u -rb65d7542b9ec8bf5464c266e14f2f45887866021 -r75e0c5d5b6b09c764b4206ef2eabbc0aed78a38f --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.cs (.../FailureMechanismView.cs) (revision b65d7542b9ec8bf5464c266e14f2f45887866021) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.cs (.../FailureMechanismView.cs) (revision 75e0c5d5b6b09c764b4206ef2eabbc0aed78a38f) @@ -37,9 +37,6 @@ /// public partial class FailureMechanismView : UserControl, IMapView where T : IFailureMechanism { - private readonly T failureMechanism; - private readonly IAssessmentSection assessmentSection; - private readonly Observer failureMechanismObserver; private readonly Observer assessmentSectionObserver; private readonly Observer hydraulicBoundaryLocationsObserver; @@ -71,8 +68,8 @@ InitializeComponent(); - this.failureMechanism = failureMechanism; - this.assessmentSection = assessmentSection; + FailureMechanism = failureMechanism; + AssessmentSection = assessmentSection; failureMechanismObserver = new Observer(UpdateMapData) { @@ -110,6 +107,16 @@ ringtoetsMapControl.SetAllData(mapDataCollection, assessmentSection.BackgroundData); } + /// + /// Gets the failure mechanism. + /// + public T FailureMechanism { get; } + + /// + /// Gets the assessment section. + /// + public IAssessmentSection AssessmentSection { get; } + public object Data { get; set; } public IMapControl Map @@ -148,11 +155,11 @@ private void SetMapDataFeatures() { - ReferenceLine referenceLine = assessmentSection.ReferenceLine; - HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase; - IEnumerable failureMechanismSections = failureMechanism.Sections; + ReferenceLine referenceLine = AssessmentSection.ReferenceLine; + HydraulicBoundaryDatabase hydraulicBoundaryDatabase = AssessmentSection.HydraulicBoundaryDatabase; + IEnumerable failureMechanismSections = FailureMechanism.Sections; - referenceLineMapData.Features = RingtoetsMapDataFeaturesFactory.CreateReferenceLineFeatures(referenceLine, assessmentSection.Id, assessmentSection.Name); + referenceLineMapData.Features = RingtoetsMapDataFeaturesFactory.CreateReferenceLineFeatures(referenceLine, AssessmentSection.Id, AssessmentSection.Name); sectionsMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionFeatures(failureMechanismSections); sectionsStartPointMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionStartPointFeatures(failureMechanismSections); sectionsEndPointMapData.Features = RingtoetsMapDataFeaturesFactory.CreateFailureMechanismSectionEndPointFeatures(failureMechanismSections); Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs =================================================================== diff -u -rb65d7542b9ec8bf5464c266e14f2f45887866021 -r75e0c5d5b6b09c764b4206ef2eabbc0aed78a38f --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs (.../FailureMechanismViewTest.cs) (revision b65d7542b9ec8bf5464c266e14f2f45887866021) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs (.../FailureMechanismViewTest.cs) (revision 75e0c5d5b6b09c764b4206ef2eabbc0aed78a38f) @@ -50,14 +50,19 @@ [Test] public void Constructor_ExpectedValues() { + // Setup + var failureMechanism = new TestFailureMechanism(); + var assessmentSection = new ObservableTestAssessmentSectionStub(); + // Call - using (var view = new FailureMechanismView(new TestFailureMechanism(), - new ObservableTestAssessmentSectionStub())) + using (var view = new FailureMechanismView(failureMechanism, assessmentSection)) { // Assert Assert.IsInstanceOf(view); Assert.IsInstanceOf(view); Assert.IsNull(view.Data); + Assert.AreSame(failureMechanism, view.FailureMechanism); + Assert.AreSame(assessmentSection, view.AssessmentSection); Assert.AreEqual(1, view.Controls.Count); Assert.IsInstanceOf(view.Controls[0]);