Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/Ringtoets.Integration.TestUtil.csproj =================================================================== diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r3787b78003d9a55b6bf38f70237f08fc04035a71 --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/Ringtoets.Integration.TestUtil.csproj (.../Ringtoets.Integration.TestUtil.csproj) (revision ac96d7c315129af851634ed5a4a6800b59ede718) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/Ringtoets.Integration.TestUtil.csproj (.../Ringtoets.Integration.TestUtil.csproj) (revision 3787b78003d9a55b6bf38f70237f08fc04035a71) @@ -74,6 +74,10 @@ {D1068432-C172-4AA6-847B-D9DEB4C6DE26} Ringtoets.DuneErosion.Data + + {7BE6B522-02E3-4143-8508-C021A211DE54} + Ringtoets.DuneErosion.Data.TestUtil + {90de728e-48ef-4665-ab38-3d88e41d9f4d} Ringtoets.GrassCoverErosionInwards.Data Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs =================================================================== diff -u -r6e95e3d6e21fae3e46569ba29c72024d6544813c -r3787b78003d9a55b6bf38f70237f08fc04035a71 --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 6e95e3d6e21fae3e46569ba29c72024d6544813c) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 3787b78003d9a55b6bf38f70237f08fc04035a71) @@ -32,6 +32,7 @@ using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Data.TestUtil; using Ringtoets.DuneErosion.Data; +using Ringtoets.DuneErosion.Data.TestUtil; using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.GrassCoverErosionInwards.Data.TestUtil; using Ringtoets.GrassCoverErosionOutwards.Data; @@ -98,7 +99,7 @@ SetFullyConfiguredFailureMechanism(assessmentSection.StabilityPointStructures, hydraulicBoundaryLocation); SetFullyConfiguredFailureMechanism(assessmentSection.StabilityStoneCover, hydraulicBoundaryLocation); SetFullyConfiguredFailureMechanism(assessmentSection.WaveImpactAsphaltCover, hydraulicBoundaryLocation); - SetFullyConfiguredFailureMechanism(assessmentSection.DuneErosion, hydraulicBoundaryLocation); + SetFullyConfiguredFailureMechanism(assessmentSection.DuneErosion); SetFullyConfiguredFailureMechanism(assessmentSection.GrassCoverSlipOffInwards); SetFullyConfiguredFailureMechanism(assessmentSection.GrassCoverSlipOffOutwards); SetFullyConfiguredFailureMechanism(assessmentSection.MacroStabilityOutwards); @@ -993,45 +994,17 @@ AddFailureMechanismSections(failureMechanism); } - private static void SetFullyConfiguredFailureMechanism(DuneErosionFailureMechanism failureMechanism, - HydraulicBoundaryLocation hydraulicBoundaryLocation) + private static void SetFullyConfiguredFailureMechanism(DuneErosionFailureMechanism failureMechanism) { - var duneLocation = new DuneLocation(hydraulicBoundaryLocation.Id, - hydraulicBoundaryLocation.Name, - new Point2D(hydraulicBoundaryLocation.Location), - new DuneLocation.ConstructionProperties - { - CoastalAreaId = 7, - Offset = 20, - Orientation = 180, - D50 = 0.00008 - }); - - var duneLocationWithOutput = new DuneLocation(hydraulicBoundaryLocation.Id, - hydraulicBoundaryLocation.Name, - new Point2D(hydraulicBoundaryLocation.Location), - new DuneLocation.ConstructionProperties - { - CoastalAreaId = 7, - Offset = 20, - Orientation = 180, - D50 = 0.00008 - }) + failureMechanism.DuneLocations.Add(new TestDuneLocation()); + failureMechanism.DuneLocations.Add(new TestDuneLocation { Calculation = { - Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties - { - WaterLevel = hydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output.Result + 0.2, - WaveHeight = hydraulicBoundaryLocation.WaveHeightCalculation1.Output.Result + 0.3, - WavePeriod = 10 - }) + Output = new TestDuneLocationOutput() } - }; + }); - failureMechanism.DuneLocations.Add(duneLocation); - failureMechanism.DuneLocations.Add(duneLocationWithOutput); - AddFailureMechanismSections(failureMechanism); }