Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs =================================================================== diff -u -r2fe551e21919f12345f07299fb292669fe43207f -re699be5b9029b6d27100eb8934e80f7a817c3d9e --- Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs (.../RingtoetsDataSynchronizationService.cs) (revision 2fe551e21919f12345f07299fb292669fe43207f) +++ Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs (.../RingtoetsDataSynchronizationService.cs) (revision e699be5b9029b6d27100eb8934e80f7a817c3d9e) @@ -303,7 +303,7 @@ if (grassCoverErosionOutwardsFailureMechanism != null) { IEnumerable affectedHydraulicBoundaryLocations = - RingtoetsCommonDataSynchronizationService.ClearHydraulicBoundaryLocationOutput(grassCoverErosionOutwardsFailureMechanism.HydraulicBoundaryLocations); + GrassCoverErosionOutwardsDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationOutputs(grassCoverErosionOutwardsFailureMechanism); changedObservables.AddRange(affectedHydraulicBoundaryLocations); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs =================================================================== diff -u -r15d708dd6d9cceee5573169f2bdf96f497a31247 -re699be5b9029b6d27100eb8934e80f7a817c3d9e --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision 15d708dd6d9cceee5573169f2bdf96f497a31247) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision e699be5b9029b6d27100eb8934e80f7a817c3d9e) @@ -305,10 +305,7 @@ ClearHydraulicLocationDependentTestCase testCase) { // Setup - HydraulicBoundaryLocation grassCoverErosionLocation = testCase.HydraulicBoundaryLocation; - var grassCoverErosionOutwardsFailureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - grassCoverErosionOutwardsFailureMechanism.HydraulicBoundaryLocations.Add(grassCoverErosionLocation); - + GrassCoverErosionOutwardsFailureMechanism grassCoverErosionOutwardsFailureMechanism = testCase.GrassCoverErosionOutwardsFailureMechanism; DuneErosionFailureMechanism duneErosionFailureMechanism = testCase.DuneErosionFailureMechanism; var mockRepository = new MockRepository(); @@ -327,8 +324,12 @@ // Note: To make sure the clear is performed regardless of what is done with // the return result, no ToArray() should be called before these assertions: CollectionAssert.AreEquivalent(testCase.ExpectedAffectedObjects, affectedObjects); - Assert.IsFalse(grassCoverErosionLocation.DesignWaterLevelCalculation1.HasOutput); - Assert.IsFalse(grassCoverErosionLocation.WaveHeightCalculation1.HasOutput); + Assert.IsNull(grassCoverErosionOutwardsFailureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output); + Assert.IsNull(grassCoverErosionOutwardsFailureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm.Single().Output); + Assert.IsNull(grassCoverErosionOutwardsFailureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.Single().Output); + Assert.IsNull(grassCoverErosionOutwardsFailureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output); + Assert.IsNull(grassCoverErosionOutwardsFailureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm.Single().Output); + Assert.IsNull(grassCoverErosionOutwardsFailureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm.Single().Output); Assert.IsNull(duneErosionFailureMechanism.DuneLocations.Single().Calculation.Output); Assert.IsNull(duneErosionFailureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output); @@ -368,13 +369,10 @@ [Test] [TestCaseSource(nameof(GetClearHydraulicLocationDependentData))] public void ClearHydraulicBoundaryLocationOutputForFailureMechanisms_FailureMechanismsGrassCoverErosionOutwardsAndDuneLocations_ClearDataAndReturnAffectedLocations( - ClearHydraulicLocationDependentTestCase testCase) + ClearHydraulicLocationDependentTestCase testCase) { // Setup - HydraulicBoundaryLocation grassCoverErosionLocation = testCase.HydraulicBoundaryLocation; - var grassCoverErosionOutwardsFailureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - grassCoverErosionOutwardsFailureMechanism.HydraulicBoundaryLocations.Add(grassCoverErosionLocation); - + GrassCoverErosionOutwardsFailureMechanism grassCoverErosionOutwardsFailureMechanism = testCase.GrassCoverErosionOutwardsFailureMechanism; DuneErosionFailureMechanism duneErosionFailureMechanism = testCase.DuneErosionFailureMechanism; // Call @@ -388,8 +386,12 @@ // Note: To make sure the clear is performed regardless of what is done with // the return result, no ToArray() should be called before these assertions: CollectionAssert.AreEquivalent(testCase.ExpectedAffectedObjects, affectedObjects); - Assert.IsFalse(grassCoverErosionLocation.DesignWaterLevelCalculation1.HasOutput); - Assert.IsFalse(grassCoverErosionLocation.WaveHeightCalculation1.HasOutput); + Assert.IsNull(grassCoverErosionOutwardsFailureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output); + Assert.IsNull(grassCoverErosionOutwardsFailureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm.Single().Output); + Assert.IsNull(grassCoverErosionOutwardsFailureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.Single().Output); + Assert.IsNull(grassCoverErosionOutwardsFailureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output); + Assert.IsNull(grassCoverErosionOutwardsFailureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm.Single().Output); + Assert.IsNull(grassCoverErosionOutwardsFailureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm.Single().Output); Assert.IsNull(duneErosionFailureMechanism.DuneLocations.Single().Calculation.Output); Assert.IsNull(duneErosionFailureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.Single().Output); @@ -403,7 +405,6 @@ public void ClearHydraulicBoundaryLocationOutput_HydraulicBoundaryGrassCoverErosionOutwardsAndDuneLocations_ClearDataAndReturnAffectedLocations() { // Setup - var random = new Random(21); HydraulicBoundaryLocation hydraulicBoundaryLocation1 = TestHydraulicBoundaryLocation.CreateFullyCalculated(); var hydraulicBoundaryLocation2 = new TestHydraulicBoundaryLocation(); var duneLocation1 = new TestDuneLocation @@ -441,9 +442,10 @@ hydraulicBoundaryLocation2 }); - assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.Add(hydraulicBoundaryLocation1); - assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.Add(hydraulicBoundaryLocation2); - assessmentSection.GrassCoverErosionOutwards.SetHydraulicBoundaryLocationCalculations(new[] + GrassCoverErosionOutwardsFailureMechanism grassCoverErosionOutwardsFailureMechanism = assessmentSection.GrassCoverErosionOutwards; + grassCoverErosionOutwardsFailureMechanism.HydraulicBoundaryLocations.Add(hydraulicBoundaryLocation1); + grassCoverErosionOutwardsFailureMechanism.HydraulicBoundaryLocations.Add(hydraulicBoundaryLocation2); + grassCoverErosionOutwardsFailureMechanism.SetHydraulicBoundaryLocationCalculations(new[] { hydraulicBoundaryLocation1, hydraulicBoundaryLocation2 @@ -466,26 +468,47 @@ HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation8 = assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation1)); - hydraulicBoundaryLocationCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - hydraulicBoundaryLocationCalculation2.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - hydraulicBoundaryLocationCalculation3.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - hydraulicBoundaryLocationCalculation4.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - hydraulicBoundaryLocationCalculation5.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - hydraulicBoundaryLocationCalculation6.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - hydraulicBoundaryLocationCalculation7.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - hydraulicBoundaryLocationCalculation8.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocationCalculation1.Output = new TestHydraulicBoundaryLocationOutput(); + hydraulicBoundaryLocationCalculation2.Output = new TestHydraulicBoundaryLocationOutput(); + hydraulicBoundaryLocationCalculation3.Output = new TestHydraulicBoundaryLocationOutput(); + hydraulicBoundaryLocationCalculation4.Output = new TestHydraulicBoundaryLocationOutput(); + hydraulicBoundaryLocationCalculation5.Output = new TestHydraulicBoundaryLocationOutput(); + hydraulicBoundaryLocationCalculation6.Output = new TestHydraulicBoundaryLocationOutput(); + hydraulicBoundaryLocationCalculation7.Output = new TestHydraulicBoundaryLocationOutput(); + hydraulicBoundaryLocationCalculation8.Output = new TestHydraulicBoundaryLocationOutput(); - assessmentSection.DuneErosion.SetDuneLocationCalculations(new[] + HydraulicBoundaryLocationCalculation grassHydraulicBoundaryLocationCalculation1 = grassCoverErosionOutwardsFailureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm + .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation1)); + HydraulicBoundaryLocationCalculation grassHydraulicBoundaryLocationCalculation2 = grassCoverErosionOutwardsFailureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm + .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation1)); + HydraulicBoundaryLocationCalculation grassHydraulicBoundaryLocationCalculation3 = grassCoverErosionOutwardsFailureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm + .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation1)); + HydraulicBoundaryLocationCalculation grassHydraulicBoundaryLocationCalculation4 = grassCoverErosionOutwardsFailureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm + .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation1)); + HydraulicBoundaryLocationCalculation grassHydraulicBoundaryLocationCalculation5 = grassCoverErosionOutwardsFailureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm + .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation1)); + HydraulicBoundaryLocationCalculation grassHydraulicBoundaryLocationCalculation6 = grassCoverErosionOutwardsFailureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm + .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation1)); + + grassHydraulicBoundaryLocationCalculation1.Output = new TestHydraulicBoundaryLocationOutput(); + grassHydraulicBoundaryLocationCalculation2.Output = new TestHydraulicBoundaryLocationOutput(); + grassHydraulicBoundaryLocationCalculation3.Output = new TestHydraulicBoundaryLocationOutput(); + grassHydraulicBoundaryLocationCalculation4.Output = new TestHydraulicBoundaryLocationOutput(); + grassHydraulicBoundaryLocationCalculation5.Output = new TestHydraulicBoundaryLocationOutput(); + grassHydraulicBoundaryLocationCalculation6.Output = new TestHydraulicBoundaryLocationOutput(); + + DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.DuneErosion; + duneErosionFailureMechanism.SetDuneLocationCalculations(new[] { duneLocation1, duneLocation2 }); - DuneLocationCalculation duneLocationCalculation1 = assessmentSection.DuneErosion.CalculationsForMechanismSpecificFactorizedSignalingNorm.First(c => ReferenceEquals(c.DuneLocation, duneLocation1)); - DuneLocationCalculation duneLocationCalculation2 = assessmentSection.DuneErosion.CalculationsForMechanismSpecificSignalingNorm.First(c => ReferenceEquals(c.DuneLocation, duneLocation1)); - DuneLocationCalculation duneLocationCalculation3 = assessmentSection.DuneErosion.CalculationsForMechanismSpecificLowerLimitNorm.First(c => ReferenceEquals(c.DuneLocation, duneLocation1)); - DuneLocationCalculation duneLocationCalculation4 = assessmentSection.DuneErosion.CalculationsForLowerLimitNorm.First(c => ReferenceEquals(c.DuneLocation, duneLocation1)); - DuneLocationCalculation duneLocationCalculation5 = assessmentSection.DuneErosion.CalculationsForFactorizedLowerLimitNorm.First(c => ReferenceEquals(c.DuneLocation, duneLocation1)); + DuneLocationCalculation duneLocationCalculation1 = duneErosionFailureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.First(c => ReferenceEquals(c.DuneLocation, duneLocation1)); + DuneLocationCalculation duneLocationCalculation2 = duneErosionFailureMechanism.CalculationsForMechanismSpecificSignalingNorm.First(c => ReferenceEquals(c.DuneLocation, duneLocation1)); + DuneLocationCalculation duneLocationCalculation3 = duneErosionFailureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.First(c => ReferenceEquals(c.DuneLocation, duneLocation1)); + DuneLocationCalculation duneLocationCalculation4 = duneErosionFailureMechanism.CalculationsForLowerLimitNorm.First(c => ReferenceEquals(c.DuneLocation, duneLocation1)); + DuneLocationCalculation duneLocationCalculation5 = duneErosionFailureMechanism.CalculationsForFactorizedLowerLimitNorm.First(c => ReferenceEquals(c.DuneLocation, duneLocation1)); duneLocationCalculation1.Output = new TestDuneLocationOutput(); duneLocationCalculation2.Output = new TestDuneLocationOutput(); @@ -503,7 +526,12 @@ hydraulicBoundaryLocationCalculation6, hydraulicBoundaryLocationCalculation7, hydraulicBoundaryLocationCalculation8, - hydraulicBoundaryLocation1, + grassHydraulicBoundaryLocationCalculation1, + grassHydraulicBoundaryLocationCalculation2, + grassHydraulicBoundaryLocationCalculation3, + grassHydraulicBoundaryLocationCalculation4, + grassHydraulicBoundaryLocationCalculation5, + grassHydraulicBoundaryLocationCalculation6, duneLocation1, duneLocationCalculation1, duneLocationCalculation2, @@ -525,8 +553,6 @@ Assert.IsFalse(hydraulicBoundaryLocationCalculation6.HasOutput); Assert.IsFalse(hydraulicBoundaryLocationCalculation7.HasOutput); Assert.IsFalse(hydraulicBoundaryLocationCalculation8.HasOutput); - Assert.IsFalse(hydraulicBoundaryLocation1.DesignWaterLevelCalculation1.HasOutput); - Assert.IsFalse(hydraulicBoundaryLocation1.WaveHeightCalculation1.HasOutput); Assert.IsNull(duneLocation1.Calculation.Output); Assert.IsNull(duneLocationCalculation1.Output); @@ -1648,29 +1674,38 @@ public class ClearHydraulicLocationDependentTestCase { - public ClearHydraulicLocationDependentTestCase(HydraulicBoundaryLocation hydraulicBoundaryLocation, + public ClearHydraulicLocationDependentTestCase(GrassCoverErosionOutwardsFailureMechanism grassCoverErosionOutwardsFailureMechanism, DuneErosionFailureMechanism duneErosionFailureMechanism) { - HydraulicBoundaryLocation = hydraulicBoundaryLocation; + GrassCoverErosionOutwardsFailureMechanism = grassCoverErosionOutwardsFailureMechanism; DuneErosionFailureMechanism = duneErosionFailureMechanism; var expectedAffectedObjects = new List(); - if (HasHydraulicBoundaryLocationOutput(hydraulicBoundaryLocation)) - { - expectedAffectedObjects.Add(hydraulicBoundaryLocation); - } - + expectedAffectedObjects.AddRange(GetAffectedGrassCoverErosionOutwardsFailureMechanismItems(grassCoverErosionOutwardsFailureMechanism)); expectedAffectedObjects.AddRange(GetAffectedDuneErosionFailureMechanismItems(duneErosionFailureMechanism)); ExpectedAffectedObjects = expectedAffectedObjects; } - public HydraulicBoundaryLocation HydraulicBoundaryLocation { get; } + public GrassCoverErosionOutwardsFailureMechanism GrassCoverErosionOutwardsFailureMechanism { get; } public DuneErosionFailureMechanism DuneErosionFailureMechanism { get; } public IEnumerable ExpectedAffectedObjects { get; } + private static IEnumerable GetAffectedGrassCoverErosionOutwardsFailureMechanismItems(GrassCoverErosionOutwardsFailureMechanism grassCoverErosionOutwardsFailureMechanism) + { + var affectedObjects = new List(); + affectedObjects.AddRange(grassCoverErosionOutwardsFailureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.Where(HasHydraulicBoundaryLocationCalculationOutput)); + affectedObjects.AddRange(grassCoverErosionOutwardsFailureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm.Where(HasHydraulicBoundaryLocationCalculationOutput)); + affectedObjects.AddRange(grassCoverErosionOutwardsFailureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.Where(HasHydraulicBoundaryLocationCalculationOutput)); + affectedObjects.AddRange(grassCoverErosionOutwardsFailureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm.Where(HasHydraulicBoundaryLocationCalculationOutput)); + affectedObjects.AddRange(grassCoverErosionOutwardsFailureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm.Where(HasHydraulicBoundaryLocationCalculationOutput)); + affectedObjects.AddRange(grassCoverErosionOutwardsFailureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm.Where(HasHydraulicBoundaryLocationCalculationOutput)); + + return affectedObjects; + } + private static IEnumerable GetAffectedDuneErosionFailureMechanismItems(DuneErosionFailureMechanism duneErosionFailureMechanism) { var affectedObjects = new List(); @@ -1684,49 +1719,74 @@ return affectedObjects; } - private static bool HasDuneErosionLocationCalculationOutput(DuneLocationCalculation calculation) + private static bool HasHydraulicBoundaryLocationCalculationOutput(HydraulicBoundaryLocationCalculation calculation) { return calculation.Output != null; } - private static bool HasHydraulicBoundaryLocationOutput(HydraulicBoundaryLocation hydraulicBoundaryLocation) + private static bool HasDuneErosionLocationCalculationOutput(DuneLocationCalculation calculation) { - return hydraulicBoundaryLocation.DesignWaterLevelCalculation1.HasOutput || hydraulicBoundaryLocation.WaveHeightCalculation1.HasOutput; + return calculation.Output != null; } - } private static IEnumerable GetClearHydraulicLocationDependentData() { + var grassCoverErosionOutwardsFailureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); + ConfigureGrassCoverErosionOutwardsFailureMechanism(grassCoverErosionOutwardsFailureMechanism, false); var duneErosionFailureMechanism = new DuneErosionFailureMechanism(); ConfigureDuneErosionFailureMechanism(duneErosionFailureMechanism, false); yield return new TestCaseData(new ClearHydraulicLocationDependentTestCase( - new TestHydraulicBoundaryLocation(), + grassCoverErosionOutwardsFailureMechanism, duneErosionFailureMechanism)) .SetName("GrassAndDuneLocationNoOutput"); + grassCoverErosionOutwardsFailureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); + ConfigureGrassCoverErosionOutwardsFailureMechanism(grassCoverErosionOutwardsFailureMechanism, true); duneErosionFailureMechanism = new DuneErosionFailureMechanism(); ConfigureDuneErosionFailureMechanism(duneErosionFailureMechanism, false); yield return new TestCaseData(new ClearHydraulicLocationDependentTestCase( - TestHydraulicBoundaryLocation.CreateFullyCalculated(), + grassCoverErosionOutwardsFailureMechanism, duneErosionFailureMechanism)) .SetName("DuneLocationWithoutOutputGrassLocationWithOutput"); + grassCoverErosionOutwardsFailureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); + ConfigureGrassCoverErosionOutwardsFailureMechanism(grassCoverErosionOutwardsFailureMechanism, false); duneErosionFailureMechanism = new DuneErosionFailureMechanism(); ConfigureDuneErosionFailureMechanism(duneErosionFailureMechanism, true); yield return new TestCaseData(new ClearHydraulicLocationDependentTestCase( - new TestHydraulicBoundaryLocation(), + grassCoverErosionOutwardsFailureMechanism, duneErosionFailureMechanism)) .SetName("GrassLocationWithoutOutputDuneLocationWithOutput"); + grassCoverErosionOutwardsFailureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); + ConfigureGrassCoverErosionOutwardsFailureMechanism(grassCoverErosionOutwardsFailureMechanism, true); duneErosionFailureMechanism = new DuneErosionFailureMechanism(); ConfigureDuneErosionFailureMechanism(duneErosionFailureMechanism, true); yield return new TestCaseData(new ClearHydraulicLocationDependentTestCase( - TestHydraulicBoundaryLocation.CreateFullyCalculated(), + grassCoverErosionOutwardsFailureMechanism, duneErosionFailureMechanism)) .SetName("GrassAndDuneLocationWithOutput"); } + private static void ConfigureGrassCoverErosionOutwardsFailureMechanism(GrassCoverErosionOutwardsFailureMechanism failureMechanism, bool hasOutput) + { + failureMechanism.SetHydraulicBoundaryLocationCalculations(new[] + { + new TestHydraulicBoundaryLocation() + }); + + if (hasOutput) + { + failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.First().Output = new TestHydraulicBoundaryLocationOutput(); + failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm.First().Output = new TestHydraulicBoundaryLocationOutput(); + failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(); + failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm.First().Output = new TestHydraulicBoundaryLocationOutput(); + failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm.First().Output = new TestHydraulicBoundaryLocationOutput(); + failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(); + } + } + private static void ConfigureDuneErosionFailureMechanism(DuneErosionFailureMechanism failureMechanism, bool hasOutput) { var duneLocation = new TestDuneLocation Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs =================================================================== diff -u -r2915e4d50ee071d7facbae4268dced9b01ed9e46 -re699be5b9029b6d27100eb8934e80f7a817c3d9e --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 2915e4d50ee071d7facbae4268dced9b01ed9e46) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision e699be5b9029b6d27100eb8934e80f7a817c3d9e) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Collections.Generic; using System.Linq; using Core.Common.Base.Geometry; using Ringtoets.ClosingStructures.Data; @@ -37,7 +36,6 @@ using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.GrassCoverErosionInwards.Data.TestUtil; using Ringtoets.GrassCoverErosionOutwards.Data; -using Ringtoets.GrassCoverErosionOutwards.Service; using Ringtoets.HeightStructures.Data; using Ringtoets.Integration.Data; using Ringtoets.Integration.Service; @@ -126,7 +124,6 @@ { AssessmentSection assessmentSection = GetAssessmentSectionWithAllCalculationConfigurations(composition); RingtoetsDataSynchronizationService.ClearHydraulicBoundaryLocationOutput(assessmentSection.HydraulicBoundaryDatabase, assessmentSection); - GrassCoverErosionOutwardsDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationOutputs(assessmentSection.GrassCoverErosionOutwards); return assessmentSection; } @@ -867,7 +864,7 @@ HydraulicBoundaryLocation hydraulicBoundaryLocation, Random random) { - failureMechanism.SetHydraulicBoundaryLocationCalculations(new [] + failureMechanism.SetHydraulicBoundaryLocationCalculations(new[] { hydraulicBoundaryLocation });