Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs =================================================================== diff -u -ra1a5ab2d14b7f52f392f8e9397db9027e9438f4d -r0ce2329213d6984c6992ec20319265546692a0b4 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs (.../DesignWaterLevelLocationsViewTest.cs) (revision a1a5ab2d14b7f52f392f8e9397db9027e9438f4d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs (.../DesignWaterLevelLocationsViewTest.cs) (revision 0ce2329213d6984c6992ec20319265546692a0b4) @@ -545,18 +545,44 @@ private class TestHydraulicBoundaryDatabase : HydraulicBoundaryDatabase { - public TestHydraulicBoundaryDatabase(bool usePreprocessor, string preprocessorDirectory) + public TestHydraulicBoundaryDatabase(bool usePreprocessor, string preprocessorDirectory) : base(usePreprocessor, preprocessorDirectory) { - SetParameters(CreateLocations(), "", "", usePreprocessor, preprocessorDirectory); + AddLocations(); } public TestHydraulicBoundaryDatabase() { - SetParameters(CreateLocations(), "", ""); + AddLocations(); } - private static List CreateLocations() + private void AddLocations() { + Locations.Add(new HydraulicBoundaryLocation(1, "1", 1.0, 1.0)); + Locations.Add(new HydraulicBoundaryLocation(2, "2", 2.0, 2.0) + { + DesignWaterLevelCalculation = + { + Output = new TestHydraulicBoundaryLocationOutput(1.23) + } + }); + Locations.Add(new HydraulicBoundaryLocation(3, "3", 3.0, 3.0) + { + WaveHeightCalculation = + { + Output = new TestHydraulicBoundaryLocationOutput(2.45) + } + }); + Locations.Add(new HydraulicBoundaryLocation(4, "4", 4.0, 4.0) + { + DesignWaterLevelCalculation = + { + InputParameters = + { + ShouldIllustrationPointsBeCalculated = true + } + } + }); + var topLevelIllustrationPoints = new[] { new TopLevelSubMechanismIllustrationPoint(WindDirectionTestFactory.CreateTestWindDirection(), @@ -570,45 +596,17 @@ var generalResult = new TestGeneralResultSubMechanismIllustrationPoint(topLevelIllustrationPoints); var output = new TestHydraulicBoundaryLocationOutput(1.01, generalResult); - return new List + Locations.Add(new HydraulicBoundaryLocation(5, "5", 5.0, 5.0) { - new HydraulicBoundaryLocation(1, "1", 1.0, 1.0), - new HydraulicBoundaryLocation(2, "2", 2.0, 2.0) + DesignWaterLevelCalculation = { - DesignWaterLevelCalculation = + InputParameters = { - Output = new TestHydraulicBoundaryLocationOutput(1.23) - } - }, - new HydraulicBoundaryLocation(3, "3", 3.0, 3.0) - { - WaveHeightCalculation = - { - Output = new TestHydraulicBoundaryLocationOutput(2.45) - } - }, - new HydraulicBoundaryLocation(4, "4", 4.0, 4.0) - { - DesignWaterLevelCalculation = - { - InputParameters = - { - ShouldIllustrationPointsBeCalculated = true - } - } - }, - new HydraulicBoundaryLocation(5, "5", 5.0, 5.0) - { - DesignWaterLevelCalculation = - { - InputParameters = - { - ShouldIllustrationPointsBeCalculated = true - }, - Output = output - } + ShouldIllustrationPointsBeCalculated = true + }, + Output = output } - }; + }); } }