Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil.Test/TestDataGeneratorTest.cs =================================================================== diff -u -re57e79927485e44d681b0617f17bada42dbfb862 -r9ac057f20b9a85200bfa921bd36ea0026f07ebe3 --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil.Test/TestDataGeneratorTest.cs (.../TestDataGeneratorTest.cs) (revision e57e79927485e44d681b0617f17bada42dbfb862) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil.Test/TestDataGeneratorTest.cs (.../TestDataGeneratorTest.cs) (revision 9ac057f20b9a85200bfa921bd36ea0026f07ebe3) @@ -57,12 +57,7 @@ Assert.AreEqual(AssessmentSectionComposition.Dike, assessmentSection.Composition); AssertFailureMechanismsHaveAllPossibleCalculationConfigurations(assessmentSection); AssertHydraulicBoundaryOutput(assessmentSection, true); - - DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.GetFailureMechanisms() - .OfType() - .Single(); - AssertDuneErosionFailureMechanismContainsCalculationConfigurationsWithOutputs(duneErosionFailureMechanism); - AssertDuneErosionFailureMechanismContainsCalculationConfigurationsWithoutOutputs(duneErosionFailureMechanism); + AssertDuneErosionFailureAssertDuneErosionFailureMechanismCalculationConfigurations(assessmentSection.DuneErosion, true); } [Test] @@ -79,12 +74,7 @@ Assert.AreEqual(composition, assessmentSection.Composition); AssertFailureMechanismsHaveAllPossibleCalculationConfigurations(assessmentSection); AssertHydraulicBoundaryOutput(assessmentSection, true); - - DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.GetFailureMechanisms() - .OfType() - .Single(); - AssertDuneErosionFailureMechanismContainsCalculationConfigurationsWithOutputs(duneErosionFailureMechanism); - AssertDuneErosionFailureMechanismContainsCalculationConfigurationsWithoutOutputs(duneErosionFailureMechanism); + AssertDuneErosionFailureAssertDuneErosionFailureMechanismCalculationConfigurations(assessmentSection.DuneErosion, true); } [Test] @@ -97,11 +87,7 @@ Assert.AreEqual(AssessmentSectionComposition.Dike, assessmentSection.Composition); AssertFailureMechanismsHaveAllPossibleCalculationConfigurations(assessmentSection); AssertHydraulicBoundaryOutput(assessmentSection, false); - - DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.GetFailureMechanisms() - .OfType() - .Single(); - AssertDuneErosionFailureAssertDuneErosionFailureMechanismCalculationConfigurations(duneErosionFailureMechanism, false); + AssertDuneErosionFailureAssertDuneErosionFailureMechanismCalculationConfigurations(assessmentSection.DuneErosion, false); } [Test] @@ -118,11 +104,7 @@ Assert.AreEqual(composition, assessmentSection.Composition); AssertFailureMechanismsHaveAllPossibleCalculationConfigurations(assessmentSection); AssertHydraulicBoundaryOutput(assessmentSection, false); - - DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.GetFailureMechanisms() - .OfType() - .Single(); - AssertDuneErosionFailureAssertDuneErosionFailureMechanismCalculationConfigurations(duneErosionFailureMechanism, false); + AssertDuneErosionFailureAssertDuneErosionFailureMechanismCalculationConfigurations(assessmentSection.DuneErosion, false); } [Test] @@ -136,12 +118,7 @@ AssertFailureMechanismsHaveAllCalculationConfigurationsWithoutCalculationOutputs(assessmentSection); Assert.False(assessmentSection.GetFailureMechanisms().SelectMany(fm => fm.Calculations).All(calc => calc.HasOutput)); AssertHydraulicBoundaryOutput(assessmentSection, true); - - DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.GetFailureMechanisms() - .OfType() - .Single(); - AssertDuneErosionFailureMechanismContainsCalculationConfigurationsWithOutputs(duneErosionFailureMechanism); - AssertDuneErosionFailureMechanismContainsCalculationConfigurationsWithoutOutputs(duneErosionFailureMechanism); + AssertDuneErosionFailureAssertDuneErosionFailureMechanismCalculationConfigurations(assessmentSection.DuneErosion, true); } [Test] @@ -159,13 +136,7 @@ AssertFailureMechanismsHaveAllCalculationConfigurationsWithoutCalculationOutputs(assessmentSection); Assert.False(assessmentSection.GetFailureMechanisms().SelectMany(fm => fm.Calculations).All(calc => calc.HasOutput)); AssertHydraulicBoundaryOutput(assessmentSection, true); - - DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.GetFailureMechanisms() - .OfType() - .Single(); - AssertNumberOfDuneErosionFailureMechanismCalculations(duneErosionFailureMechanism); - AssertDuneErosionFailureMechanismContainsCalculationConfigurationsWithoutOutputs(duneErosionFailureMechanism); - AssertDuneErosionFailureMechanismContainsCalculationConfigurationsWithOutputs(duneErosionFailureMechanism); + AssertDuneErosionFailureAssertDuneErosionFailureMechanismCalculationConfigurations(assessmentSection.DuneErosion, true); } [Test] @@ -210,6 +181,17 @@ private static void AssertHydraulicBoundaryOutput(AssessmentSection assessmentSection, bool hasOutput) { + CollectionAssert.IsNotEmpty(assessmentSection.HydraulicBoundaryDatabase.Locations); + + CollectionAssert.IsNotEmpty(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm); + CollectionAssert.IsNotEmpty(assessmentSection.WaterLevelCalculationsForSignalingNorm); + CollectionAssert.IsNotEmpty(assessmentSection.WaterLevelCalculationsForLowerLimitNorm); + CollectionAssert.IsNotEmpty(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm); + CollectionAssert.IsNotEmpty(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm); + CollectionAssert.IsNotEmpty(assessmentSection.WaveHeightCalculationsForSignalingNorm); + CollectionAssert.IsNotEmpty(assessmentSection.WaveHeightCalculationsForLowerLimitNorm); + CollectionAssert.IsNotEmpty(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm); + Assert.IsTrue(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.All(c => c.HasOutput == hasOutput)); Assert.IsTrue(assessmentSection.WaterLevelCalculationsForSignalingNorm.All(c => c.HasOutput == hasOutput)); Assert.IsTrue(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.All(c => c.HasOutput == hasOutput)); @@ -220,6 +202,13 @@ Assert.IsTrue(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm.All(c => c.HasOutput == hasOutput)); GrassCoverErosionOutwardsFailureMechanism failureMechanism = assessmentSection.GrassCoverErosionOutwards; + CollectionAssert.IsNotEmpty(assessmentSection.GrassCoverErosionOutwards.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm); + CollectionAssert.IsNotEmpty(assessmentSection.GrassCoverErosionOutwards.WaterLevelCalculationsForMechanismSpecificSignalingNorm); + CollectionAssert.IsNotEmpty(assessmentSection.GrassCoverErosionOutwards.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm); + CollectionAssert.IsNotEmpty(assessmentSection.GrassCoverErosionOutwards.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm); + CollectionAssert.IsNotEmpty(assessmentSection.GrassCoverErosionOutwards.WaveHeightCalculationsForMechanismSpecificSignalingNorm); + CollectionAssert.IsNotEmpty(assessmentSection.GrassCoverErosionOutwards.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm); + Assert.IsTrue(failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.All(calc => calc.HasOutput == hasOutput)); Assert.IsTrue(failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm.All(calc => calc.HasOutput == hasOutput)); Assert.IsTrue(failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.All(calc => calc.HasOutput == hasOutput)); @@ -240,7 +229,6 @@ var stabilityPointStructuresFailureMechanism = failureMechanism as StabilityPointStructuresFailureMechanism; var stabilityStoneCoverFailureMechanism = failureMechanism as StabilityStoneCoverFailureMechanism; var waveImpactAsphaltCoverFailureMechanism = failureMechanism as WaveImpactAsphaltCoverFailureMechanism; - var duneErosionFailureMechanism = failureMechanism as DuneErosionFailureMechanism; var macroStabilityInwardsFailureMechanism = failureMechanism as MacroStabilityInwardsFailureMechanism; if (closingStructuresFailureMechanism != null) @@ -324,7 +312,6 @@ var stabilityPointStructuresFailureMechanism = failureMechanism as StabilityPointStructuresFailureMechanism; var stabilityStoneCoverFailureMechanism = failureMechanism as StabilityStoneCoverFailureMechanism; var waveImpactAsphaltCoverFailureMechanism = failureMechanism as WaveImpactAsphaltCoverFailureMechanism; - var duneErosionFailureMechanism = failureMechanism as DuneErosionFailureMechanism; var macroStabilityInwardsFailureMechanism = failureMechanism as MacroStabilityInwardsFailureMechanism; if (closingStructuresFailureMechanism != null) @@ -376,11 +363,6 @@ AssertWaveImpactAsphaltCoverFailureMechanismCalculationConfigurationsWithoutOutputs(waveImpactAsphaltCoverFailureMechanism); } - if (duneErosionFailureMechanism != null) - { - AssertNumberOfDuneErosionFailureMechanismCalculations(duneErosionFailureMechanism); - } - if (macroStabilityInwardsFailureMechanism != null) { MacroStabilityInwardsTestDataGeneratorHelper.AssertHasStochasticSoilModels(macroStabilityInwardsFailureMechanism); @@ -664,18 +646,10 @@ #region Dune Erosion - private static void AssertNumberOfDuneErosionFailureMechanismCalculations(DuneErosionFailureMechanism failureMechanism) - { - int expectedCalculationsCount = failureMechanism.DuneLocations.Count(); - Assert.AreEqual(expectedCalculationsCount, failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.Count()); - Assert.AreEqual(expectedCalculationsCount, failureMechanism.CalculationsForMechanismSpecificSignalingNorm.Count()); - Assert.AreEqual(expectedCalculationsCount, failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.Count()); - Assert.AreEqual(expectedCalculationsCount, failureMechanism.CalculationsForLowerLimitNorm.Count()); - Assert.AreEqual(expectedCalculationsCount, failureMechanism.CalculationsForFactorizedLowerLimitNorm.Count()); - } - private static void AssertDuneErosionFailureAssertDuneErosionFailureMechanismCalculationConfigurations(DuneErosionFailureMechanism failureMechanism, bool hasOutput) { + CollectionAssert.IsNotEmpty(failureMechanism.DuneLocations); + if (hasOutput) { Assert.True(failureMechanism.DuneLocations.All(dl => dl.Calculation.Output != null)); @@ -698,28 +672,6 @@ } } - private static void AssertDuneErosionFailureMechanismContainsCalculationConfigurationsWithOutputs(DuneErosionFailureMechanism failureMechanism) - { - Assert.True(failureMechanism.DuneLocations.Any(dl => dl.Calculation.Output != null)); - - Assert.True(failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.Any(calc => calc.Output != null)); - Assert.True(failureMechanism.CalculationsForMechanismSpecificSignalingNorm.Any(calc => calc.Output != null)); - Assert.True(failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.Any(calc => calc.Output != null)); - Assert.True(failureMechanism.CalculationsForLowerLimitNorm.Any(calc => calc.Output != null)); - Assert.True(failureMechanism.CalculationsForFactorizedLowerLimitNorm.Any(calc => calc.Output != null)); - } - - private static void AssertDuneErosionFailureMechanismContainsCalculationConfigurationsWithoutOutputs(DuneErosionFailureMechanism failureMechanism) - { - Assert.True(failureMechanism.DuneLocations.Any(dl => dl.Calculation.Output == null)); - - Assert.True(failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.Any(calc => calc.Output == null)); - Assert.True(failureMechanism.CalculationsForMechanismSpecificSignalingNorm.Any(calc => calc.Output == null)); - Assert.True(failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.Any(calc => calc.Output == null)); - Assert.True(failureMechanism.CalculationsForLowerLimitNorm.Any(calc => calc.Output == null)); - Assert.True(failureMechanism.CalculationsForFactorizedLowerLimitNorm.Any(calc => calc.Output == null)); - } - #endregion #region Structures Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs =================================================================== diff -u -re57e79927485e44d681b0617f17bada42dbfb862 -r9ac057f20b9a85200bfa921bd36ea0026f07ebe3 --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision e57e79927485e44d681b0617f17bada42dbfb862) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 9ac057f20b9a85200bfa921bd36ea0026f07ebe3) @@ -34,7 +34,6 @@ using Ringtoets.Common.Data.TestUtil; using Ringtoets.DuneErosion.Data; using Ringtoets.DuneErosion.Data.TestUtil; -using Ringtoets.DuneErosion.Service; using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.GrassCoverErosionInwards.Data.TestUtil; using Ringtoets.GrassCoverErosionOutwards.Data; @@ -117,7 +116,7 @@ /// /// Gets a fully configured with a desired and /// with all possible configurations of the parent and nested calculations, but without design water level output, - /// wave height output and dune erosion output. + /// wave height output and dune location calculation output. /// /// The desired to initialize the with. /// The configured . @@ -126,7 +125,6 @@ { AssessmentSection assessmentSection = GetAssessmentSectionWithAllCalculationConfigurations(composition); RingtoetsDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationOutput(assessmentSection); - DuneErosionDataSynchronizationService.ClearDuneCalculationOutputs(assessmentSection.DuneErosion); return assessmentSection; } @@ -154,8 +152,7 @@ public static StabilityStoneCoverFailureMechanism GetStabilityStoneCoverFailureMechanismWithAllCalculationConfigurations() { var failureMechanism = new StabilityStoneCoverFailureMechanism(); - var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - SetFullyConfiguredFailureMechanism(failureMechanism, hydraulicBoundaryLocation); + SetFullyConfiguredFailureMechanism(failureMechanism, new TestHydraulicBoundaryLocation()); return failureMechanism; } @@ -167,8 +164,7 @@ public static WaveImpactAsphaltCoverFailureMechanism GetWaveImpactAsphaltCoverFailureMechanismWithAllCalculationConfigurations() { var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - SetFullyConfiguredFailureMechanism(failureMechanism, hydraulicBoundaryLocation); + SetFullyConfiguredFailureMechanism(failureMechanism, new TestHydraulicBoundaryLocation()); return failureMechanism; } @@ -180,7 +176,6 @@ public static GrassCoverErosionOutwardsFailureMechanism GetGrassCoverErosionOutwardsFailureMechanismWithAllCalculationConfigurations() { var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - SetFullyConfiguredFailureMechanism(failureMechanism, new TestHydraulicBoundaryLocation(), new Random(21)); return failureMechanism; @@ -193,8 +188,7 @@ public static HeightStructuresFailureMechanism GetHeightStructuresFailureMechanismWithAlLCalculationConfigurations() { var failureMechanism = new HeightStructuresFailureMechanism(); - var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - SetFullyConfiguredFailureMechanism(failureMechanism, hydraulicBoundaryLocation); + SetFullyConfiguredFailureMechanism(failureMechanism, new TestHydraulicBoundaryLocation()); return failureMechanism; } @@ -206,8 +200,7 @@ public static ClosingStructuresFailureMechanism GetClosingStructuresFailureMechanismWithAllCalculationConfigurations() { var failureMechanism = new ClosingStructuresFailureMechanism(); - var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - SetFullyConfiguredFailureMechanism(failureMechanism, hydraulicBoundaryLocation); + SetFullyConfiguredFailureMechanism(failureMechanism, new TestHydraulicBoundaryLocation()); return failureMechanism; } @@ -219,8 +212,7 @@ public static StabilityPointStructuresFailureMechanism GetStabilityPointStructuresFailureMechanismWithAllCalculationConfigurations() { var failureMechanism = new StabilityPointStructuresFailureMechanism(); - var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - SetFullyConfiguredFailureMechanism(failureMechanism, hydraulicBoundaryLocation); + SetFullyConfiguredFailureMechanism(failureMechanism, new TestHydraulicBoundaryLocation()); return failureMechanism; } @@ -232,8 +224,7 @@ public static GrassCoverErosionInwardsFailureMechanism GetGrassCoverErosionInwardsFailureMechanismWithAllCalculationConfigurations() { var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - SetFullyConfiguredFailureMechanism(failureMechanism, hydraulicBoundaryLocation); + SetFullyConfiguredFailureMechanism(failureMechanism, new TestHydraulicBoundaryLocation()); return failureMechanism; } @@ -1048,7 +1039,6 @@ Output = new TestDuneLocationCalculationOutput() } }, - new TestDuneLocation() }; failureMechanism.SetDuneLocations(duneLocations);