Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs =================================================================== diff -u -r070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856 -r6961604966c692884a617414010e131915732469 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs) (revision 070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs) (revision 6961604966c692884a617414010e131915732469) @@ -22,10 +22,8 @@ using System; using System.Collections.Generic; using Application.Ringtoets.Storage.DbContext; -using Core.Common.Base; using Core.Common.Util.Extensions; using Ringtoets.Common.Data.DikeProfiles; -using Ringtoets.Common.Data.Hydraulics; using Ringtoets.GrassCoverErosionOutwards.Data; namespace Application.Ringtoets.Storage.Create.GrassCoverErosionOutwards Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs =================================================================== diff -u -r070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856 -r6961604966c692884a617414010e131915732469 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 6961604966c692884a617414010e131915732469) @@ -41,7 +41,6 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.FailureMechanism; -using Ringtoets.Common.Data.Hydraulics; using Ringtoets.DuneErosion.Data; using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.GrassCoverErosionOutwards.Data; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r49d7201ca48c40bac6e9fe5832d531d11b8c16fd -r6961604966c692884a617414010e131915732469 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs) (revision 49d7201ca48c40bac6e9fe5832d531d11b8c16fd) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs) (revision 6961604966c692884a617414010e131915732469) @@ -75,7 +75,7 @@ }, GeneralInput = { - N = new Random().NextRoundedDouble(1, 20) + N = new Random(39).NextRoundedDouble(1, 20) } }; var registry = new PersistenceRegistry(); @@ -255,19 +255,7 @@ GrassCoverErosionOutwardsFailureMechanismMetaEntity metaEntity = entity.GrassCoverErosionOutwardsFailureMechanismMetaEntities.Single(); - AssertHydraulicLocationCalculationCollectionEntity(failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm, - metaEntity.HydraulicLocationCalculationCollectionEntity); - AssertHydraulicLocationCalculationCollectionEntity(failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm, - metaEntity.HydraulicLocationCalculationCollectionEntity1); - AssertHydraulicLocationCalculationCollectionEntity(failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm, - metaEntity.HydraulicLocationCalculationCollectionEntity2); - - AssertHydraulicLocationCalculationCollectionEntity(failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm, - metaEntity.HydraulicLocationCalculationCollectionEntity3); - AssertHydraulicLocationCalculationCollectionEntity(failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm, - metaEntity.HydraulicLocationCalculationCollectionEntity4); - AssertHydraulicLocationCalculationCollectionEntity(failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm, - metaEntity.HydraulicLocationCalculationCollectionEntity5); + AssertHydraulicLocationCalculationCollectionEntities(failureMechanism, metaEntity); } [Test] @@ -292,19 +280,25 @@ GrassCoverErosionOutwardsFailureMechanismMetaEntity metaEntity = entity.GrassCoverErosionOutwardsFailureMechanismMetaEntities.Single(); - AssertHydraulicLocationCalculationCollectionEntity(failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm, - metaEntity.HydraulicLocationCalculationCollectionEntity); - AssertHydraulicLocationCalculationCollectionEntity(failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm, - metaEntity.HydraulicLocationCalculationCollectionEntity1); - AssertHydraulicLocationCalculationCollectionEntity(failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm, - metaEntity.HydraulicLocationCalculationCollectionEntity2); + AssertHydraulicLocationCalculationCollectionEntities(failureMechanism, metaEntity); + } - AssertHydraulicLocationCalculationCollectionEntity(failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm, - metaEntity.HydraulicLocationCalculationCollectionEntity3); - AssertHydraulicLocationCalculationCollectionEntity(failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm, - metaEntity.HydraulicLocationCalculationCollectionEntity4); - AssertHydraulicLocationCalculationCollectionEntity(failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm, - metaEntity.HydraulicLocationCalculationCollectionEntity5); + private static void AssertHydraulicLocationCalculationCollectionEntities(GrassCoverErosionOutwardsFailureMechanism expectedFailureMechanism, + GrassCoverErosionOutwardsFailureMechanismMetaEntity actualEntity) + { + AssertHydraulicLocationCalculationCollectionEntity(expectedFailureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm, + actualEntity.HydraulicLocationCalculationCollectionEntity); + AssertHydraulicLocationCalculationCollectionEntity(expectedFailureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm, + actualEntity.HydraulicLocationCalculationCollectionEntity1); + AssertHydraulicLocationCalculationCollectionEntity(expectedFailureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm, + actualEntity.HydraulicLocationCalculationCollectionEntity2); + + AssertHydraulicLocationCalculationCollectionEntity(expectedFailureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm, + actualEntity.HydraulicLocationCalculationCollectionEntity3); + AssertHydraulicLocationCalculationCollectionEntity(expectedFailureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm, + actualEntity.HydraulicLocationCalculationCollectionEntity4); + AssertHydraulicLocationCalculationCollectionEntity(expectedFailureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm, + actualEntity.HydraulicLocationCalculationCollectionEntity5); } private static void SetHydraulicBoundaryLocationCalculationInputsOfFailureMechanism(GrassCoverErosionOutwardsFailureMechanism failureMechanism)