Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs =================================================================== diff -u -r5e604350eeb25e60c1557e2f3037d2c2b77ba33b -rd154c522432f9241120ef9a3db09f74feeb05948 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs (.../AssessmentSectionViewTest.cs) (revision 5e604350eeb25e60c1557e2f3037d2c2b77ba33b) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs (.../AssessmentSectionViewTest.cs) (revision d154c522432f9241120ef9a3db09f74feeb05948) @@ -207,17 +207,22 @@ { var assessmentSection = new ObservableTestAssessmentSectionStub { - HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase() + HydraulicBoundaryDatabase = + { + Locations = + { + new HydraulicBoundaryLocation(1, "test", 1.0, 2.0) + } + } }; - assessmentSection.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0)); view.Data = assessmentSection; MapDataCollection mapData = view.Map.Data; // Precondition AssertHydraulicBoundaryDatabaseData(mapData, assessmentSection.HydraulicBoundaryDatabase); - assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); + assessmentSection.HydraulicBoundaryDatabase.Locations.Clear(); assessmentSection.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(2, "test2", 2.0, 3.0)); // When @@ -236,17 +241,22 @@ { var assessmentSection = new ObservableTestAssessmentSectionStub { - HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase() + HydraulicBoundaryDatabase = + { + Locations = + { + new HydraulicBoundaryLocation(1, "test", 1.0, 2.0) + } + } }; - assessmentSection.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0)); view.Data = assessmentSection; MapDataCollection mapData = view.Map.Data; // Precondition AssertHydraulicBoundaryDatabaseData(mapData, assessmentSection.HydraulicBoundaryDatabase); - assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); + assessmentSection.HydraulicBoundaryDatabase.Locations.Clear(); assessmentSection.NotifyObservers(); // When @@ -309,10 +319,16 @@ var assessmentSection2 = new ObservableTestAssessmentSectionStub { - HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(), + HydraulicBoundaryDatabase = + { + Locations = + { + new HydraulicBoundaryLocation(2, "test2", 2.0, 3.0) + } + }, ReferenceLine = new ReferenceLine() }; - assessmentSection2.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(2, "test2", 2.0, 3.0)); + assessmentSection2.ReferenceLine.SetGeometry(new List { new Point2D(2.0, 1.0), @@ -341,12 +357,15 @@ new Point2D(2.0, 1.0) }); - var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); - hydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 1.0, 2.0)); - var assessmentSection = new ObservableTestAssessmentSectionStub { - HydraulicBoundaryDatabase = hydraulicBoundaryDatabase, + HydraulicBoundaryDatabase = + { + Locations = + { + new HydraulicBoundaryLocation(1, "test", 1.0, 2.0) + } + }, ReferenceLine = referenceLine }; @@ -365,7 +384,7 @@ var hrLocationsMapData = (MapPointData) mapData.Collection.ElementAt(hydraulicBoundaryLocationsIndex - 1); Assert.AreEqual("Hydraulische randvoorwaarden", hrLocationsMapData.Name); - assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); + assessmentSection.HydraulicBoundaryDatabase.Locations.Clear(); assessmentSection.HydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(2, "test2", 2.0, 3.0)); // Call