Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/DuneErosion/DuneErosionFailureMechanismCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/DuneErosion/DuneErosionFailureMechanismCreateExtensions.cs (.../DuneErosionFailureMechanismCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/DuneErosion/DuneErosionFailureMechanismCreateExtensions.cs (.../DuneErosionFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -53,7 +53,7 @@ { foreach (var failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(registry); + var sectionResultEntity = failureMechanismSectionResult.Create(); var section = registry.Get(failureMechanismSectionResult.Section); section.DuneErosionSectionResultEntities.Add(sectionResultEntity); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/DuneErosion/DuneErosionFailureMechanismSectionResultCreateExtensions.cs =================================================================== diff -u -rfdd03cdaf7c9eed6fccaa5aa591f71deddcb2b74 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/DuneErosion/DuneErosionFailureMechanismSectionResultCreateExtensions.cs (.../DuneErosionFailureMechanismSectionResultCreateExtensions.cs) (revision fdd03cdaf7c9eed6fccaa5aa591f71deddcb2b74) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/DuneErosion/DuneErosionFailureMechanismSectionResultCreateExtensions.cs (.../DuneErosionFailureMechanismSectionResultCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -35,15 +35,9 @@ /// Creates a based on the information of the . /// /// The result to create a database entity for. - /// The object keeping track of create operations. /// A new . - /// Thrown when is null. - internal static DuneErosionSectionResultEntity Create(this DuneErosionFailureMechanismSectionResult result, PersistenceRegistry registry) + internal static DuneErosionSectionResultEntity Create(this DuneErosionFailureMechanismSectionResult result) { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } var sectionResultEntity = new DuneErosionSectionResultEntity { LayerOne = Convert.ToByte(result.AssessmentLayerOne), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GeneralGrassCoverErosionInwardsInputCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GeneralGrassCoverErosionInwardsInputCreateExtensions.cs (.../GeneralGrassCoverErosionInwardsInputCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GeneralGrassCoverErosionInwardsInputCreateExtensions.cs (.../GeneralGrassCoverErosionInwardsInputCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -37,16 +37,10 @@ /// /// The general calculation input for Grass Cover Erosion Inwards /// to create a database entity for. - /// The object keeping track of create operations. /// A new . /// Thrown when is null. - internal static GrassCoverErosionInwardsFailureMechanismMetaEntity Create(this GeneralGrassCoverErosionInwardsInput input, PersistenceRegistry registry) + internal static GrassCoverErosionInwardsFailureMechanismMetaEntity Create(this GeneralGrassCoverErosionInwardsInput input) { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } - var entity = new GrassCoverErosionInwardsFailureMechanismMetaEntity { N = input.N Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensions.cs =================================================================== diff -u -r92598abae0206724835b91b3708e970ae09ac5de -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensions.cs (.../GrassCoverErosionInwardsCalculationCreateExtensions.cs) (revision 92598abae0206724835b91b3708e970ae09ac5de) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensions.cs (.../GrassCoverErosionInwardsCalculationCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -56,18 +56,18 @@ Order = order }; SetInputValues(entity, calculation.InputParameters, registry); - SetOutputEntity(entity, calculation, registry); + SetOutputEntity(entity, calculation); registry.Register(entity, calculation); return entity; } - private static void SetOutputEntity(GrassCoverErosionInwardsCalculationEntity entity, GrassCoverErosionInwardsCalculation calculation, PersistenceRegistry registry) + private static void SetOutputEntity(GrassCoverErosionInwardsCalculationEntity entity, GrassCoverErosionInwardsCalculation calculation) { if (calculation.HasOutput) { - entity.GrassCoverErosionInwardsOutputEntities.Add(calculation.Output.Create(registry)); + entity.GrassCoverErosionInwardsOutputEntities.Add(calculation.Output.Create()); } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs (.../GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs (.../GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -42,17 +42,17 @@ internal static FailureMechanismEntity Create(this GrassCoverErosionInwardsFailureMechanism mechanism, PersistenceRegistry registry) { var entity = mechanism.Create(FailureMechanismType.GrassRevetmentTopErosionAndInwards, registry); - AddEntitiesForGeneralInput(mechanism, registry, entity); + AddEntitiesForGeneralInput(mechanism, entity); AddEntitiesForDikeProfiles(mechanism, registry, entity); entity.CalculationGroupEntity = mechanism.CalculationsGroup.Create(registry, 0); AddEntitiesForSectionResults(mechanism.SectionResults, registry); return entity; } - private static void AddEntitiesForGeneralInput(GrassCoverErosionInwardsFailureMechanism mechanism, PersistenceRegistry registry, FailureMechanismEntity entity) + private static void AddEntitiesForGeneralInput(GrassCoverErosionInwardsFailureMechanism mechanism, FailureMechanismEntity entity) { - entity.GrassCoverErosionInwardsFailureMechanismMetaEntities.Add(mechanism.GeneralInput.Create(registry)); + entity.GrassCoverErosionInwardsFailureMechanismMetaEntities.Add(mechanism.GeneralInput.Create()); } private static void AddEntitiesForDikeProfiles(GrassCoverErosionInwardsFailureMechanism mechanism, PersistenceRegistry registry, FailureMechanismEntity entity) Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensions.cs =================================================================== diff -u -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensions.cs (.../GrassCoverErosionInwardsOutputCreateExtensions.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensions.cs (.../GrassCoverErosionInwardsOutputCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -37,16 +37,9 @@ /// /// The grass cover erosion inwards calculation output to create /// a database entity for. - /// The object keeping track of create operations. /// A new . - /// Thrown when is null. - internal static GrassCoverErosionInwardsOutputEntity Create(this GrassCoverErosionInwardsOutput output, PersistenceRegistry registry) + internal static GrassCoverErosionInwardsOutputEntity Create(this GrassCoverErosionInwardsOutput output) { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } - var entity = new GrassCoverErosionInwardsOutputEntity { DikeHeight = output.DikeHeight.Value.ToNaNAsNull(), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GeneralGrassCoverErosionOutwardsInputCreateExtensions.cs =================================================================== diff -u -r741fcc00e47a7ff8fa01bbf15edbaedf8dec2e57 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GeneralGrassCoverErosionOutwardsInputCreateExtensions.cs (.../GeneralGrassCoverErosionOutwardsInputCreateExtensions.cs) (revision 741fcc00e47a7ff8fa01bbf15edbaedf8dec2e57) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GeneralGrassCoverErosionOutwardsInputCreateExtensions.cs (.../GeneralGrassCoverErosionOutwardsInputCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using Application.Ringtoets.Storage.DbContext; using Ringtoets.GrassCoverErosionOutwards.Data; @@ -34,16 +33,9 @@ /// Creates a based on the information of the . /// /// The general failure mechanism input to create a database entity for. - /// The object keeping track of create operations. /// A new . - /// Thrown when is null. - internal static GrassCoverErosionOutwardsFailureMechanismMetaEntity Create(this GeneralGrassCoverErosionOutwardsInput generalInput, PersistenceRegistry registry) + internal static GrassCoverErosionOutwardsFailureMechanismMetaEntity Create(this GeneralGrassCoverErosionOutwardsInput generalInput) { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } - var entity = new GrassCoverErosionOutwardsFailureMechanismMetaEntity { N = generalInput.N Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs =================================================================== diff -u -r056c24804fa3267952bebae1f58705bf45338b07 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs) (revision 056c24804fa3267952bebae1f58705bf45338b07) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -45,7 +45,7 @@ { var entity = mechanism.Create(FailureMechanismType.GrassRevetmentErosionOutwards, registry); AddEntitiesForSectionResults(mechanism.SectionResults, registry); - AddEntitiesForFailureMechanismMeta(mechanism.GeneralInput, entity, registry); + AddEntitiesForFailureMechanismMeta(mechanism.GeneralInput, entity); AddEntitiesForForeshoreProfiles(mechanism.ForeshoreProfiles, entity, registry); AddEntitiesForHydraulicBoundaryLocations(mechanism.HydraulicBoundaryLocations, entity, registry); entity.CalculationGroupEntity = mechanism.WaveConditionsCalculationGroup.Create(registry, 0); @@ -62,9 +62,9 @@ } } - private static void AddEntitiesForFailureMechanismMeta(GeneralGrassCoverErosionOutwardsInput generalInput, FailureMechanismEntity entity, PersistenceRegistry registry) + private static void AddEntitiesForFailureMechanismMeta(GeneralGrassCoverErosionOutwardsInput generalInput, FailureMechanismEntity entity) { - entity.GrassCoverErosionOutwardsFailureMechanismMetaEntities.Add(generalInput.Create(registry)); + entity.GrassCoverErosionOutwardsFailureMechanismMetaEntities.Add(generalInput.Create()); } private static void AddEntitiesForSectionResults( @@ -73,7 +73,7 @@ { foreach (var failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(registry); + var sectionResultEntity = failureMechanismSectionResult.Create(); var section = registry.Get(failureMechanismSectionResult.Section); section.GrassCoverErosionOutwardsSectionResultEntities.Add(sectionResultEntity); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -35,15 +35,9 @@ /// Creates a based on the information of the . /// /// The result to create a database entity for. - /// The object keeping track of create operations. /// A new . - /// Thrown when is null. - internal static GrassCoverErosionOutwardsSectionResultEntity Create(this GrassCoverErosionOutwardsFailureMechanismSectionResult result, PersistenceRegistry registry) + internal static GrassCoverErosionOutwardsSectionResultEntity Create(this GrassCoverErosionOutwardsFailureMechanismSectionResult result) { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } var sectionResultEntity = new GrassCoverErosionOutwardsSectionResultEntity { LayerOne = Convert.ToByte(result.AssessmentLayerOne), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs =================================================================== diff -u -r92598abae0206724835b91b3708e970ae09ac5de -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs) (revision 92598abae0206724835b91b3708e970ae09ac5de) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -59,7 +59,7 @@ }; SetInputParameters(entity, calculation, registry); - SetOutputEntities(entity, calculation, registry); + SetOutputEntities(entity, calculation); return entity; } @@ -88,14 +88,14 @@ entity.StepSize = Convert.ToByte(calculation.InputParameters.StepSize); } - private static void SetOutputEntities(GrassCoverErosionOutwardsWaveConditionsCalculationEntity entity, GrassCoverErosionOutwardsWaveConditionsCalculation calculation, PersistenceRegistry registry) + private static void SetOutputEntities(GrassCoverErosionOutwardsWaveConditionsCalculationEntity entity, GrassCoverErosionOutwardsWaveConditionsCalculation calculation) { if (calculation.HasOutput) { var i = 0; foreach (WaveConditionsOutput output in calculation.Output.Items) { - entity.GrassCoverErosionOutwardsWaveConditionsOutputEntities.Add(output.CreateGrassCoverErosionOutwardsWaveConditionsOutputEntity(i++, registry)); + entity.GrassCoverErosionOutwardsWaveConditionsOutputEntities.Add(output.CreateGrassCoverErosionOutwardsWaveConditionsOutputEntity(i++)); } } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismCreateExtensions.cs (.../GrassCoverSlipOffInwardsFailureMechanismCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismCreateExtensions.cs (.../GrassCoverSlipOffInwardsFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -53,7 +53,7 @@ { foreach (var failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(registry); + var sectionResultEntity = failureMechanismSectionResult.Create(); var section = registry.Get(failureMechanismSectionResult.Section); section.GrassCoverSlipOffInwardsSectionResultEntities.Add(sectionResultEntity); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensions.cs (.../GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensions.cs (.../GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -35,15 +35,9 @@ /// Creates a based on the information of the . /// /// The result to create a database entity for. - /// The object keeping track of create operations. /// A new . - /// Thrown when is null. - internal static GrassCoverSlipOffInwardsSectionResultEntity Create(this GrassCoverSlipOffInwardsFailureMechanismSectionResult result, PersistenceRegistry registry) + internal static GrassCoverSlipOffInwardsSectionResultEntity Create(this GrassCoverSlipOffInwardsFailureMechanismSectionResult result) { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } var sectionResultEntity = new GrassCoverSlipOffInwardsSectionResultEntity { LayerOne = Convert.ToByte(result.AssessmentLayerOne), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismCreateExtensions.cs (.../GrassCoverSlipOffOutwardsFailureMechanismCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismCreateExtensions.cs (.../GrassCoverSlipOffOutwardsFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -53,7 +53,7 @@ { foreach (var failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(registry); + var sectionResultEntity = failureMechanismSectionResult.Create(); var section = registry.Get(failureMechanismSectionResult.Section); section.GrassCoverSlipOffOutwardsSectionResultEntities.Add(sectionResultEntity); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensions.cs (.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensions.cs (.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -35,15 +35,9 @@ /// Creates a based on the information of the . /// /// The result to create a database entity for. - /// The object keeping track of create operations. /// A new . - /// Thrown when is null. - internal static GrassCoverSlipOffOutwardsSectionResultEntity Create(this GrassCoverSlipOffOutwardsFailureMechanismSectionResult result, PersistenceRegistry registry) + internal static GrassCoverSlipOffOutwardsSectionResultEntity Create(this GrassCoverSlipOffOutwardsFailureMechanismSectionResult result) { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } var sectionResultEntity = new GrassCoverSlipOffOutwardsSectionResultEntity { LayerOne = Convert.ToByte(result.AssessmentLayerOne), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityInwards/MacrostabilityInwardsFailureMechanismCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityInwards/MacrostabilityInwardsFailureMechanismCreateExtensions.cs (.../MacrostabilityInwardsFailureMechanismCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityInwards/MacrostabilityInwardsFailureMechanismCreateExtensions.cs (.../MacrostabilityInwardsFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -53,7 +53,7 @@ { foreach (var failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(registry); + var sectionResultEntity = failureMechanismSectionResult.Create(); var section = registry.Get(failureMechanismSectionResult.Section); section.MacrostabilityInwardsSectionResultEntities.Add(sectionResultEntity); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityInwards/MacrostabilityInwardsFailureMechanismSectionResultCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityInwards/MacrostabilityInwardsFailureMechanismSectionResultCreateExtensions.cs (.../MacrostabilityInwardsFailureMechanismSectionResultCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityInwards/MacrostabilityInwardsFailureMechanismSectionResultCreateExtensions.cs (.../MacrostabilityInwardsFailureMechanismSectionResultCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -35,15 +35,9 @@ /// Creates a based on the information of the . /// /// The result to create a database entity for. - /// The object keeping track of create operations. /// A new . - /// Thrown when is null. - internal static MacrostabilityInwardsSectionResultEntity Create(this MacrostabilityInwardsFailureMechanismSectionResult result, PersistenceRegistry registry) + internal static MacrostabilityInwardsSectionResultEntity Create(this MacrostabilityInwardsFailureMechanismSectionResult result) { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } var sectionResultEntity = new MacrostabilityInwardsSectionResultEntity { LayerOne = Convert.ToByte(result.AssessmentLayerOne), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityOutwards/MacrostabilityOutwardsFailureMechanismCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityOutwards/MacrostabilityOutwardsFailureMechanismCreateExtensions.cs (.../MacrostabilityOutwardsFailureMechanismCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityOutwards/MacrostabilityOutwardsFailureMechanismCreateExtensions.cs (.../MacrostabilityOutwardsFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -53,7 +53,7 @@ { foreach (var failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(registry); + var sectionResultEntity = failureMechanismSectionResult.Create(); var section = registry.Get(failureMechanismSectionResult.Section); section.MacrostabilityOutwardsSectionResultEntities.Add(sectionResultEntity); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityOutwards/MacrostabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityOutwards/MacrostabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs (.../MacrostabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityOutwards/MacrostabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs (.../MacrostabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -35,15 +35,9 @@ /// Creates a based on the information of the . /// /// The result to create a database entity for. - /// The object keeping track of create operations. /// A new . - /// Thrown when is null. - internal static MacrostabilityOutwardsSectionResultEntity Create(this MacrostabilityOutwardsFailureMechanismSectionResult result, PersistenceRegistry registry) + internal static MacrostabilityOutwardsSectionResultEntity Create(this MacrostabilityOutwardsFailureMechanismSectionResult result) { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } var sectionResultEntity = new MacrostabilityOutwardsSectionResultEntity { LayerOne = Convert.ToByte(result.AssessmentLayerOne), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Microstability/MicrostabilityFailureMechanismCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Microstability/MicrostabilityFailureMechanismCreateExtensions.cs (.../MicrostabilityFailureMechanismCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Microstability/MicrostabilityFailureMechanismCreateExtensions.cs (.../MicrostabilityFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -53,7 +53,7 @@ { foreach (var failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(registry); + var sectionResultEntity = failureMechanismSectionResult.Create(); var section = registry.Get(failureMechanismSectionResult.Section); section.MicrostabilitySectionResultEntities.Add(sectionResultEntity); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Microstability/MicrostabilityFailureMechanismSectionResultCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Microstability/MicrostabilityFailureMechanismSectionResultCreateExtensions.cs (.../MicrostabilityFailureMechanismSectionResultCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Microstability/MicrostabilityFailureMechanismSectionResultCreateExtensions.cs (.../MicrostabilityFailureMechanismSectionResultCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -35,15 +35,9 @@ /// Creates a based on the information of the . /// /// The result to create a database entity for. - /// The object keeping track of create operations. /// A new . - /// Thrown when is null. - internal static MicrostabilitySectionResultEntity Create(this MicrostabilityFailureMechanismSectionResult result, PersistenceRegistry registry) + internal static MicrostabilitySectionResultEntity Create(this MicrostabilityFailureMechanismSectionResult result) { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } var sectionResultEntity = new MicrostabilitySectionResultEntity { LayerOne = Convert.ToByte(result.AssessmentLayerOne), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs =================================================================== diff -u -r1a062846c75d2d86454dc052adc7a5993b79963e -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs (.../PipingCalculationScenarioCreateExtensions.cs) (revision 1a062846c75d2d86454dc052adc7a5993b79963e) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs (.../PipingCalculationScenarioCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -56,8 +56,8 @@ Order = order }; SetInputParametersToEntity(entity, calculation.InputParameters, registry); - AddEntityForPipingOutput(entity, calculation.Output, registry); - AddEntityForPipingSemiProbabilisticOutput(entity, calculation.SemiProbabilisticOutput, registry); + AddEntityForPipingOutput(entity, calculation.Output); + AddEntityForPipingSemiProbabilisticOutput(entity, calculation.SemiProbabilisticOutput); return entity; } @@ -89,19 +89,19 @@ entity.DampingFactorExitStandardDeviation = inputParameters.DampingFactorExit.StandardDeviation.Value.ToNaNAsNull(); } - private static void AddEntityForPipingOutput(PipingCalculationEntity entity, PipingOutput output, PersistenceRegistry registry) + private static void AddEntityForPipingOutput(PipingCalculationEntity entity, PipingOutput output) { if (output != null) { - entity.PipingCalculationOutputEntities.Add(output.Create(registry)); + entity.PipingCalculationOutputEntities.Add(output.Create()); } } - private static void AddEntityForPipingSemiProbabilisticOutput(PipingCalculationEntity entity, PipingSemiProbabilisticOutput output, PersistenceRegistry registry) + private static void AddEntityForPipingSemiProbabilisticOutput(PipingCalculationEntity entity, PipingSemiProbabilisticOutput output) { if (output != null) { - entity.PipingSemiProbabilisticOutputEntities.Add(output.Create(registry)); + entity.PipingSemiProbabilisticOutputEntities.Add(output.Create()); } } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingFailureMechanismCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingFailureMechanismCreateExtensions.cs (.../PipingFailureMechanismCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingFailureMechanismCreateExtensions.cs (.../PipingFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -43,7 +43,7 @@ { var entity = mechanism.Create(FailureMechanismType.Piping, registry); - AddEntitiesForFailureMechanismMeta(mechanism, registry, entity); + AddEntitiesForFailureMechanismMeta(mechanism, entity); AddEntitiesForStochasticSoilModels(mechanism, registry, entity); AddEntitiesForSurfaceLines(mechanism, registry, entity); AddEntitiesForSectionResults(mechanism.SectionResults, registry); @@ -59,15 +59,15 @@ { foreach (var pipingFailureMechanismSectionResult in sectionResults) { - var pipingSectionResultEntity = pipingFailureMechanismSectionResult.Create(registry); + var pipingSectionResultEntity = pipingFailureMechanismSectionResult.Create(); var section = registry.Get(pipingFailureMechanismSectionResult.Section); section.PipingSectionResultEntities.Add(pipingSectionResultEntity); } } - private static void AddEntitiesForFailureMechanismMeta(PipingFailureMechanism mechanism, PersistenceRegistry registry, FailureMechanismEntity entity) + private static void AddEntitiesForFailureMechanismMeta(PipingFailureMechanism mechanism, FailureMechanismEntity entity) { - entity.PipingFailureMechanismMetaEntities.Add(mechanism.PipingProbabilityAssessmentInput.Create(registry)); + entity.PipingFailureMechanismMetaEntities.Add(mechanism.PipingProbabilityAssessmentInput.Create()); } private static void AddEntitiesForStochasticSoilModels(PipingFailureMechanism mechanism, PersistenceRegistry registry, FailureMechanismEntity entity) Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingFailureMechanismSectionResultCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingFailureMechanismSectionResultCreateExtensions.cs (.../PipingFailureMechanismSectionResultCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingFailureMechanismSectionResultCreateExtensions.cs (.../PipingFailureMechanismSectionResultCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -35,15 +35,9 @@ /// Creates a based on the information of the . /// /// The result to create a database entity for. - /// The object keeping track of create operations. /// A new . - /// Thrown when is null. - internal static PipingSectionResultEntity Create(this PipingFailureMechanismSectionResult result, PersistenceRegistry registry) + internal static PipingSectionResultEntity Create(this PipingFailureMechanismSectionResult result) { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } var pipingSectionResultEntity = new PipingSectionResultEntity { LayerOne = Convert.ToByte(result.AssessmentLayerOne), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingOutputCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingOutputCreateExtensions.cs (.../PipingOutputCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingOutputCreateExtensions.cs (.../PipingOutputCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using Application.Ringtoets.Storage.DbContext; using Ringtoets.Piping.Data; @@ -36,15 +35,9 @@ /// /// The calculation output for piping failure mechanism to /// create a database entity for. - /// The object keeping track of create operations. /// A new . - /// Thrown when is null. - internal static PipingCalculationOutputEntity Create(this PipingOutput output, PersistenceRegistry registry) + internal static PipingCalculationOutputEntity Create(this PipingOutput output) { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } var entity = new PipingCalculationOutputEntity { HeaveFactorOfSafety = output.HeaveFactorOfSafety.ToNaNAsNull(), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingProbabilityAssessmentInputCreateExtensions.cs =================================================================== diff -u -rb190a14336e0d8fe9aec34e81a68194081c76155 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingProbabilityAssessmentInputCreateExtensions.cs (.../PipingProbabilityAssessmentInputCreateExtensions.cs) (revision b190a14336e0d8fe9aec34e81a68194081c76155) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingProbabilityAssessmentInputCreateExtensions.cs (.../PipingProbabilityAssessmentInputCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using Application.Ringtoets.Storage.DbContext; using Ringtoets.Piping.Data; @@ -34,16 +33,9 @@ /// Creates a based on the information of the . /// /// The piping probability assessment input to create a database entity for. - /// The object keeping track of create operations. /// A new . - /// Thrown when is null. - internal static PipingFailureMechanismMetaEntity Create(this PipingProbabilityAssessmentInput assessmentInput, PersistenceRegistry registry) + internal static PipingFailureMechanismMetaEntity Create(this PipingProbabilityAssessmentInput assessmentInput) { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } - var entity = new PipingFailureMechanismMetaEntity { A = assessmentInput.A, Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSemiProbabilisticOutputCreateExtensions.cs =================================================================== diff -u -rb190a14336e0d8fe9aec34e81a68194081c76155 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSemiProbabilisticOutputCreateExtensions.cs (.../PipingSemiProbabilisticOutputCreateExtensions.cs) (revision b190a14336e0d8fe9aec34e81a68194081c76155) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSemiProbabilisticOutputCreateExtensions.cs (.../PipingSemiProbabilisticOutputCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using Application.Ringtoets.Storage.DbContext; using Ringtoets.Piping.Data; @@ -37,15 +36,9 @@ /// /// The semi-probabilistic calculation output /// for piping to create a database entity for. - /// The object keeping track of create operations. /// A new . - /// Thrown when is null. - internal static PipingSemiProbabilisticOutputEntity Create(this PipingSemiProbabilisticOutput semiProbabilisticOutput, PersistenceRegistry registry) + internal static PipingSemiProbabilisticOutputEntity Create(this PipingSemiProbabilisticOutput semiProbabilisticOutput) { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } var entity = new PipingSemiProbabilisticOutputEntity { UpliftFactorOfSafety = semiProbabilisticOutput.UpliftFactorOfSafety.Value.ToNaNAsNull(), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSoilLayerCreateExtensions.cs =================================================================== diff -u -r1a062846c75d2d86454dc052adc7a5993b79963e -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSoilLayerCreateExtensions.cs (.../PipingSoilLayerCreateExtensions.cs) (revision 1a062846c75d2d86454dc052adc7a5993b79963e) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSoilLayerCreateExtensions.cs (.../PipingSoilLayerCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -35,17 +35,10 @@ /// Creates a based on the information of the . /// /// The layer to create a database entity for. - /// The object keeping track of create operations. /// Index at which this instance resides inside its parent container. /// A new . - /// Thrown when is null. - internal static SoilLayerEntity Create(this PipingSoilLayer layer, PersistenceRegistry registry, int order) + internal static SoilLayerEntity Create(this PipingSoilLayer layer, int order) { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } - var entity = new SoilLayerEntity { IsAquifer = Convert.ToByte(layer.IsAquifer), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSoilProfileCreateExtensions.cs =================================================================== diff -u -r1a062846c75d2d86454dc052adc7a5993b79963e -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSoilProfileCreateExtensions.cs (.../PipingSoilProfileCreateExtensions.cs) (revision 1a062846c75d2d86454dc052adc7a5993b79963e) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSoilProfileCreateExtensions.cs (.../PipingSoilProfileCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -56,18 +56,18 @@ Bottom = profile.Bottom.ToNaNAsNull() }; - AddEntitiesForPipingSoilLayers(profile, registry, entity); + AddEntitiesForPipingSoilLayers(profile, entity); registry.Register(entity, profile); return entity; } - private static void AddEntitiesForPipingSoilLayers(PipingSoilProfile profile, PersistenceRegistry registry, SoilProfileEntity entity) + private static void AddEntitiesForPipingSoilLayers(PipingSoilProfile profile, SoilProfileEntity entity) { int index = 0; foreach (var pipingSoilLayer in profile.Layers) { - entity.SoilLayerEntities.Add(pipingSoilLayer.Create(registry, index++)); + entity.SoilLayerEntities.Add(pipingSoilLayer.Create(index++)); } } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/RingtoetsPipingSurfaceLineCreateExtensions.cs =================================================================== diff -u -r1a062846c75d2d86454dc052adc7a5993b79963e -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/RingtoetsPipingSurfaceLineCreateExtensions.cs (.../RingtoetsPipingSurfaceLineCreateExtensions.cs) (revision 1a062846c75d2d86454dc052adc7a5993b79963e) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/RingtoetsPipingSurfaceLineCreateExtensions.cs (.../RingtoetsPipingSurfaceLineCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -62,14 +62,14 @@ PointsXml = new Point3DXmlSerializer().ToXml(surfaceLine.Points), Order = order }; - CreateCharacteristicPointEntities(surfaceLine, registry, entity); + CreateCharacteristicPointEntities(surfaceLine, entity); registry.Register(entity, surfaceLine); return entity; } - private static void CreateCharacteristicPointEntities(RingtoetsPipingSurfaceLine surfaceLine, PersistenceRegistry registry, SurfaceLineEntity entity) + private static void CreateCharacteristicPointEntities(RingtoetsPipingSurfaceLine surfaceLine, SurfaceLineEntity entity) { var characteristicPointAssociations = new[] { @@ -83,13 +83,12 @@ foreach (Tuple characteristicPointToSave in characteristicPointAssociations.Where(t => t.Item1 != null)) { var characteristicPointEntity = CreateCharacteristicPointEntity(characteristicPointToSave.Item1, - characteristicPointToSave.Item2, - registry); + characteristicPointToSave.Item2); entity.CharacteristicPointEntities.Add(characteristicPointEntity); } } - private static CharacteristicPointEntity CreateCharacteristicPointEntity(Point3D point, CharacteristicPointType type, PersistenceRegistry registry) + private static CharacteristicPointEntity CreateCharacteristicPointEntity(Point3D point, CharacteristicPointType type) { var entity = new CharacteristicPointEntity { Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingStructure/PipingStructureFailureMechanismCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingStructure/PipingStructureFailureMechanismCreateExtensions.cs (.../PipingStructureFailureMechanismCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingStructure/PipingStructureFailureMechanismCreateExtensions.cs (.../PipingStructureFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -53,7 +53,7 @@ { foreach (var failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(registry); + var sectionResultEntity = failureMechanismSectionResult.Create(); var section = registry.Get(failureMechanismSectionResult.Section); section.PipingStructureSectionResultEntities.Add(sectionResultEntity); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingStructure/PipingStructureFailureMechanismSectionResultCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingStructure/PipingStructureFailureMechanismSectionResultCreateExtensions.cs (.../PipingStructureFailureMechanismSectionResultCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingStructure/PipingStructureFailureMechanismSectionResultCreateExtensions.cs (.../PipingStructureFailureMechanismSectionResultCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -35,15 +35,9 @@ /// Creates a based on the information of the . /// /// The result to create a database entity for. - /// The object keeping track of create operations. /// A new . - /// Thrown when is null. - internal static PipingStructureSectionResultEntity Create(this PipingStructureFailureMechanismSectionResult result, PersistenceRegistry registry) + internal static PipingStructureSectionResultEntity Create(this PipingStructureFailureMechanismSectionResult result) { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } var sectionResultEntity = new PipingStructureSectionResultEntity { LayerOne = Convert.ToByte(result.AssessmentLayerOne), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ProbabilityAssessmentOutputCreateExtensions.cs =================================================================== diff -u -rfaeb56f2d76b07f370127de2beb66edad2dea6af -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ProbabilityAssessmentOutputCreateExtensions.cs (.../ProbabilityAssessmentOutputCreateExtensions.cs) (revision faeb56f2d76b07f370127de2beb66edad2dea6af) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ProbabilityAssessmentOutputCreateExtensions.cs (.../ProbabilityAssessmentOutputCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using Application.Ringtoets.Storage.DbContext; using Ringtoets.Common.Data.Probability; @@ -36,17 +35,10 @@ /// the information of the . /// /// The calculation output to create a database entity for. - /// The object keeping track of create operations. /// A new . - /// Thrown when is null. - internal static T Create(this ProbabilityAssessmentOutput output, PersistenceRegistry registry) + internal static T Create(this ProbabilityAssessmentOutput output) where T : IProbabilityAssessmentOutputEntity, new() { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } - return new T { RequiredProbability = output.RequiredProbability.ToNaNAsNull(), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismCreateExtensions.cs =================================================================== diff -u -r8aaa7b9a8a2826cf8da31d0fd136f2d559933afe -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismCreateExtensions.cs (.../StabilityStoneCoverFailureMechanismCreateExtensions.cs) (revision 8aaa7b9a8a2826cf8da31d0fd136f2d559933afe) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismCreateExtensions.cs (.../StabilityStoneCoverFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -56,7 +56,7 @@ { foreach (var failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(registry); + var sectionResultEntity = failureMechanismSectionResult.Create(); var section = registry.Get(failureMechanismSectionResult.Section); section.StabilityStoneCoverSectionResultEntities.Add(sectionResultEntity); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismSectionResultCreateExtensions.cs =================================================================== diff -u -rfdd03cdaf7c9eed6fccaa5aa591f71deddcb2b74 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismSectionResultCreateExtensions.cs (.../StabilityStoneCoverFailureMechanismSectionResultCreateExtensions.cs) (revision fdd03cdaf7c9eed6fccaa5aa591f71deddcb2b74) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismSectionResultCreateExtensions.cs (.../StabilityStoneCoverFailureMechanismSectionResultCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -35,15 +35,9 @@ /// Creates a based on the information of the . /// /// The result to create a database entity for. - /// The object keeping track of create operations. /// A new . - /// Thrown when is null. - internal static StabilityStoneCoverSectionResultEntity Create(this StabilityStoneCoverFailureMechanismSectionResult result, PersistenceRegistry registry) + internal static StabilityStoneCoverSectionResultEntity Create(this StabilityStoneCoverFailureMechanismSectionResult result) { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } var sectionResultEntity = new StabilityStoneCoverSectionResultEntity { LayerOne = Convert.ToByte(result.AssessmentLayerOne), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensions.cs =================================================================== diff -u -r92598abae0206724835b91b3708e970ae09ac5de -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensions.cs (.../StabilityStoneCoverWaveConditionsCalculationCreateExtensions.cs) (revision 92598abae0206724835b91b3708e970ae09ac5de) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensions.cs (.../StabilityStoneCoverWaveConditionsCalculationCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -57,7 +57,7 @@ }; SetInputParameters(entity, calculation, registry); - SetOutputEntities(entity, calculation, registry); + SetOutputEntities(entity, calculation); return entity; } @@ -85,18 +85,18 @@ entity.StepSize = Convert.ToByte(calculation.InputParameters.StepSize); } - private static void SetOutputEntities(StabilityStoneCoverWaveConditionsCalculationEntity entity, StabilityStoneCoverWaveConditionsCalculation calculation, PersistenceRegistry registry) + private static void SetOutputEntities(StabilityStoneCoverWaveConditionsCalculationEntity entity, StabilityStoneCoverWaveConditionsCalculation calculation) { if (calculation.HasOutput) { int i = 0; foreach (var output in calculation.Output.BlocksOutput) { - entity.StabilityStoneCoverWaveConditionsOutputEntities.Add(output.CreateStabilityStoneCoverWaveConditionsOutputEntity(WaveConditionsOutputType.Blocks, i++, registry)); + entity.StabilityStoneCoverWaveConditionsOutputEntities.Add(output.CreateStabilityStoneCoverWaveConditionsOutputEntity(WaveConditionsOutputType.Blocks, i++)); } foreach (var output in calculation.Output.ColumnsOutput) { - entity.StabilityStoneCoverWaveConditionsOutputEntities.Add(output.CreateStabilityStoneCoverWaveConditionsOutputEntity(WaveConditionsOutputType.Columns, i++, registry)); + entity.StabilityStoneCoverWaveConditionsOutputEntities.Add(output.CreateStabilityStoneCoverWaveConditionsOutputEntity(WaveConditionsOutputType.Columns, i++)); } } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismCreateExtensions.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismCreateExtensions.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -53,7 +53,7 @@ { foreach (var failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(registry); + var sectionResultEntity = failureMechanismSectionResult.Create(); var section = registry.Get(failureMechanismSectionResult.Section); section.StrengthStabilityLengthwiseConstructionSectionResultEntities.Add(sectionResultEntity); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensions.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensions.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -35,15 +35,9 @@ /// Creates a based on the information of the . /// /// The result to create a database entity for. - /// The object keeping track of create operations. /// A new . - /// Thrown when is null. - internal static StrengthStabilityLengthwiseConstructionSectionResultEntity Create(this StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult result, PersistenceRegistry registry) + internal static StrengthStabilityLengthwiseConstructionSectionResultEntity Create(this StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult result) { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } var sectionResultEntity = new StrengthStabilityLengthwiseConstructionSectionResultEntity { LayerOne = Convert.ToByte(result.AssessmentLayerOne), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresCalculationCreateExtensions.cs =================================================================== diff -u -r6ed9c7e3fd4c8b5bd967b2a39b97b04741cff8dc -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresCalculationCreateExtensions.cs (.../StructuresCalculationCreateExtensions.cs) (revision 6ed9c7e3fd4c8b5bd967b2a39b97b04741cff8dc) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresCalculationCreateExtensions.cs (.../StructuresCalculationCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -113,7 +113,7 @@ Order = order }; SetInputValues(entity, calculation.InputParameters, registry); - SetOutputEntity(calculation, entity, registry); + SetOutputEntity(calculation, entity); registry.Register(entity, calculation); @@ -160,11 +160,11 @@ } private static void SetOutputEntity(StructuresCalculation calculation, - ClosingStructuresCalculationEntity entity, PersistenceRegistry registry) + ClosingStructuresCalculationEntity entity) { if (calculation.HasOutput) { - entity.ClosingStructuresOutputEntities.Add(calculation.Output.Create(registry)); + entity.ClosingStructuresOutputEntities.Add(calculation.Output.Create()); } } @@ -197,7 +197,7 @@ Order = order }; SetInputValues(entity, calculation.InputParameters, registry); - SetOutputEntity(calculation, entity, registry); + SetOutputEntity(calculation, entity); registry.Register(entity, calculation); @@ -221,11 +221,11 @@ } private static void SetOutputEntity(StructuresCalculation calculation, - HeightStructuresCalculationEntity entity, PersistenceRegistry registry) + HeightStructuresCalculationEntity entity) { if (calculation.HasOutput) { - entity.HeightStructuresOutputEntities.Add(calculation.Output.Create(registry)); + entity.HeightStructuresOutputEntities.Add(calculation.Output.Create()); } } @@ -258,7 +258,7 @@ Order = order }; SetInputValues(entity, calculation.InputParameters, registry); - SetOutputEntity(calculation, entity, registry); + SetOutputEntity(calculation, entity); registry.Register(entity, calculation); @@ -335,11 +335,11 @@ } private static void SetOutputEntity(StructuresCalculation calculation, - StabilityPointStructuresCalculationEntity entity, PersistenceRegistry registry) + StabilityPointStructuresCalculationEntity entity) { if (calculation.HasOutput) { - entity.StabilityPointStructuresOutputEntities.Add(calculation.Output.Create(registry)); + entity.StabilityPointStructuresOutputEntities.Add(calculation.Output.Create()); } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismCreateExtensions.cs (.../TechnicalInnovationFailureMechanismCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismCreateExtensions.cs (.../TechnicalInnovationFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -53,7 +53,7 @@ { foreach (var failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(registry); + var sectionResultEntity = failureMechanismSectionResult.Create(); var section = registry.Get(failureMechanismSectionResult.Section); section.TechnicalInnovationSectionResultEntities.Add(sectionResultEntity); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismSectionResultCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismSectionResultCreateExtensions.cs (.../TechnicalInnovationFailureMechanismSectionResultCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismSectionResultCreateExtensions.cs (.../TechnicalInnovationFailureMechanismSectionResultCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -35,15 +35,9 @@ /// Creates a based on the information of the . /// /// The result to create a database entity for. - /// The object keeping track of create operations. /// A new . - /// Thrown when is null. - internal static TechnicalInnovationSectionResultEntity Create(this TechnicalInnovationFailureMechanismSectionResult result, PersistenceRegistry registry) + internal static TechnicalInnovationSectionResultEntity Create(this TechnicalInnovationFailureMechanismSectionResult result) { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } var sectionResultEntity = new TechnicalInnovationSectionResultEntity { LayerOne = Convert.ToByte(result.AssessmentLayerOne), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismCreateExtensions.cs (.../WaterPressureAsphaltCoverFailureMechanismCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismCreateExtensions.cs (.../WaterPressureAsphaltCoverFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -53,7 +53,7 @@ { foreach (var failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(registry); + var sectionResultEntity = failureMechanismSectionResult.Create(); var section = registry.Get(failureMechanismSectionResult.Section); section.WaterPressureAsphaltCoverSectionResultEntities.Add(sectionResultEntity); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs (.../WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs (.../WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -35,15 +35,9 @@ /// Creates a based on the information of the . /// /// The result to create a database entity for. - /// The object keeping track of create operations. /// A new . - /// Thrown when is null. - internal static WaterPressureAsphaltCoverSectionResultEntity Create(this WaterPressureAsphaltCoverFailureMechanismSectionResult result, PersistenceRegistry registry) + internal static WaterPressureAsphaltCoverSectionResultEntity Create(this WaterPressureAsphaltCoverFailureMechanismSectionResult result) { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } var sectionResultEntity = new WaterPressureAsphaltCoverSectionResultEntity { LayerOne = Convert.ToByte(result.AssessmentLayerOne), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveConditionsOutputCreateExtensions.cs =================================================================== diff -u -r52207b1b9ba8ad1c1743bbf31d58de7bb46192b8 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveConditionsOutputCreateExtensions.cs (.../WaveConditionsOutputCreateExtensions.cs) (revision 52207b1b9ba8ad1c1743bbf31d58de7bb46192b8) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveConditionsOutputCreateExtensions.cs (.../WaveConditionsOutputCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using Application.Ringtoets.Storage.DbContext; using Ringtoets.Revetment.Data; @@ -38,16 +37,10 @@ /// The calculation output for grass cover erosion outwards failure mechanism to /// create a database entity for. /// The position of in the list of all outputs. - /// The object keeping track of create operations. /// A new . - /// Thrown when is null. internal static GrassCoverErosionOutwardsWaveConditionsOutputEntity CreateGrassCoverErosionOutwardsWaveConditionsOutputEntity( - this WaveConditionsOutput output, int order, PersistenceRegistry registry) + this WaveConditionsOutput output, int order) { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } var entity = new GrassCoverErosionOutwardsWaveConditionsOutputEntity { Order = order, @@ -67,16 +60,10 @@ /// create a database entity for. /// The type of the . /// The position of in the list of all outputs. - /// The object keeping track of create operations. /// A new . - /// Thrown when is null. internal static StabilityStoneCoverWaveConditionsOutputEntity CreateStabilityStoneCoverWaveConditionsOutputEntity( - this WaveConditionsOutput output, WaveConditionsOutputType type, int order, PersistenceRegistry registry) + this WaveConditionsOutput output, WaveConditionsOutputType type, int order) { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } var entity = new StabilityStoneCoverWaveConditionsOutputEntity { Order = order, @@ -96,16 +83,10 @@ /// The calculation output for wave impact asphalt cover mechanism to /// create a database entity for. /// The position of in the list of all outputs. - /// The object keeping track of create operations. /// A new . - /// Thrown when is null. internal static WaveImpactAsphaltCoverWaveConditionsOutputEntity CreateWaveImpactAsphaltCoverWaveConditionsOutputEntity( - this WaveConditionsOutput output, int order, PersistenceRegistry registry) + this WaveConditionsOutput output, int order) { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } var entity = new WaveImpactAsphaltCoverWaveConditionsOutputEntity { Order = order, Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs =================================================================== diff -u -r83a72354e69c186ca436bbe29e31122b9b8f4c3a -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs (.../WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs) (revision 83a72354e69c186ca436bbe29e31122b9b8f4c3a) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs (.../WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -55,7 +55,7 @@ { foreach (var failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(registry); + var sectionResultEntity = failureMechanismSectionResult.Create(); var section = registry.Get(failureMechanismSectionResult.Section); section.WaveImpactAsphaltCoverSectionResultEntities.Add(sectionResultEntity); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -35,15 +35,9 @@ /// Creates a based on the information of the . /// /// The result to create a database entity for. - /// The object keeping track of create operations. /// A new . - /// Thrown when is null. - internal static WaveImpactAsphaltCoverSectionResultEntity Create(this WaveImpactAsphaltCoverFailureMechanismSectionResult result, PersistenceRegistry registry) + internal static WaveImpactAsphaltCoverSectionResultEntity Create(this WaveImpactAsphaltCoverFailureMechanismSectionResult result) { - if (registry == null) - { - throw new ArgumentNullException("registry"); - } var sectionResultEntity = new WaveImpactAsphaltCoverSectionResultEntity { LayerOne = Convert.ToByte(result.AssessmentLayerOne), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs =================================================================== diff -u -r92598abae0206724835b91b3708e970ae09ac5de -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs) (revision 92598abae0206724835b91b3708e970ae09ac5de) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -58,7 +58,7 @@ }; SetInputParameters(entity, calculation, registry); - AddEntityForWaveImpactAsphaltCoverWaveConditionsOutput(calculation, registry, entity); + AddEntityForWaveImpactAsphaltCoverWaveConditionsOutput(calculation, entity); return entity; } @@ -87,14 +87,14 @@ entity.StepSize = Convert.ToByte(calculation.InputParameters.StepSize); } - private static void AddEntityForWaveImpactAsphaltCoverWaveConditionsOutput(WaveImpactAsphaltCoverWaveConditionsCalculation calculation, PersistenceRegistry registry, WaveImpactAsphaltCoverWaveConditionsCalculationEntity entity) + private static void AddEntityForWaveImpactAsphaltCoverWaveConditionsOutput(WaveImpactAsphaltCoverWaveConditionsCalculation calculation, WaveImpactAsphaltCoverWaveConditionsCalculationEntity entity) { if (calculation.HasOutput) { int i = 0; foreach (var waveConditionsOutput in calculation.Output.Items) { - entity.WaveImpactAsphaltCoverWaveConditionsOutputEntities.Add(waveConditionsOutput.CreateWaveImpactAsphaltCoverWaveConditionsOutputEntity(i++, registry)); + entity.WaveImpactAsphaltCoverWaveConditionsOutputEntities.Add(waveConditionsOutput.CreateWaveImpactAsphaltCoverWaveConditionsOutputEntity(i++)); } } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HydraulicLocationEntityReadExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HydraulicLocationEntityReadExtensions.cs (.../HydraulicLocationEntityReadExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HydraulicLocationEntityReadExtensions.cs (.../HydraulicLocationEntityReadExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -49,21 +49,17 @@ return collector.Get(entity); } - var hydraulicBoundaryLocation = new HydraulicBoundaryLocation( - entity.LocationId, - entity.Name, - entity.LocationX.ToNullAsNaN(), - entity.LocationY.ToNullAsNaN()); + var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(entity.LocationId, + entity.Name, + entity.LocationX.ToNullAsNaN(), + entity.LocationY.ToNullAsNaN()) + { + DesignWaterLevel = (RoundedDouble) entity.DesignWaterLevel.ToNullAsNaN(), + WaveHeight = (RoundedDouble) entity.WaveHeight.ToNullAsNaN(), + DesignWaterLevelCalculationConvergence = (CalculationConvergence) entity.DesignWaterLevelCalculationConvergence, + WaveHeightCalculationConvergence = (CalculationConvergence) entity.WaveHeightCalculationConvergence + }; - hydraulicBoundaryLocation.DesignWaterLevel = (RoundedDouble) entity.DesignWaterLevel.ToNullAsNaN(); - hydraulicBoundaryLocation.WaveHeight = (RoundedDouble) entity.WaveHeight.ToNullAsNaN(); - - hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence = - (CalculationConvergence) entity.DesignWaterLevelCalculationConvergence; - - hydraulicBoundaryLocation.WaveHeightCalculationConvergence = - (CalculationConvergence) entity.WaveHeightCalculationConvergence; - collector.Read(entity, hydraulicBoundaryLocation); return hydraulicBoundaryLocation; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/DuneErosion/DuneErosionFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -rfd75ff7d1794c6a64fd3ce1aa1f159effba2e102 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/DuneErosion/DuneErosionFailureMechanismSectionResultCreateExtensionsTest.cs (.../DuneErosionFailureMechanismSectionResultCreateExtensionsTest.cs) (revision fd75ff7d1794c6a64fd3ce1aa1f159effba2e102) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/DuneErosion/DuneErosionFailureMechanismSectionResultCreateExtensionsTest.cs (.../DuneErosionFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.Create.DuneErosion; using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base.Data; @@ -34,19 +33,6 @@ public class DuneErosionFailureMechanismSectionResultCreateExtensionsTest { [Test] - public void Create_WithoutPersistenceRegistry_ThrowsArgumentNullException() - { - // Setup - var sectionResult = new DuneErosionFailureMechanismSectionResult(new TestFailureMechanismSection()); - - // Call - TestDelegate test = () => sectionResult.Create(null); - - // Assert - Assert.Throws(test); - } - - [Test] public void Create_ValidData_ReturnsEntityEqualData() { // Setup @@ -61,7 +47,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.AreEqual(Convert.ToByte(assessmentLayerOneResult), result.LayerOne); @@ -79,7 +65,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.IsNull(result.LayerThree); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GeneralGrassCoverErosionInwardsInputCreateExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GeneralGrassCoverErosionInwardsInputCreateExtensionsTest.cs (.../GeneralGrassCoverErosionInwardsInputCreateExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GeneralGrassCoverErosionInwardsInputCreateExtensionsTest.cs (.../GeneralGrassCoverErosionInwardsInputCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.Create.GrassCoverErosionInwards; using Application.Ringtoets.Storage.DbContext; using NUnit.Framework; @@ -32,20 +31,6 @@ public class GeneralGrassCoverErosionInwardsInputCreateExtensionsTest { [Test] - public void Create_PersistenceRegistryNull_ThrowArgumentNullException() - { - // Setup - var input = new GeneralGrassCoverErosionInwardsInput(); - - // Call - TestDelegate call = () => input.Create(null); - - // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("registry", paramName); - } - - [Test] public void Create_ValidGeneralInput_ReturnEntity() { // Setup @@ -54,10 +39,9 @@ { N = n }; - var registry = new PersistenceRegistry(); // Call - GrassCoverErosionInwardsFailureMechanismMetaEntity entity = input.Create(registry); + GrassCoverErosionInwardsFailureMechanismMetaEntity entity = input.Create(); // Assert Assert.AreEqual(n, entity.N); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs =================================================================== diff -u -rdceba6b3e14e5a6da00dfb14cb90e2e1961257f2 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs (.../GrassCoverErosionInwardsOutputCreateExtensionsTest.cs) (revision dceba6b3e14e5a6da00dfb14cb90e2e1961257f2) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs (.../GrassCoverErosionInwardsOutputCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.Create.GrassCoverErosionInwards; using Application.Ringtoets.Storage.DbContext; using NUnit.Framework; @@ -33,21 +32,6 @@ public class GrassCoverErosionInwardsOutputCreateExtensionsTest { [Test] - public void Create_PersistenceRegistryIsNull_ThrowArgumentNullException() - { - // Setup - var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(1.0, 1.0, 1.0, 1.0, 1.0); - var output = new GrassCoverErosionInwardsOutput(1.1, false, probabilityAssessmentOutput, 2.2); - - // Call - TestDelegate call = () => output.Create(null); - - // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("registry", paramName); - } - - [Test] public void Create_ValidInput_ReturnGrassCoverErosionInwardsOutputEntity() { // Setup @@ -57,10 +41,8 @@ random.NextDouble()); var output = new GrassCoverErosionInwardsOutput(random.NextDouble(), false, probabilityAssessmentOutput, random.NextDouble()); - var registry = new PersistenceRegistry(); - // Call - GrassCoverErosionInwardsOutputEntity entity = output.Create(registry); + GrassCoverErosionInwardsOutputEntity entity = output.Create(); // Assert Assert.AreEqual(output.DikeHeight.Value, entity.DikeHeight); @@ -82,10 +64,8 @@ var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN); var output = new GrassCoverErosionInwardsOutput(double.NaN, true, probabilityAssessmentOutput, double.NaN); - var registry = new PersistenceRegistry(); - // Call - GrassCoverErosionInwardsOutputEntity entity = output.Create(registry); + GrassCoverErosionInwardsOutputEntity entity = output.Create(); // Assert Assert.IsNull(entity.DikeHeight); @@ -106,10 +86,8 @@ var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(1, 1, 1, 1, 1); var output = new GrassCoverErosionInwardsOutput(1, true, probabilityAssessmentOutput, null); - var registry = new PersistenceRegistry(); - // Call - GrassCoverErosionInwardsOutputEntity entity = output.Create(registry); + GrassCoverErosionInwardsOutputEntity entity = output.Create(); // Assert Assert.IsNull(entity.DikeHeight); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GeneralGrassCoverErosionOutwardsOutputCreateExtensionsTest.cs =================================================================== diff -u -r741fcc00e47a7ff8fa01bbf15edbaedf8dec2e57 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GeneralGrassCoverErosionOutwardsOutputCreateExtensionsTest.cs (.../GeneralGrassCoverErosionOutwardsOutputCreateExtensionsTest.cs) (revision 741fcc00e47a7ff8fa01bbf15edbaedf8dec2e57) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GeneralGrassCoverErosionOutwardsOutputCreateExtensionsTest.cs (.../GeneralGrassCoverErosionOutwardsOutputCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.Create.GrassCoverErosionOutwards; using Application.Ringtoets.Storage.DbContext; using NUnit.Framework; @@ -32,20 +31,6 @@ public class GeneralGrassCoverErosionOutwardsOutputCreateExtensionsTest { [Test] - public void Create_PersistenceRegistryNull_ThrowArgumentNullException() - { - // Setup - var input = new GeneralGrassCoverErosionOutwardsInput(); - - // Call - TestDelegate call = () => input.Create(null); - - // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("registry", paramName); - } - - [Test] public void Create_ValidGeneralInput_ReturnEntity() { // Setup @@ -54,10 +39,9 @@ { N = n }; - var registry = new PersistenceRegistry(); // Call - GrassCoverErosionOutwardsFailureMechanismMetaEntity entity = input.Create(registry); + GrassCoverErosionOutwardsFailureMechanismMetaEntity entity = input.Create(); // Assert Assert.AreEqual(n, entity.N); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -rd3eaf9dfba5fcc97f9a4b2e901e37ea83387bac2 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs) (revision d3eaf9dfba5fcc97f9a4b2e901e37ea83387bac2) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -152,8 +152,13 @@ { // Setup var n = new Random(21).Next(1, 20); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - failureMechanism.GeneralInput.N = n; + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism + { + GeneralInput = + { + N = n + } + }; // Call var entity = failureMechanism.Create(new PersistenceRegistry()); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.Create.GrassCoverErosionOutwards; using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base.Data; @@ -34,19 +33,6 @@ public class GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensionsTest { [Test] - public void Create_WithoutPersistenceRegistry_ThrowsArgumentNullException() - { - // Setup - var sectionResult = new GrassCoverErosionOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection()); - - // Call - TestDelegate test = () => sectionResult.Create(null); - - // Assert - Assert.Throws(test); - } - - [Test] public void Create_VariousResults_ReturnsExpectedEntity( [Values(true, false)] bool assessmentLayerOneResult, [Values(AssessmentLayerTwoAResult.NotCalculated, AssessmentLayerTwoAResult.Failed)] AssessmentLayerTwoAResult assessmentLayerTwoAResult, @@ -62,7 +48,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.AreEqual(Convert.ToByte(assessmentLayerOneResult), result.LayerOne); @@ -80,7 +66,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.IsNull(result.LayerThree); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsOutputCreateExtensionsTest.cs =================================================================== diff -u -ra97ce3590a70df41b28cac28f21b12168f5c50ee -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsOutputCreateExtensionsTest.cs (.../GrassCoverErosionOutwardsWaveConditionsOutputCreateExtensionsTest.cs) (revision a97ce3590a70df41b28cac28f21b12168f5c50ee) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsOutputCreateExtensionsTest.cs (.../GrassCoverErosionOutwardsWaveConditionsOutputCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.DbContext; using NUnit.Framework; @@ -32,30 +31,14 @@ public class GrassCoverErosionOutwardsWaveConditionsOutputCreateExtensionsTest { [Test] - public void Create_PersistenceRegistryIsNull_ThrowArgumentNullException() - { - // Setup - var output = new WaveConditionsOutput(1.1, 2.2, 3.3, 4.4); - - // Call - TestDelegate call = () => output.CreateGrassCoverErosionOutwardsWaveConditionsOutputEntity(0, null); - - // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("registry", paramName); - } - - [Test] public void Create_AllOutputValuesSet_ReturnEntity() { // Setup var output = new WaveConditionsOutput(1.1, 2.2, 3.3, 4.4); var order = 22; - var registry = new PersistenceRegistry(); - // Call - GrassCoverErosionOutwardsWaveConditionsOutputEntity entity = output.CreateGrassCoverErosionOutwardsWaveConditionsOutputEntity(order, registry); + GrassCoverErosionOutwardsWaveConditionsOutputEntity entity = output.CreateGrassCoverErosionOutwardsWaveConditionsOutputEntity(order); // Assert Assert.AreEqual(output.WaterLevel, entity.WaterLevel, output.WaterLevel.GetAccuracy()); @@ -72,10 +55,8 @@ // Setup var output = new WaveConditionsOutput(double.NaN, double.NaN, double.NaN, double.NaN); - var registry = new PersistenceRegistry(); - // Call - GrassCoverErosionOutwardsWaveConditionsOutputEntity entity = output.CreateGrassCoverErosionOutwardsWaveConditionsOutputEntity(1, registry); + GrassCoverErosionOutwardsWaveConditionsOutputEntity entity = output.CreateGrassCoverErosionOutwardsWaveConditionsOutputEntity(1); // Assert Assert.IsNull(entity.WaterLevel); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensionsTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensionsTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.Create.GrassCoverSlipOffInwards; using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base.Data; @@ -34,19 +33,6 @@ public class GrassCoverSlipOffInwardsFailureMechanismSectionResultCreateExtensionsTest { [Test] - public void Create_WithoutPersistenceRegistry_ThrowsArgumentNullException() - { - // Setup - var sectionResult = new GrassCoverSlipOffInwardsFailureMechanismSectionResult(new TestFailureMechanismSection()); - - // Call - TestDelegate test = () => sectionResult.Create(null); - - // Assert - Assert.Throws(test); - } - - [Test] public void Create_VariousResults_ReturnsEntity( [Values(true, false)] bool assessmentLayerOneResult, [Values(AssessmentLayerTwoAResult.NotCalculated, AssessmentLayerTwoAResult.Failed)] AssessmentLayerTwoAResult assessmentLayerTwoAResult, @@ -61,7 +47,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.AreEqual(Convert.ToByte(assessmentLayerOneResult), result.LayerOne); @@ -79,7 +65,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.IsNull(result.LayerThree); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.Create.GrassCoverSlipOffOutwards; using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base.Data; @@ -34,19 +33,6 @@ public class GrassCoverSlipOffOutwardsFailureMechanismSectionResultCreateExtensionsTest { [Test] - public void Create_WithoutPersistenceRegistry_ThrowsArgumentNullException() - { - // Setup - var sectionResult = new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection()); - - // Call - TestDelegate test = () => sectionResult.Create(null); - - // Assert - Assert.Throws(test); - } - - [Test] public void Create_VariousResults_ReturnsExpectedEntity( [Values(true, false)] bool assessmentLayerOneResult, [Values(AssessmentLayerTwoAResult.NotCalculated, AssessmentLayerTwoAResult.Failed)] AssessmentLayerTwoAResult assessmentLayerTwoAResult, @@ -62,7 +48,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.AreEqual(Convert.ToByte(assessmentLayerOneResult), result.LayerOne); @@ -80,7 +66,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.IsNull(result.LayerThree); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacrostabilityInwards/MacrostabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacrostabilityInwards/MacrostabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs (.../MacrostabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacrostabilityInwards/MacrostabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs (.../MacrostabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -33,19 +33,6 @@ public class MacrostabilityInwardsFailureMechanismSectionResultCreateExtensionsTest { [Test] - public void Create_WithoutPersistenceRegistry_ThrowsArgumentNullException() - { - // Setup - var sectionResult = new MacrostabilityInwardsFailureMechanismSectionResult(new TestFailureMechanismSection()); - - // Call - TestDelegate test = () => sectionResult.Create(null); - - // Assert - Assert.Throws(test); - } - - [Test] public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults( [Values(true, false)] bool assessmentLayerOneResult, [Values(0.2, 0.523)] double assessmentLayerTwoAResult, @@ -60,7 +47,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.AreEqual(Convert.ToByte(assessmentLayerOneResult), result.LayerOne); @@ -78,7 +65,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.IsNull(result.LayerTwoA); @@ -94,7 +81,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.IsNull(result.LayerThree); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacrostabilityOutwards/MacrostabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacrostabilityOutwards/MacrostabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs (.../MacrostabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacrostabilityOutwards/MacrostabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs (.../MacrostabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.Create.MacrostabilityOutwards; using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base.Data; @@ -33,19 +32,6 @@ public class MacrostabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest { [Test] - public void Create_WithoutPersistenceRegistry_ThrowsArgumentNullException() - { - // Setup - var sectionResult = new MacrostabilityOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection()); - - // Call - TestDelegate test = () => sectionResult.Create(null); - - // Assert - Assert.Throws(test); - } - - [Test] public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults( [Values(true, false)] bool assessmentLayerOneResult, [Values(0.2, 0.523)] double assessmentLayerTwoAResult, @@ -60,7 +46,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.AreEqual(Convert.ToByte(assessmentLayerOneResult), result.LayerOne); @@ -78,7 +64,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.IsNull(result.LayerTwoA); @@ -94,7 +80,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.IsNull(result.LayerThree); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Microstability/MicrostabilityFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Microstability/MicrostabilityFailureMechanismSectionResultCreateExtensionsTest.cs (.../MicrostabilityFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Microstability/MicrostabilityFailureMechanismSectionResultCreateExtensionsTest.cs (.../MicrostabilityFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.Create.Microstability; using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base.Data; @@ -34,19 +33,6 @@ public class MicrostabilityFailureMechanismSectionResultCreateExtensionsTest { [Test] - public void Create_WithoutPersistenceRegistry_ThrowsArgumentNullException() - { - // Setup - var sectionResult = new MicrostabilityFailureMechanismSectionResult(new TestFailureMechanismSection()); - - // Call - TestDelegate test = () => sectionResult.Create(null); - - // Assert - Assert.Throws(test); - } - - [Test] public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults( [Values(true, false)] bool assessmentLayerOneResult, [Values(AssessmentLayerTwoAResult.NotCalculated, AssessmentLayerTwoAResult.Failed)] AssessmentLayerTwoAResult assessmentLayerTwoAResult, @@ -61,7 +47,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.AreEqual(Convert.ToByte(assessmentLayerOneResult), result.LayerOne); @@ -79,7 +65,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.IsNull(result.LayerThree); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismSectionResultCreateExtensionsTest.cs (.../PipingFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismSectionResultCreateExtensionsTest.cs (.../PipingFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.Create.Piping; using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base.Data; @@ -33,19 +32,6 @@ public class PipingFailureMechanismSectionResultCreateExtensionsTest { [Test] - public void Create_WithoutPersistenceRegistry_ThrowsArgumentNullException() - { - // Setup - var sectionResult = new PipingFailureMechanismSectionResult(new TestFailureMechanismSection()); - - // Call - TestDelegate test = () => sectionResult.Create(null); - - // Assert - Assert.Throws(test); - } - - [Test] public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults( [Values(true, false)] bool assessmentLayerOneResult, [Values(3.2, 4.5)] double assessmentLayerThreeResult) @@ -58,7 +44,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.AreEqual(Convert.ToByte(assessmentLayerOneResult), result.LayerOne); @@ -75,7 +61,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.IsNull(result.LayerThree); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingOutputCreateExtensionsTest.cs =================================================================== diff -u -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingOutputCreateExtensionsTest.cs (.../PipingOutputCreateExtensionsTest.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingOutputCreateExtensionsTest.cs (.../PipingOutputCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -19,8 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; -using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.Create.Piping; using Application.Ringtoets.Storage.DbContext; using NUnit.Framework; @@ -32,29 +30,13 @@ public class PipingOutputCreateExtensionsTest { [Test] - public void Create_PersistenceRegistryIsNull_ThrowArgumentNullException() - { - // Setup - var pipingOutput = new PipingOutput(1.1, 2.2, 3.3, 4.4, 5.5, 6.6); - - // Call - TestDelegate call = () => pipingOutput.Create(null); - - // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("registry", paramName); - } - - [Test] public void Create_AllOutputValuesSet_ReturnEntity() { // Setup var pipingOutput = new PipingOutput(1.1, 2.2, 3.3, 4.4, 5.5, 6.6); - var registry = new PersistenceRegistry(); - // Call - PipingCalculationOutputEntity entity = pipingOutput.Create(registry); + PipingCalculationOutputEntity entity = pipingOutput.Create(); // Assert Assert.AreEqual(pipingOutput.HeaveFactorOfSafety, entity.HeaveFactorOfSafety); @@ -75,10 +57,8 @@ var pipingOutput = new PipingOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN); - var registry = new PersistenceRegistry(); - // Call - PipingCalculationOutputEntity entity = pipingOutput.Create(registry); + PipingCalculationOutputEntity entity = pipingOutput.Create(); // Assert Assert.IsNull(entity.HeaveFactorOfSafety); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingProbabilityAssessmentInputCreateExtensionsTest.cs =================================================================== diff -u -rb190a14336e0d8fe9aec34e81a68194081c76155 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingProbabilityAssessmentInputCreateExtensionsTest.cs (.../PipingProbabilityAssessmentInputCreateExtensionsTest.cs) (revision b190a14336e0d8fe9aec34e81a68194081c76155) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingProbabilityAssessmentInputCreateExtensionsTest.cs (.../PipingProbabilityAssessmentInputCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -19,8 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; -using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.Create.Piping; using Application.Ringtoets.Storage.DbContext; using NUnit.Framework; @@ -32,28 +30,13 @@ public class PipingProbabilityAssessmentInputCreateExtensionsTest { [Test] - public void Create_WithoutPersistenceRegistry_ThrowsArgumentNullException() - { - // Setup - var failureMechanism = new PipingFailureMechanism(); - - // Call - TestDelegate test = () => failureMechanism.PipingProbabilityAssessmentInput.Create(null); - - // Assert - var parameterName = Assert.Throws(test).ParamName; - Assert.AreEqual("registry", parameterName); - } - - [Test] public void Create_WithCollector_ReturnsPipingFailureMechanismMetaEntityWithPropertiesSet() { // Setup var failureMechanism = new PipingFailureMechanism(); - var registry = new PersistenceRegistry(); // Call - PipingFailureMechanismMetaEntity entity = failureMechanism.PipingProbabilityAssessmentInput.Create(registry); + PipingFailureMechanismMetaEntity entity = failureMechanism.PipingProbabilityAssessmentInput.Create(); // Assert Assert.IsNotNull(entity); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSemiProbabilisticOutputCreateExtensionsTest.cs =================================================================== diff -u -rb190a14336e0d8fe9aec34e81a68194081c76155 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSemiProbabilisticOutputCreateExtensionsTest.cs (.../PipingSemiProbabilisticOutputCreateExtensionsTest.cs) (revision b190a14336e0d8fe9aec34e81a68194081c76155) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSemiProbabilisticOutputCreateExtensionsTest.cs (.../PipingSemiProbabilisticOutputCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.Create.Piping; using Application.Ringtoets.Storage.DbContext; using Core.Common.Base.Data; @@ -34,32 +33,14 @@ public class PipingSemiProbabilisticOutputCreateExtensionsTest { [Test] - public void Create_PersistenceRegistryIsNull_ThrowArgumentNullException() - { - // Setup - var output = new PipingSemiProbabilisticOutput(1.1, 2.2, 0.3, 4.4, 5.5, 0.6, 7.7, - 8.8, 0.9, 0.10, 11.11, 0.12, - 13.13, 14.14); - - // Call - TestDelegate call = () => output.Create(null); - - // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("registry", paramName); - } - - [Test] public void Create_WithValidValues_ReturnEntity() { // Setup var output = new PipingSemiProbabilisticOutput(1.1, 2.2, 0.3, 4.4, 5.5, 0.6, 7.7, 8.8, 0.9, 0.10, 11.11, 0.12, 13.13, 14.14); - var registry = new PersistenceRegistry(); - // Call - PipingSemiProbabilisticOutputEntity entity = output.Create(registry); + PipingSemiProbabilisticOutputEntity entity = output.Create(); // Assert AssertAreEqual(output.UpliftFactorOfSafety, entity.UpliftFactorOfSafety); @@ -90,10 +71,8 @@ double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN); - var registry = new PersistenceRegistry(); - // Call - PipingSemiProbabilisticOutputEntity entity = output.Create(registry); + PipingSemiProbabilisticOutputEntity entity = output.Create(); // Assert Assert.IsNull(entity.UpliftFactorOfSafety); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSoilLayerCreateExtensionsTest.cs =================================================================== diff -u -r05013c44d1273bac219a442dc7959706c6bac715 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSoilLayerCreateExtensionsTest.cs (.../PipingSoilLayerCreateExtensionsTest.cs) (revision 05013c44d1273bac219a442dc7959706c6bac715) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSoilLayerCreateExtensionsTest.cs (.../PipingSoilLayerCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -21,7 +21,6 @@ using System; using System.Drawing; -using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.Create.Piping; using Application.Ringtoets.Storage.DbContext; using NUnit.Framework; @@ -33,20 +32,6 @@ public class PipingSoilLayerCreateExtensionsTest { [Test] - public void Create_WithoutPersistenceRegistry_ThrowsArgumentNullException() - { - // Setup - var soilLayer = new PipingSoilLayer(new Random(21).NextDouble()); - - // Call - TestDelegate test = () => soilLayer.Create(null, 0); - - // Assert - var parameterName = Assert.Throws(test).ParamName; - Assert.AreEqual("registry", parameterName); - } - - [Test] [TestCase(true)] [TestCase(false)] public void Create_WithCollector_ReturnsFailureMechanismEntityWithPropertiesSet(bool isAquifer) @@ -68,10 +53,9 @@ PermeabilityMean = random.NextDouble(), PermeabilityDeviation = random.NextDouble() }; - var registry = new PersistenceRegistry(); // Call - var entity = soilLayer.Create(registry, order); + var entity = soilLayer.Create(order); // Assert Assert.IsNotNull(entity); @@ -97,10 +81,9 @@ { MaterialName = materialName }; - var registry = new PersistenceRegistry(); // Call - SoilLayerEntity entity = soilLayer.Create(registry, 0); + SoilLayerEntity entity = soilLayer.Create(0); // Assert Assert.AreNotSame(materialName, entity.MaterialName, Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PipingStructure/PipingStructureFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PipingStructure/PipingStructureFailureMechanismSectionResultCreateExtensionsTest.cs (.../PipingStructureFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PipingStructure/PipingStructureFailureMechanismSectionResultCreateExtensionsTest.cs (.../PipingStructureFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.Create.PipingStructure; using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base.Data; @@ -34,19 +33,6 @@ public class PipingStructureFailureMechanismSectionResultCreateExtensionsTest { [Test] - public void Create_WithoutPersistenceRegistry_ThrowsArgumentNullException() - { - // Setup - var sectionResult = new PipingStructureFailureMechanismSectionResult(new TestFailureMechanismSection()); - - // Call - TestDelegate test = () => sectionResult.Create(null); - - // Assert - Assert.Throws(test); - } - - [Test] public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults( [Values(true, false)] bool assessmentLayerOneResult, [Values(AssessmentLayerTwoAResult.NotCalculated, AssessmentLayerTwoAResult.Failed)] AssessmentLayerTwoAResult assessmentLayerTwoAResult, @@ -61,7 +47,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.AreEqual(Convert.ToByte(assessmentLayerOneResult), result.LayerOne); @@ -79,7 +65,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.IsNull(result.LayerThree); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ProbabilityAssessmentOutputCreateExtensionsTest.cs =================================================================== diff -u -rfaeb56f2d76b07f370127de2beb66edad2dea6af -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ProbabilityAssessmentOutputCreateExtensionsTest.cs (.../ProbabilityAssessmentOutputCreateExtensionsTest.cs) (revision faeb56f2d76b07f370127de2beb66edad2dea6af) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ProbabilityAssessmentOutputCreateExtensionsTest.cs (.../ProbabilityAssessmentOutputCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -31,23 +31,6 @@ public class ProbabilityAssessmentOutputCreateExtensionsTest { [Test] - public void Create_PersistenceRegistryIsNull_ThrowArgumentNullException() - { - // Setup - var random = new Random(159); - var output = new ProbabilityAssessmentOutput(random.NextDouble(), random.NextDouble(), - random.NextDouble(), random.NextDouble(), - random.NextDouble()); - - // Call - TestDelegate call = () => output.Create(null); - - // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("registry", paramName); - } - - [Test] public void Create_ValidInput_ReturnProbabilityAssessmentOutputEntity() { // Setup @@ -56,10 +39,8 @@ random.NextDouble(), random.NextDouble(), random.NextDouble()); - var registry = new PersistenceRegistry(); - // Call - TestProbabilityAssessmentOutputEntity entity = output.Create(registry); + TestProbabilityAssessmentOutputEntity entity = output.Create(); // Assert Assert.AreEqual(output.RequiredProbability, entity.RequiredProbability); @@ -76,10 +57,8 @@ var output = new ProbabilityAssessmentOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN); - var registry = new PersistenceRegistry(); - // Call - TestProbabilityAssessmentOutputEntity entity = output.Create(registry); + TestProbabilityAssessmentOutputEntity entity = output.Create(); // Assert Assert.IsNull(entity.RequiredProbability); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -rfd75ff7d1794c6a64fd3ce1aa1f159effba2e102 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismSectionResultCreateExtensionsTest.cs (.../StabilityStoneCoverFailureMechanismSectionResultCreateExtensionsTest.cs) (revision fd75ff7d1794c6a64fd3ce1aa1f159effba2e102) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismSectionResultCreateExtensionsTest.cs (.../StabilityStoneCoverFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.Create.StabilityStoneCover; using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base.Data; @@ -34,19 +33,6 @@ public class StabilityStoneCoverFailureMechanismSectionResultCreateExtensionsTest { [Test] - public void Create_WithoutPersistenceRegistry_ThrowsArgumentNullException() - { - // Setup - var sectionResult = new StabilityStoneCoverFailureMechanismSectionResult(new TestFailureMechanismSection()); - - // Call - TestDelegate test = () => sectionResult.Create(null); - - // Assert - Assert.Throws(test); - } - - [Test] public void Create_ValidData_ReturnsEntityEqualData() { // Setup @@ -61,7 +47,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.AreEqual(Convert.ToByte(assessmentLayerOneResult), result.LayerOne); @@ -79,7 +65,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.IsNull(result.LayerThree); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsOutputCreateExtensionsTest.cs =================================================================== diff -u -r61da629193cfe328c6220fbbb711f7f3bbbe27aa -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsOutputCreateExtensionsTest.cs (.../StabilityStoneCoverWaveConditionsOutputCreateExtensionsTest.cs) (revision 61da629193cfe328c6220fbbb711f7f3bbbe27aa) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsOutputCreateExtensionsTest.cs (.../StabilityStoneCoverWaveConditionsOutputCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -32,20 +32,6 @@ public class StabilityStoneCoverWaveConditionsOutputCreateExtensionsTest { [Test] - public void Create_PersistenceRegistryIsNull_ThrowArgumentNullException() - { - // Setup - var output = new WaveConditionsOutput(1.1, 2.2, 3.3, 4.4); - - // Call - TestDelegate call = () => output.CreateStabilityStoneCoverWaveConditionsOutputEntity(WaveConditionsOutputType.Columns, 0, null); - - // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("registry", paramName); - } - - [Test] [TestCase(WaveConditionsOutputType.Blocks)] [TestCase(WaveConditionsOutputType.Columns)] public void Create_AllOutputValuesSet_ReturnEntity(WaveConditionsOutputType outputType) @@ -54,10 +40,8 @@ var output = new WaveConditionsOutput(1.1, 2.2, 3.3, 4.4); int order = 22; - var registry = new PersistenceRegistry(); - // Call - StabilityStoneCoverWaveConditionsOutputEntity entity = output.CreateStabilityStoneCoverWaveConditionsOutputEntity(outputType, order, registry); + StabilityStoneCoverWaveConditionsOutputEntity entity = output.CreateStabilityStoneCoverWaveConditionsOutputEntity(outputType, order); // Assert Assert.AreEqual(order, entity.Order); @@ -79,10 +63,8 @@ // Setup var output = new WaveConditionsOutput(double.NaN, double.NaN, double.NaN, double.NaN); - var registry = new PersistenceRegistry(); - // Call - StabilityStoneCoverWaveConditionsOutputEntity entity = output.CreateStabilityStoneCoverWaveConditionsOutputEntity(outputType, 22, registry); + StabilityStoneCoverWaveConditionsOutputEntity entity = output.CreateStabilityStoneCoverWaveConditionsOutputEntity(outputType, 22); // Assert Assert.IsNull(entity.WaterLevel); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensionsTest.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensionsTest.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.Create.StrengthStabilityLengthwise; using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base.Data; @@ -33,19 +32,6 @@ public class StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultCreateExtensionsTest { [Test] - public void Create_WithoutPersistenceRegistry_ThrowsArgumentNullException() - { - // Setup - var sectionResult = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(new TestFailureMechanismSection()); - - // Call - TestDelegate test = () => sectionResult.Create(null); - - // Assert - Assert.Throws(test); - } - - [Test] public void Create_VariousResults_ReturnsEntity( [Values(true, false)] bool assessmentLayerOneResult, [Values(3.2, 4.5)] double assessmentLayerThreeResult) @@ -58,7 +44,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.AreEqual(Convert.ToByte(assessmentLayerOneResult), result.LayerOne); @@ -75,7 +61,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.IsNull(result.LayerThree); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismSectionResultCreateExtensionsTest.cs (.../TechnicalInnovationFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismSectionResultCreateExtensionsTest.cs (.../TechnicalInnovationFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.Create.TechnicalInnovation; using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base.Data; @@ -33,19 +32,6 @@ public class TechnicalInnovationFailureMechanismSectionResultCreateExtensionsTest { [Test] - public void Create_WithoutPersistenceRegistry_ThrowsArgumentNullException() - { - // Setup - var sectionResult = new TechnicalInnovationFailureMechanismSectionResult(new TestFailureMechanismSection()); - - // Call - TestDelegate test = () => sectionResult.Create(null); - - // Assert - Assert.Throws(test); - } - - [Test] public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults( [Values(true, false)] bool assessmentLayerOneResult, [Values(3.2, 4.5)] double assessmentLayerThreeResult) @@ -58,7 +44,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.AreEqual(Convert.ToByte(assessmentLayerOneResult), result.LayerOne); @@ -75,7 +61,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.IsNull(result.LayerThree); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs (.../WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs (.../WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.Create.WaterPressureAsphaltCover; using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base.Data; @@ -33,19 +32,6 @@ public class WaterPressureAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest { [Test] - public void Create_WithoutPersistenceRegistry_ThrowsArgumentNullException() - { - // Setup - var sectionResult = new WaterPressureAsphaltCoverFailureMechanismSectionResult(new TestFailureMechanismSection()); - - // Call - TestDelegate test = () => sectionResult.Create(null); - - // Assert - Assert.Throws(test); - } - - [Test] public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults( [Values(true, false)] bool assessmentLayerOneResult, [Values(3.2, 4.5)] double assessmentLayerThreeResult @@ -59,7 +45,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.AreEqual(Convert.ToByte(assessmentLayerOneResult), result.LayerOne); @@ -76,7 +62,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.IsNull(result.LayerThree); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.Create.WaveImpactAsphaltCover; using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base.Data; @@ -33,19 +32,6 @@ public class WaveImpactAsphaltCoverFailureMechanismSectionResultCreateExtensionsTest { [Test] - public void Create_WithoutPersistenceRegistry_ThrowsArgumentNullException() - { - // Setup - var sectionResult = new WaveImpactAsphaltCoverFailureMechanismSectionResult(new TestFailureMechanismSection()); - - // Call - TestDelegate test = () => sectionResult.Create(null); - - // Assert - Assert.Throws(test); - } - - [Test] public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults( [Values(true, false)] bool assessmentLayerOneResult, [Values(0.2, 0.523)] double assessmentLayerTwoAResult, @@ -61,7 +47,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.AreEqual(Convert.ToByte(assessmentLayerOneResult), result.LayerOne); @@ -79,7 +65,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.IsNull(result.LayerTwoA); @@ -95,7 +81,7 @@ }; // Call - var result = sectionResult.Create(new PersistenceRegistry()); + var result = sectionResult.Create(); // Assert Assert.IsNull(result.LayerThree); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsOutputCreateExtensionsTest.cs =================================================================== diff -u -r2973c5f790a5131e427bd5f73e2a620044199639 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsOutputCreateExtensionsTest.cs (.../WaveImpactAsphaltCoverWaveConditionsOutputCreateExtensionsTest.cs) (revision 2973c5f790a5131e427bd5f73e2a620044199639) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsOutputCreateExtensionsTest.cs (.../WaveImpactAsphaltCoverWaveConditionsOutputCreateExtensionsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.DbContext; using NUnit.Framework; @@ -32,30 +31,14 @@ public class WaveImpactAsphaltCoverWaveConditionsOutputCreateExtensionsTest { [Test] - public void Create_PersistenceRegistryIsNull_ThrowArgumentNullException() - { - // Setup - var output = new WaveConditionsOutput(1.1, 2.2, 3.3, 4.4); - - // Call - TestDelegate call = () => output.CreateWaveImpactAsphaltCoverWaveConditionsOutputEntity(0, null); - - // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("registry", paramName); - } - - [Test] public void Create_AllOutputValuesSet_ReturnEntity() { // Setup var output = new WaveConditionsOutput(1.1, 2.2, 3.3, 4.4); var order = 22; - var registry = new PersistenceRegistry(); - // Call - WaveImpactAsphaltCoverWaveConditionsOutputEntity entity = output.CreateWaveImpactAsphaltCoverWaveConditionsOutputEntity(order, registry); + WaveImpactAsphaltCoverWaveConditionsOutputEntity entity = output.CreateWaveImpactAsphaltCoverWaveConditionsOutputEntity(order); // Assert Assert.AreEqual(order, entity.Order); @@ -73,10 +56,8 @@ // Setup var output = new WaveConditionsOutput(double.NaN, double.NaN, double.NaN, double.NaN); - var registry = new PersistenceRegistry(); - // Call - WaveImpactAsphaltCoverWaveConditionsOutputEntity entity = output.CreateWaveImpactAsphaltCoverWaveConditionsOutputEntity(22, registry); + WaveImpactAsphaltCoverWaveConditionsOutputEntity entity = output.CreateWaveImpactAsphaltCoverWaveConditionsOutputEntity(22); // Assert Assert.IsNull(entity.WaterLevel); Index: Core/Common/src/Core.Common.Base/Data/RoundedPoint2DCollection.cs =================================================================== diff -u -r95072939afd1772892c79416dc2e9f747a8fe000 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Core/Common/src/Core.Common.Base/Data/RoundedPoint2DCollection.cs (.../RoundedPoint2DCollection.cs) (revision 95072939afd1772892c79416dc2e9f747a8fe000) +++ Core/Common/src/Core.Common.Base/Data/RoundedPoint2DCollection.cs (.../RoundedPoint2DCollection.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -51,6 +51,10 @@ { throw new ArgumentNullException("originalPoints"); } + if (numberOfDecimalPlaces < 0 || numberOfDecimalPlaces > RoundedDouble.MaximumNumberOfDecimalPlaces) + { + throw new ArgumentOutOfRangeException("numberOfDecimalPlaces", "Value must be in range [0, 15]."); + } points = originalPoints.Select(p => new Point2D( Index: Core/Common/src/Core.Common.Base/RecursiveObserver.cs =================================================================== diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Core/Common/src/Core.Common.Base/RecursiveObserver.cs (.../RecursiveObserver.cs) (revision 24da3aa72ccc0776599628c9f971081694048d9a) +++ Core/Common/src/Core.Common.Base/RecursiveObserver.cs (.../RecursiveObserver.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -123,9 +123,10 @@ foreach (var child in getChildren(container)) { - if (child is TContainer) + var childContainer = child as TContainer; + if (childContainer != null) { - ObserveObjectsRecursively((TContainer) child); + ObserveObjectsRecursively(childContainer); } else if (child is TObservable) { Index: Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs =================================================================== diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs (.../ActivityProgressDialog.cs) (revision 24da3aa72ccc0776599628c9f971081694048d9a) +++ Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs (.../ActivityProgressDialog.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -76,6 +76,7 @@ runningActivity = activities.ElementAt(i); + int stepNumberForProgressNotification = i + 1; progressReporter.ReportProgress(() => { // Update the activity description label @@ -86,7 +87,7 @@ labelActivityProgressText.Visible = false; // Update the activity counter label - labelActivityCounter.Text = string.Format(Resources.ActivityProgressDialog_OnShown_Executing_step_0_of_1, i + 1, activityCount); + labelActivityCounter.Text = string.Format(Resources.ActivityProgressDialog_OnShown_Executing_step_0_of_1, stepNumberForProgressNotification, activityCount); }); try @@ -114,7 +115,7 @@ progressReporter.ReportProgress(() => { // Update the progress bar - progressBar.Value = (int) Math.Round(100.0/activityCount*(i + 1)); + progressBar.Value = (int) Math.Round(100.0/activityCount*stepNumberForProgressNotification); }); } }, cancellationToken); Index: Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs =================================================================== diff -u -rb7c2e788d70b36d8fdabb8b7f56e2184df85b550 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs (.../TypeUtils.cs) (revision b7c2e788d70b36d8fdabb8b7f56e2184df85b550) +++ Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs (.../TypeUtils.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -21,7 +21,6 @@ using System; using System.ComponentModel; -using System.Linq; using System.Linq.Expressions; using System.Reflection; using Core.Common.Utils.Properties; @@ -233,16 +232,14 @@ /// Load Assemblies into the Reflection-Only Context on MSDN for more information. public static bool HasTypeConverter(Expression> expression) where TTypeConverter : TypeConverter { - var typeConverterAttributes = typeof(TTarget) - .GetProperty(GetMemberName(expression)) - .GetCustomAttributes(typeof(TypeConverterAttribute), false) - .OfType() - .ToArray(); - if (typeConverterAttributes.Length == 0) + var typeConverterAttribute = (TypeConverterAttribute) Attribute.GetCustomAttribute(typeof(TTarget).GetProperty(GetMemberName(expression)), + typeof(TypeConverterAttribute), + true); + if (typeConverterAttribute == null) { return false; } - return typeConverterAttributes[0].ConverterTypeName == typeof(TTypeConverter).AssemblyQualifiedName; + return typeConverterAttribute.ConverterTypeName == typeof(TTypeConverter).AssemblyQualifiedName; } private static string GetMemberName(Expression originalExpression, Expression expressionBody) Index: Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Test.csproj =================================================================== diff -u -r2d5e2d09b0cb1a7f48e1b0a067d332347c89d4a8 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Test.csproj (.../Core.Common.Base.Test.csproj) (revision 2d5e2d09b0cb1a7f48e1b0a067d332347c89d4a8) +++ Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Test.csproj (.../Core.Common.Base.Test.csproj) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -112,6 +112,10 @@ {3bbfd65b-b277-4e50-ae6d-bd24c3434609} Core.Common.Base + + {f49bd8b2-332a-4c91-a196-8cce0a2c7d98} + Core.Common.Utils + {D749EE4C-CE50-4C17-BF01-9A953028C126} Core.Common.TestUtil Index: Core/Common/test/Core.Common.Base.Test/Data/RoundedPoint2DCollectionTest.cs =================================================================== diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Core/Common/test/Core.Common.Base.Test/Data/RoundedPoint2DCollectionTest.cs (.../RoundedPoint2DCollectionTest.cs) (revision 24da3aa72ccc0776599628c9f971081694048d9a) +++ Core/Common/test/Core.Common.Base.Test/Data/RoundedPoint2DCollectionTest.cs (.../RoundedPoint2DCollectionTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -73,7 +73,7 @@ public void ParameteredConstructor_InvalidNumberOfPlaces_ThrowArgumentOutOfRangeException(int invalidNumberOfPlaces) { // Call - TestDelegate call = () => new RoundedPoint2DCollection(invalidNumberOfPlaces, CreatePointData()).ToList(); + TestDelegate call = () => new RoundedPoint2DCollection(invalidNumberOfPlaces, CreatePointData()); // Assert const string expectedMessage = "Value must be in range [0, 15]."; Index: Core/Common/test/Core.Common.Base.Test/TypeConverters/RoundedDoubleConverterTest.cs =================================================================== diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Core/Common/test/Core.Common.Base.Test/TypeConverters/RoundedDoubleConverterTest.cs (.../RoundedDoubleConverterTest.cs) (revision 24da3aa72ccc0776599628c9f971081694048d9a) +++ Core/Common/test/Core.Common.Base.Test/TypeConverters/RoundedDoubleConverterTest.cs (.../RoundedDoubleConverterTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -25,6 +25,7 @@ using Core.Common.Base.Data; using Core.Common.Base.TypeConverters; using NUnit.Framework; +using Rhino.Mocks; namespace Core.Common.Base.Test.TypeConverters { @@ -89,64 +90,84 @@ public void ConvertFrom_TextDoesNotRepresentNumber_ThrowNotSupportedException() { // Setup + var mocks = new MockRepository(); + var context = mocks.Stub(); + mocks.ReplayAll(); + string text = "I'm not a number!"; var converter = new RoundedDoubleConverter(); // Call - TestDelegate call = () => converter.ConvertFrom(null, CultureInfo.CurrentCulture, text); + TestDelegate call = () => converter.ConvertFrom(context, CultureInfo.CurrentCulture, text); // Assert string message = Assert.Throws(call).Message; Assert.AreEqual("De tekst moet een getal zijn.", message); + mocks.VerifyAll(); } [Test] public void ConvertFrom_TextIsEmpty_ThrowNotSupportedException() { // Setup + var mocks = new MockRepository(); + var context = mocks.Stub(); + mocks.ReplayAll(); + string text = string.Empty; var converter = new RoundedDoubleConverter(); // Call - TestDelegate call = () => converter.ConvertFrom(null, CultureInfo.CurrentCulture, text); + TestDelegate call = () => converter.ConvertFrom(context, CultureInfo.CurrentCulture, text); // Assert string message = Assert.Throws(call).Message; Assert.AreEqual("De tekst mag niet leeg zijn.", message); + mocks.ReplayAll(); } [Test] public void ConvertFrom_TextTooLongToStoreInDouble_ThrowNotSupportedException() { // Setup + var mocks = new MockRepository(); + var context = mocks.Stub(); + mocks.ReplayAll(); + string text = "1" + double.MaxValue.ToString(CultureInfo.CurrentCulture); var converter = new RoundedDoubleConverter(); // Call - TestDelegate call = () => converter.ConvertFrom(null, CultureInfo.CurrentCulture, text); + TestDelegate call = () => converter.ConvertFrom(context, CultureInfo.CurrentCulture, text); // Assert string message = Assert.Throws(call).Message; Assert.AreEqual("De tekst is een getal dat te groot of te klein is om gerepresenteerd te worden.", message); + mocks.VerifyAll(); } private static void DoConvertFrom_SomeNumericalTextInCurrentCulture_ReturnConvertedRoundedDouble(double input) { // Setup + var mocks = new MockRepository(); + var context = mocks.Stub(); + mocks.ReplayAll(); + string text = input.ToString(CultureInfo.CurrentCulture); var converter = new RoundedDoubleConverter(); // Call - RoundedDouble conversionResult = (RoundedDouble) converter.ConvertFrom(null, CultureInfo.CurrentCulture, text); + RoundedDouble conversionResult = (RoundedDouble)converter.ConvertFrom(context, CultureInfo.CurrentCulture, text); // Assert Assert.IsNotNull(conversionResult); Assert.AreEqual(RoundedDouble.MaximumNumberOfDecimalPlaces, conversionResult.NumberOfDecimalPlaces); Assert.AreEqual(input, conversionResult.Value); + mocks.VerifyAll(); } } } \ No newline at end of file Index: Core/Common/test/Core.Common.Controls.TreeView.Test/TreeViewControlTest.cs =================================================================== diff -u -r93d214db8ac0a90b6f1bf1712a414e4f31c3eed9 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Core/Common/test/Core.Common.Controls.TreeView.Test/TreeViewControlTest.cs (.../TreeViewControlTest.cs) (revision 93d214db8ac0a90b6f1bf1712a414e4f31c3eed9) +++ Core/Common/test/Core.Common.Controls.TreeView.Test/TreeViewControlTest.cs (.../TreeViewControlTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -497,7 +497,7 @@ var treeNodeInfo = new TreeNodeInfo { TagType = typeof(object), - ChildNodeObjects = o => new[] + ChildNodeObjects = o => new object[] { string.Empty } @@ -555,7 +555,7 @@ var treeNodeInfo = new TreeNodeInfo { TagType = typeof(object), - ChildNodeObjects = o => new[] + ChildNodeObjects = o => new object[] { string.Empty } @@ -644,7 +644,7 @@ var treeNodeInfo = new TreeNodeInfo { TagType = typeof(object), - ChildNodeObjects = o => new[] + ChildNodeObjects = o => new object[] { string.Empty } @@ -824,7 +824,7 @@ var treeNodeInfo = new TreeNodeInfo { TagType = typeof(object), - ChildNodeObjects = o => new[] + ChildNodeObjects = o => new object[] { string.Empty } @@ -907,7 +907,7 @@ var treeNodeInfo = new TreeNodeInfo { TagType = typeof(object), - ChildNodeObjects = o => new[] + ChildNodeObjects = o => new object[] { string.Empty } @@ -997,7 +997,7 @@ var treeNodeInfo = new TreeNodeInfo { TagType = typeof(object), - ChildNodeObjects = o => new[] + ChildNodeObjects = o => new object[] { string.Empty } @@ -1035,7 +1035,7 @@ var treeNodeInfo = new TreeNodeInfo { TagType = typeof(object), - ChildNodeObjects = o => new[] + ChildNodeObjects = o => new object[] { string.Empty } @@ -1059,7 +1059,7 @@ var treeNodeInfo = new TreeNodeInfo { TagType = typeof(object), - ChildNodeObjects = o => new[] + ChildNodeObjects = o => new object[] { string.Empty } @@ -1090,7 +1090,7 @@ var treeNodeInfo = new TreeNodeInfo { TagType = typeof(object), - ChildNodeObjects = o => new[] + ChildNodeObjects = o => new object[] { string.Empty } @@ -1121,7 +1121,7 @@ var treeNodeInfo = new TreeNodeInfo { TagType = typeof(object), - ChildNodeObjects = o => new[] + ChildNodeObjects = o => new object[] { string.Empty } @@ -1153,7 +1153,7 @@ var treeNodeInfo = new TreeNodeInfo { TagType = typeof(object), - ChildNodeObjects = o => new[] + ChildNodeObjects = o => new object[] { string.Empty }, @@ -1188,7 +1188,7 @@ var treeNodeInfo = new TreeNodeInfo { TagType = typeof(object), - ChildNodeObjects = o => new[] + ChildNodeObjects = o => new object[] { string.Empty }, @@ -1223,7 +1223,7 @@ var treeNodeInfo = new TreeNodeInfo { TagType = typeof(object), - ChildNodeObjects = o => new[] + ChildNodeObjects = o => new object[] { string.Empty }, @@ -1257,7 +1257,7 @@ var treeNodeInfo = new TreeNodeInfo { TagType = typeof(object), - ChildNodeObjects = o => new[] + ChildNodeObjects = o => new object[] { string.Empty }, @@ -1302,7 +1302,7 @@ var treeNodeInfo = new TreeNodeInfo { TagType = typeof(object), - ChildNodeObjects = o => new[] + ChildNodeObjects = o => new object[] { string.Empty }, @@ -1345,7 +1345,7 @@ var treeNodeInfo = new TreeNodeInfo { TagType = typeof(object), - ChildNodeObjects = o => new[] + ChildNodeObjects = o => new object[] { string.Empty }, @@ -1576,7 +1576,7 @@ var treeNodeInfo = new TreeNodeInfo { TagType = typeof(IObservable), - Text = o => testString + Text = o => testString // Note: Access to modified closure intended! }; treeViewControl.RegisterTreeNodeInfo(treeNodeInfo); treeViewControl.Data = observable; Index: Core/Common/test/Core.Common.Gui.Test/PropertyBag/ObjectPropertiesTest.cs =================================================================== diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Core/Common/test/Core.Common.Gui.Test/PropertyBag/ObjectPropertiesTest.cs (.../ObjectPropertiesTest.cs) (revision 24da3aa72ccc0776599628c9f971081694048d9a) +++ Core/Common/test/Core.Common.Gui.Test/PropertyBag/ObjectPropertiesTest.cs (.../ObjectPropertiesTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using System.ComponentModel; using System.Reflection; using Core.Common.Gui.PropertyBag; @@ -66,10 +67,12 @@ PropertyInfo propertyInfo = properties.GetType().GetProperty(dataPropertyName); // Call - object[] attributes = propertyInfo.GetCustomAttributes(typeof(BrowsableAttribute), true); + var browsableAttribute = (BrowsableAttribute) Attribute.GetCustomAttribute(propertyInfo, + typeof(BrowsableAttribute), + true); // Assert - CollectionAssert.Contains(attributes, BrowsableAttribute.No); + Assert.AreEqual(BrowsableAttribute.No, browsableAttribute); } } } \ No newline at end of file Index: Core/Common/test/Core.Common.TestUtil/GuiTestHelper.cs =================================================================== diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Core/Common/test/Core.Common.TestUtil/GuiTestHelper.cs (.../GuiTestHelper.cs) (revision 24da3aa72ccc0776599628c9f971081694048d9a) +++ Core/Common/test/Core.Common.TestUtil/GuiTestHelper.cs (.../GuiTestHelper.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -58,12 +58,7 @@ { get { - if (instance == null) - { - instance = new GuiTestHelper(); - } - - return instance; + return instance ?? (instance = new GuiTestHelper()); } } Index: Core/Common/test/Core.Common.TestUtil/TestHelper.cs =================================================================== diff -u -r53264d86c84cc30a06519b1b86b7efeee9b6815f -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Core/Common/test/Core.Common.TestUtil/TestHelper.cs (.../TestHelper.cs) (revision 53264d86c84cc30a06519b1b86b7efeee9b6815f) +++ Core/Common/test/Core.Common.TestUtil/TestHelper.cs (.../TestHelper.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -42,11 +42,7 @@ { get { - if (solutionRoot == null) - { - solutionRoot = GetSolutionRoot(); - } - return solutionRoot; + return solutionRoot ?? (solutionRoot = GetSolutionRoot()); } } @@ -134,12 +130,12 @@ /// public static void AssertLogMessagesAreGenerated(Action action, IEnumerable messages, int? expectedLogMessageCount = null) { - var renderedMessages = GetAllRenderedMessages(action); + Tuple[] renderedMessages = GetAllRenderedMessages(action).ToArray(); AssertExpectedMessagesInRenderedMessages(messages, renderedMessages); if (expectedLogMessageCount != null) { - Assert.AreEqual((int) expectedLogMessageCount, renderedMessages.Count()); + Assert.AreEqual((int) expectedLogMessageCount, renderedMessages.Length); } } @@ -279,14 +275,14 @@ /// The collection of messages that should occur in the log /// Optional: assert that log has this number of messages. /// - public static void AssertLogMessagesWithLevelAreGenerated(Action action, IEnumerable> messages, int? expectedLogMessageCount = null) + public static void AssertLogMessagesWithLevelAreGenerated(Action action, Tuple[] messages, int? expectedLogMessageCount = null) { - var renderedMessages = GetAllRenderedMessages(action); + Tuple[] renderedMessages = GetAllRenderedMessages(action).ToArray(); AssertExpectedMessagesInRenderedMessages(messages, renderedMessages); if (expectedLogMessageCount != null) { - Assert.AreEqual((int) expectedLogMessageCount, renderedMessages.Count()); + Assert.AreEqual((int) expectedLogMessageCount, renderedMessages.Length); } } @@ -329,7 +325,7 @@ } } - private static void AssertExpectedMessagesInRenderedMessages(IEnumerable messages, IEnumerable> renderedMessages) + private static void AssertExpectedMessagesInRenderedMessages(IEnumerable messages, Tuple[] renderedMessages) { foreach (string message in messages) { @@ -342,7 +338,7 @@ /// /// The collection of expected messages /// The collection of messages in the log - private static void AssertExpectedMessagesInRenderedMessages(IEnumerable> messages, IEnumerable> renderedMessages) + private static void AssertExpectedMessagesInRenderedMessages(Tuple[] messages, Tuple[] renderedMessages) { var messagesWithLog4NetLevel = messages.Select(m => Tuple.Create(m.Item1, m.Item2.ToLog4NetLevel())); foreach (Tuple message in messagesWithLog4NetLevel) Index: Core/Common/test/Core.Common.TestUtil/WindowsFormsTestHelper.cs =================================================================== diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Core/Common/test/Core.Common.TestUtil/WindowsFormsTestHelper.cs (.../WindowsFormsTestHelper.cs) (revision 24da3aa72ccc0776599628c9f971081694048d9a) +++ Core/Common/test/Core.Common.TestUtil/WindowsFormsTestHelper.cs (.../WindowsFormsTestHelper.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -38,7 +38,7 @@ private Action
formShown; private bool wasShown; - public WindowsFormsTestHelper() + private WindowsFormsTestHelper() { Application.EnableVisualStyles(); @@ -196,7 +196,8 @@ if (formShown != null && wasShown) { - formShown(control is Form ? (Form) control : this); + var form = control as Form; + formShown(form ?? this); } } finally @@ -253,9 +254,9 @@ }; nodes.Add(node); - if (item is Control) + var control = item as Control; + if (control != null ) { - var control = ((Control) item); AddAllNodes(node.Nodes, control.Controls); // hack, try to get Data or DataSource property @@ -284,9 +285,10 @@ } } - if (item is IEnumerable) + var iterator = item as IEnumerable; + if (iterator != null) { - AddAllNodes(node.Nodes, (IEnumerable) item); + AddAllNodes(node.Nodes, iterator); } } } Index: Core/Common/test/Core.Common.TestUtil/WpfTestHelper.xaml.cs =================================================================== diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Core/Common/test/Core.Common.TestUtil/WpfTestHelper.xaml.cs (.../WpfTestHelper.xaml.cs) (revision 24da3aa72ccc0776599628c9f971081694048d9a) +++ Core/Common/test/Core.Common.TestUtil/WpfTestHelper.xaml.cs (.../WpfTestHelper.xaml.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -143,9 +143,10 @@ private void ShowTopLevelControl(Control control, bool modal) { - if (control is Window) + var window1 = control as Window; + if (window1 != null) { - window = (Window) control; + window = window1; } else { Index: Core/Common/test/Core.Common.Utils.Test/Reflection/TypeUtilsTest.cs =================================================================== diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Core/Common/test/Core.Common.Utils.Test/Reflection/TypeUtilsTest.cs (.../TypeUtilsTest.cs) (revision 24da3aa72ccc0776599628c9f971081694048d9a) +++ Core/Common/test/Core.Common.Utils.Test/Reflection/TypeUtilsTest.cs (.../TypeUtilsTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -434,6 +434,16 @@ Assert.IsTrue(hasTypeConverter); } + [Test] + public void HasTypeConverter_TypeConverterAttributeInherited_ReturnTrue() + { + // Call + bool hasTypeConverter = TypeUtils.HasTypeConverter(c => c.PropertyWithTypeConverter); + + // Assert + Assert.IsTrue(hasTypeConverter); + } + private class TestClass { /// @@ -456,7 +466,7 @@ public double PublicPropertyPrivateSetter { get; private set; } [TypeConverter(typeof(DoubleConverter))] - public double PropertyWithTypeConverter { get; private set; } + public virtual double PropertyWithTypeConverter { get; private set; } public object PublicMethod() { @@ -475,6 +485,14 @@ private class DerivedTestClass : TestClass { public DerivedTestClass(int privateInt) : base(privateInt) {} + + public override double PropertyWithTypeConverter + { + get + { + return base.PropertyWithTypeConverter; + } + } } } } \ No newline at end of file Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerTest.cs =================================================================== diff -u -rae99d19be5c1bd59e6cc85669c96a3b9895e660d -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerTest.cs (.../ProjectExplorerTest.cs) (revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d) +++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerTest.cs (.../ProjectExplorerTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -179,7 +179,7 @@ new TreeNodeInfo { TagType = typeof(IProject), - ChildNodeObjects = o => new[] + ChildNodeObjects = o => new object[] { stringA, stringB @@ -284,7 +284,7 @@ new TreeNodeInfo { TagType = typeof(IProject), - ChildNodeObjects = o => new[] + ChildNodeObjects = o => new object[] { stringA, stringB Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/TestClosingStructure.cs =================================================================== diff -u -re867add92d5cb17437fd72eaf5745fafb0a50282 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/TestClosingStructure.cs (.../TestClosingStructure.cs) (revision e867add92d5cb17437fd72eaf5745fafb0a50282) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/TestClosingStructure.cs (.../TestClosingStructure.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -37,7 +37,7 @@ public TestClosingStructure(ClosingStructureInflowModelType type) : this("test", new Point2D(12345.56789, 9876.54321), type) {} - protected TestClosingStructure(string name, Point2D location, ClosingStructureInflowModelType type) + private TestClosingStructure(string name, Point2D location, ClosingStructureInflowModelType type) : base(new ConstructionProperties { Name = name, Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationRow.cs =================================================================== diff -u -r1e9a35d13ae40069200f8b1e6c1aa91bb54ce086 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationRow.cs (.../HydraulicBoundaryLocationRow.cs) (revision 1e9a35d13ae40069200f8b1e6c1aa91bb54ce086) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationRow.cs (.../HydraulicBoundaryLocationRow.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -53,7 +53,7 @@ public bool ToCalculate { get; set; } /// - /// Gets the . + /// Gets the . /// public string Name { @@ -64,7 +64,7 @@ } /// - /// Gets the . + /// Gets the . /// public long Id { @@ -75,7 +75,7 @@ } /// - /// Gets the . + /// Gets the . /// public Point2D Location { Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresFailureMechanismSectionResultTest.cs =================================================================== diff -u -re4e785f127ce9a2d0d1734c1b51e02d910a31bbe -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresFailureMechanismSectionResultTest.cs (.../StructuresFailureMechanismSectionResultTest.cs) (revision e4e785f127ce9a2d0d1734c1b51e02d910a31bbe) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresFailureMechanismSectionResultTest.cs (.../StructuresFailureMechanismSectionResultTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -76,12 +76,7 @@ private class TestStructuresInput : StructuresInputBase { - public bool Updated { get; private set; } - - protected override void UpdateStructureParameters() - { - Updated = true; - } + protected override void UpdateStructureParameters() {} } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TypeConverters/FailureMechanismSectionResultNoProbabilityValueDoubleConverterTest.cs =================================================================== diff -u -r2857b234df4622cdaf80bbc75abc58af36667347 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TypeConverters/FailureMechanismSectionResultNoProbabilityValueDoubleConverterTest.cs (.../FailureMechanismSectionResultNoProbabilityValueDoubleConverterTest.cs) (revision 2857b234df4622cdaf80bbc75abc58af36667347) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TypeConverters/FailureMechanismSectionResultNoProbabilityValueDoubleConverterTest.cs (.../FailureMechanismSectionResultNoProbabilityValueDoubleConverterTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -23,6 +23,7 @@ using System.ComponentModel; using System.Globalization; using NUnit.Framework; +using Rhino.Mocks; using Ringtoets.Common.Forms.Helpers; using Ringtoets.Common.Forms.TypeConverters; using CommonBaseResources = Core.Common.Base.Properties.Resources; @@ -120,32 +121,42 @@ public void ConvertFrom_TextDoesNotRepresentNumber_ThrowNotSupportedException() { // Setup + var mocks = new MockRepository(); + var context = mocks.Stub(); + mocks.ReplayAll(); + string text = "I'm not a number!"; var converter = new FailureMechanismSectionResultNoProbabilityValueDoubleConverter(); // Call - TestDelegate call = () => converter.ConvertFrom(null, CultureInfo.CurrentCulture, text); + TestDelegate call = () => converter.ConvertFrom(context, CultureInfo.CurrentCulture, text); // Assert string message = Assert.Throws(call).Message; Assert.AreEqual("De tekst moet een getal zijn.", message); + mocks.VerifyAll(); } [Test] public void ConvertFrom_TextTooLongToStoreInDouble_ThrowNotSupportedException() { // Setup + var mocks = new MockRepository(); + var context = mocks.Stub(); + mocks.ReplayAll(); + string text = "1" + double.MaxValue.ToString(CultureInfo.CurrentCulture); var converter = new FailureMechanismSectionResultNoProbabilityValueDoubleConverter(); // Call - TestDelegate call = () => converter.ConvertFrom(null, CultureInfo.CurrentCulture, text); + TestDelegate call = () => converter.ConvertFrom(context, CultureInfo.CurrentCulture, text); // Assert string message = Assert.Throws(call).Message; Assert.AreEqual("De tekst is een getal dat te groot of te klein is om gerepresenteerd te worden.", message); + mocks.VerifyAll(); } [Test] @@ -265,15 +276,20 @@ private static void DoConvertFrom_SomeNumericalTextInCurrentCulture_ReturnConvertedRoundedDouble(double input) { // Setup + var mocks = new MockRepository(); + var context = mocks.Stub(); + mocks.ReplayAll(); + string text = input.ToString(CultureInfo.CurrentCulture); var converter = new FailureMechanismSectionResultNoProbabilityValueDoubleConverter(); // Call - double conversionResult = (double) converter.ConvertFrom(null, CultureInfo.CurrentCulture, text); + double conversionResult = (double) converter.ConvertFrom(context, CultureInfo.CurrentCulture, text); // Assert Assert.AreEqual(input, conversionResult); + mocks.VerifyAll(); } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TypeConverters/NoValueRoundedDoubleConverterTest.cs =================================================================== diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TypeConverters/NoValueRoundedDoubleConverterTest.cs (.../NoValueRoundedDoubleConverterTest.cs) (revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TypeConverters/NoValueRoundedDoubleConverterTest.cs (.../NoValueRoundedDoubleConverterTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -20,10 +20,12 @@ // All rights reserved. using System; +using System.ComponentModel; using System.Globalization; using Core.Common.Base.Data; using Core.Common.Base.TypeConverters; using NUnit.Framework; +using Rhino.Mocks; using Ringtoets.Common.Forms.TypeConverters; namespace Ringtoets.Common.Forms.Test.TypeConverters @@ -81,32 +83,42 @@ public void ConvertFrom_TextDoesNotRepresentNumber_ThrowNotSupportedException() { // Setup + var mocks = new MockRepository(); + var context = mocks.Stub(); + mocks.ReplayAll(); + string text = "I'm not a number!"; var converter = new NoValueRoundedDoubleConverter(); // Call - TestDelegate call = () => converter.ConvertFrom(null, CultureInfo.CurrentCulture, text); + TestDelegate call = () => converter.ConvertFrom(context, CultureInfo.CurrentCulture, text); // Assert string message = Assert.Throws(call).Message; Assert.AreEqual("De tekst moet een getal zijn.", message); + mocks.VerifyAll(); } [Test] public void ConvertFrom_TextTooLongToStoreInDouble_ThrowNotSupportedException() { // Setup + var mocks = new MockRepository(); + var context = mocks.Stub(); + mocks.ReplayAll(); + string text = "1" + double.MaxValue.ToString(CultureInfo.CurrentCulture); var converter = new NoValueRoundedDoubleConverter(); // Call - TestDelegate call = () => converter.ConvertFrom(null, CultureInfo.CurrentCulture, text); + TestDelegate call = () => converter.ConvertFrom(context, CultureInfo.CurrentCulture, text); // Assert string message = Assert.Throws(call).Message; Assert.AreEqual("De tekst is een getal dat te groot of te klein is om gerepresenteerd te worden.", message); + mocks.VerifyAll(); } [Test] @@ -172,17 +184,22 @@ private static void DoConvertFrom_SomeNumericalTextInCurrentCulture_ReturnConvertedRoundedDouble(double input) { // Setup + var mocks = new MockRepository(); + var context = mocks.Stub(); + mocks.ReplayAll(); + string text = input.ToString(CultureInfo.CurrentCulture); var converter = new NoValueRoundedDoubleConverter(); // Call - RoundedDouble conversionResult = (RoundedDouble) converter.ConvertFrom(null, CultureInfo.CurrentCulture, text); + RoundedDouble conversionResult = (RoundedDouble) converter.ConvertFrom(context, CultureInfo.CurrentCulture, text); // Assert Assert.IsNotNull(conversionResult); Assert.AreEqual(RoundedDouble.MaximumNumberOfDecimalPlaces, conversionResult.NumberOfDecimalPlaces); Assert.AreEqual(input, conversionResult.Value); + mocks.VerifyAll(); } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Utils.Test/StructuresHelperTest.cs =================================================================== diff -u -re4e785f127ce9a2d0d1734c1b51e02d910a31bbe -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Ringtoets/Common/test/Ringtoets.Common.Utils.Test/StructuresHelperTest.cs (.../StructuresHelperTest.cs) (revision e4e785f127ce9a2d0d1734c1b51e02d910a31bbe) +++ Ringtoets/Common/test/Ringtoets.Common.Utils.Test/StructuresHelperTest.cs (.../StructuresHelperTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -149,7 +149,7 @@ // Call FailureMechanismSection failureMechanismSection = - StructuresHelper.FailureMechanismSectionForCalculation(oneSection, calculation); + StructuresHelper.FailureMechanismSectionForCalculation(oneSection, calculation); // Assert Assert.IsNull(failureMechanismSection); @@ -164,7 +164,7 @@ // Call FailureMechanismSection failureMechanismSection = - StructuresHelper.FailureMechanismSectionForCalculation(emptySections, calculation); + StructuresHelper.FailureMechanismSectionForCalculation(emptySections, calculation); // Assert Assert.IsNull(failureMechanismSection); @@ -387,12 +387,7 @@ private class TestStructuresInput : StructuresInputBase { - public bool Updated { get; private set; } - - protected override void UpdateStructureParameters() - { - Updated = true; - } + protected override void UpdateStructureParameters() {} } private class TestStructuresFailureMechanismSectionResult : StructuresFailureMechanismSectionResult Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -r5c5df51bc14a7e25692abf1db5a7476e5036b13f -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs) (revision 5c5df51bc14a7e25692abf1db5a7476e5036b13f) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -210,9 +210,8 @@ var inputContext = new GrassCoverErosionOutwardsWaveConditionsInputContext(input, failureMechanism); var newForeshoreProfile = new ForeshoreProfile( - new Point2D( - (RoundedDouble) random.NextDouble(), - (RoundedDouble) random.NextDouble()), + new Point2D((RoundedDouble) random.NextDouble(), + (RoundedDouble) random.NextDouble()), Enumerable.Empty(), new BreakWater(BreakWaterType.Dam, (RoundedDouble) random.NextDouble()), new ForeshoreProfile.ConstructionProperties()); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs =================================================================== diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs) (revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -151,16 +151,18 @@ // Setup var view = ShowDesignWaterLevelLocationsView(); - List locations = new List(); - locations.Add(new HydraulicBoundaryLocation(1, "1", 1.0, 1.0)); - locations.Add(new HydraulicBoundaryLocation(2, "2", 2.0, 2.0) + var locations = new List { - WaveHeight = (RoundedDouble) 1.23 - }); - locations.Add(new HydraulicBoundaryLocation(3, "3", 3.0, 3.0) - { - DesignWaterLevel = (RoundedDouble) 2.45 - }); + new HydraulicBoundaryLocation(1, "1", 1.0, 1.0), + new HydraulicBoundaryLocation(2, "2", 2.0, 2.0) + { + WaveHeight = (RoundedDouble) 1.23 + }, + new HydraulicBoundaryLocation(3, "3", 3.0, 3.0) + { + DesignWaterLevel = (RoundedDouble) 2.45 + } + }; // Call TestDelegate action = () => view.Data = locations; Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs =================================================================== diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs) (revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -147,16 +147,18 @@ // Setup var view = ShowWaveHeightLocationsView(); - List locations = new List(); - locations.Add(new HydraulicBoundaryLocation(1, "1", 1.0, 1.0)); - locations.Add(new HydraulicBoundaryLocation(2, "2", 2.0, 2.0) + var locations = new List { - WaveHeight = (RoundedDouble) 1.23 - }); - locations.Add(new HydraulicBoundaryLocation(3, "3", 3.0, 3.0) - { - DesignWaterLevel = (RoundedDouble) 2.45 - }); + new HydraulicBoundaryLocation(1, "1", 1.0, 1.0), + new HydraulicBoundaryLocation(2, "2", 2.0, 2.0) + { + WaveHeight = (RoundedDouble) 1.23 + }, + new HydraulicBoundaryLocation(3, "3", 3.0, 3.0) + { + DesignWaterLevel = (RoundedDouble) 2.45 + } + }; // Call TestDelegate action = () => view.Data = locations; Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Commands/AssessmentSectionFromFileCommandHandlerTest.cs =================================================================== diff -u -re42bdf3dd379c46bab9212eb7b30f4754c9bc91c -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Commands/AssessmentSectionFromFileCommandHandlerTest.cs (.../AssessmentSectionFromFileCommandHandlerTest.cs) (revision e42bdf3dd379c46bab9212eb7b30f4754c9bc91c) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Commands/AssessmentSectionFromFileCommandHandlerTest.cs (.../AssessmentSectionFromFileCommandHandlerTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -545,23 +545,37 @@ private static AssessmentSection TestAssessmentSection2_1() { + var referenceLine = new ReferenceLine(); + referenceLine.SetGeometry(new[] + { + new Point2D(155556.9191, 464341.1281), + new Point2D(155521.4761, 464360.7401) + }); + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dune) { Id = "2-1", Name = "Traject 2-1", FailureMechanismContribution = { Norm = 300 + }, + ReferenceLine = referenceLine, + GrassCoverErosionInwards = + { + GeneralInput = + { + N = 3 + } + }, + HeightStructures = + { + GeneralInput = + { + N = 3 + } } }; - assessmentSection.ReferenceLine = new ReferenceLine(); - assessmentSection.ReferenceLine.SetGeometry(new[] - { - new Point2D(155556.9191, 464341.1281), - new Point2D(155521.4761, 464360.7401) - }); - assessmentSection.GrassCoverErosionInwards.GeneralInput.N = 3; - assessmentSection.HeightStructures.GeneralInput.N = 3; return assessmentSection; } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/CalculationGroupContextPropertiesTest.cs =================================================================== diff -u -rf64dceaa32788bad28dcf09f4a1c3150595f1327 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/CalculationGroupContextPropertiesTest.cs (.../CalculationGroupContextPropertiesTest.cs) (revision f64dceaa32788bad28dcf09f4a1c3150595f1327) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/CalculationGroupContextPropertiesTest.cs (.../CalculationGroupContextPropertiesTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -19,7 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Linq; +using System; using System.Reflection; using Core.Common.Base; using Core.Common.Gui.Attributes; @@ -116,10 +116,12 @@ PropertyInfo nameProperty = properties.GetType().GetProperty(propertyName); // Call - object[] namePropertyAttributes = nameProperty.GetCustomAttributes(false); + var dynamicReadOnlyAttribute = Attribute.GetCustomAttribute(nameProperty, + typeof(DynamicReadOnlyAttribute), + true); // Assert - Assert.AreEqual(1, namePropertyAttributes.OfType().Count()); + Assert.IsNotNull(dynamicReadOnlyAttribute); Assert.AreEqual(!nameIsEditable, DynamicReadOnlyAttribute.IsReadOnly(properties, propertyName)); mocks.VerifyAll(); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r74817f4dbb43aa0346f8b839e59370f786c5d452 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision 74817f4dbb43aa0346f8b839e59370f786c5d452) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -200,16 +200,21 @@ public void ContextMenuStrip_HydraulicBoundaryDatabaseSet_ContextMenuItemBerekenenEnabled() { // Setup - var guiMock = mockRepository.StrictMock(); var assessmentSectionMock = mockRepository.Stub(); - var nodeData = new DesignWaterLevelLocationsContext(assessmentSectionMock); - nodeData.WrappedData.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); - guiMock.Stub(g => g.ProjectOpened += null).IgnoreArguments(); - guiMock.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); + var nodeData = new DesignWaterLevelLocationsContext(assessmentSectionMock) + { + WrappedData = + { + HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase() + } + }; using (var treeViewControl = new TreeViewControl()) { + var guiMock = mockRepository.StrictMock(); + guiMock.Stub(g => g.ProjectOpened += null).IgnoreArguments(); + guiMock.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); mockRepository.ReplayAll(); Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs =================================================================== diff -u -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs (.../PipingCalculationConfigurationHelper.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs (.../PipingCalculationConfigurationHelper.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -106,15 +106,9 @@ Segment2D[] surfaceLineSegments = Math2D.ConvertLinePointsToLineSegments(surfaceLine.Points.Select(p => new Point2D(p.X, p.Y))).ToArray(); - var soilModelObjectsForCalculation = new List(); - foreach (StochasticSoilModel stochasticSoilModel in availableSoilModels.Where(sm => sm.StochasticSoilProfiles.Any())) - { - if (DoesSoilModelGeometryIntersectWithSurfaceLineGeometry(stochasticSoilModel, surfaceLineSegments)) - { - soilModelObjectsForCalculation.Add(stochasticSoilModel); - } - } - return soilModelObjectsForCalculation; + return availableSoilModels.Where(stochasticSoilModel => stochasticSoilModel.StochasticSoilProfiles.Any() && + DoesSoilModelGeometryIntersectWithSurfaceLineGeometry(stochasticSoilModel, surfaceLineSegments)) + .ToList(); } private static CalculationGroup CreateCalculationGroup(RingtoetsPipingSurfaceLine surfaceLine, IEnumerable soilModels, GeneralPipingInput generalInput) Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs =================================================================== diff -u -r1dc89167ccdfcc4069e7bceb1db90dba570daba9 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs (.../PipingCalculationsView.cs) (revision 1dc89167ccdfcc4069e7bceb1db90dba570daba9) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs (.../PipingCalculationsView.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -191,62 +191,54 @@ dataGridViewControl.AddTextBoxColumn( TypeUtils.GetMemberName(row => row.Name), - Resources.PipingCalculation_Name_DisplayName - ); + Resources.PipingCalculation_Name_DisplayName); dataGridViewControl.AddComboBoxColumn>( TypeUtils.GetMemberName(row => row.StochasticSoilModel), Resources.PipingInput_StochasticSoilModel_DisplayName, null, TypeUtils.GetMemberName>(wrapper => wrapper.This), - TypeUtils.GetMemberName>(wrapper => wrapper.DisplayName) - ); + TypeUtils.GetMemberName>(wrapper => wrapper.DisplayName)); dataGridViewControl.AddComboBoxColumn>( TypeUtils.GetMemberName(row => row.StochasticSoilProfile), Resources.PipingInput_StochasticSoilProfile_DisplayName, null, TypeUtils.GetMemberName>(wrapper => wrapper.This), - TypeUtils.GetMemberName>(wrapper => wrapper.DisplayName) - ); + TypeUtils.GetMemberName>(wrapper => wrapper.DisplayName)); dataGridViewControl.AddTextBoxColumn( TypeUtils.GetMemberName(row => row.StochasticSoilProfileProbability), - Resources.PipingCalculationsView_InitializeDataGridView_Stochastic_soil_profile_probability - ); + Resources.PipingCalculationsView_InitializeDataGridView_Stochastic_soil_profile_probability); dataGridViewControl.AddComboBoxColumn>( TypeUtils.GetMemberName(row => row.HydraulicBoundaryLocation), Resources.PipingInput_HydraulicBoundaryLocation_DisplayName, null, TypeUtils.GetMemberName>(wrapper => wrapper.This), - TypeUtils.GetMemberName>(wrapper => wrapper.DisplayName) - ); + TypeUtils.GetMemberName>(wrapper => wrapper.DisplayName)); var dampingFactorExitHeader = Resources.PipingInput_DampingFactorExit_DisplayName; dampingFactorExitHeader = char.ToLowerInvariant(dampingFactorExitHeader[0]) + dampingFactorExitHeader.Substring(1); dataGridViewControl.AddTextBoxColumn( TypeUtils.GetMemberName(row => row.DampingFactorExitMean), - string.Format("{0} {1}", Resources.Probabilistics_Mean_Symbol, dampingFactorExitHeader) - ); + string.Format("{0} {1}", Resources.Probabilistics_Mean_Symbol, dampingFactorExitHeader)); var phreaticLevelExitHeader = Resources.PipingInput_PhreaticLevelExit_DisplayName; phreaticLevelExitHeader = char.ToLowerInvariant(phreaticLevelExitHeader[0]) + phreaticLevelExitHeader.Substring(1); dataGridViewControl.AddTextBoxColumn( TypeUtils.GetMemberName(row => row.PhreaticLevelExitMean), - string.Format("{0} {1}", Resources.Probabilistics_Mean_Symbol, phreaticLevelExitHeader) - ); + string.Format("{0} {1}", Resources.Probabilistics_Mean_Symbol, phreaticLevelExitHeader)); dataGridViewControl.AddTextBoxColumn( TypeUtils.GetMemberName(pcs => pcs.EntryPointL), - Resources.PipingInput_EntryPointL_DisplayName - ); + Resources.PipingInput_EntryPointL_DisplayName); + dataGridViewControl.AddTextBoxColumn( TypeUtils.GetMemberName(pcs => pcs.ExitPointL), - Resources.PipingInput_ExitPointL_DisplayName - ); + Resources.PipingInput_ExitPointL_DisplayName); UpdateHydraulicBoundaryLocationsColumn(); UpdateStochasticSoilModelColumn(); @@ -261,13 +253,13 @@ private void UpdateHydraulicBoundaryLocationsColumn() { - DataGridViewComboBoxColumn hydraulicBoundaryLocationColumn = (DataGridViewComboBoxColumn) dataGridViewControl.GetColumnFromIndex(hydraulicBoundaryLocationColumnIndex); + var hydraulicBoundaryLocationColumn = (DataGridViewComboBoxColumn) dataGridViewControl.GetColumnFromIndex(hydraulicBoundaryLocationColumnIndex); using (new SuspendDataGridViewColumnResizes(hydraulicBoundaryLocationColumn)) { - var hydraulicBoundaryLocations = assessmentSection != null && assessmentSection.HydraulicBoundaryDatabase != null - ? assessmentSection.HydraulicBoundaryDatabase.Locations - : null; + List hydraulicBoundaryLocations = assessmentSection != null && assessmentSection.HydraulicBoundaryDatabase != null ? + assessmentSection.HydraulicBoundaryDatabase.Locations : + null; SetItemsOnObjectCollection(hydraulicBoundaryLocationColumn.Items, GetHydraulicBoundaryLocationsDataSource(hydraulicBoundaryLocations).ToArray()); } } Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilLayer2D.cs =================================================================== diff -u -rda35dc04febd3e2d23219523816803040b9d4349 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilLayer2D.cs (.../SoilLayer2D.cs) (revision da35dc04febd3e2d23219523816803040b9d4349) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilLayer2D.cs (.../SoilLayer2D.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -115,8 +115,7 @@ var result = new Collection(); if (OuterLoop != null) { - IEnumerable outerLoopIntersectionHeights = GetLoopIntersectionHeights(outerLoop, atX); - + double[] outerLoopIntersectionHeights = GetLoopIntersectionHeights(outerLoop, atX).ToArray(); if (outerLoopIntersectionHeights.Any()) { IEnumerable> innerLoopsIntersectionHeights = InnerLoops.Select(loop => GetLoopIntersectionHeights(loop, atX)); Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SurfaceLines/CharacteristicPointsCsvReader.cs =================================================================== diff -u -r8e182435811ddd7f9cf29ae57f62b91a2ce5a29c -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Ringtoets/Piping/src/Ringtoets.Piping.IO/SurfaceLines/CharacteristicPointsCsvReader.cs (.../CharacteristicPointsCsvReader.cs) (revision 8e182435811ddd7f9cf29ae57f62b91a2ce5a29c) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SurfaceLines/CharacteristicPointsCsvReader.cs (.../CharacteristicPointsCsvReader.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -253,12 +253,10 @@ return false; } - foreach (string column in tokenizedHeader.Where(c => c.StartsWith(xPrefix))) + if (tokenizedHeader.Where(c => c.StartsWith(xPrefix)) + .Any(c => !DetermineRequiredYZColumns(c, tokenizedHeader))) { - if (!DetermineRequiredYZColumns(column, tokenizedHeader)) - { - return false; - } + return false; } DetermineOrderColumn(tokenizedHeader); Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/PipingSubCalculatorFactory.cs =================================================================== diff -u -r238411e28abf2f71dc0a5715ca940c6e87df9392 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/PipingSubCalculatorFactory.cs (.../PipingSubCalculatorFactory.cs) (revision 238411e28abf2f71dc0a5715ca940c6e87df9392) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/PipingSubCalculatorFactory.cs (.../PipingSubCalculatorFactory.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -37,11 +37,7 @@ { get { - if (instance == null) - { - instance = new PipingSubCalculatorFactory(); - } - return instance; + return instance ?? (instance = new PipingSubCalculatorFactory()); } set { Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs =================================================================== diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs (.../PipingCalculationConfigurationHelperTest.cs) (revision 24da3aa72ccc0776599628c9f971081694048d9a) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs (.../PipingCalculationConfigurationHelperTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -941,7 +941,7 @@ surfaceLine2 }; - IEnumerable result = null; + ICalculationBase[] result = null; // Call Action call = () => @@ -960,7 +960,7 @@ LogLevelConstant.Warn); TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedMessage, 1); - Assert.AreEqual(1, result.Count()); + Assert.AreEqual(1, result.Length); var calculationGroup1 = result.First(g => g.Name == surfaceLineName1) as CalculationGroup; Assert.NotNull(calculationGroup1); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingSurfaceLineSelectionDialogTest.cs =================================================================== diff -u -r2973c5f790a5131e427bd5f73e2a620044199639 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingSurfaceLineSelectionDialogTest.cs (.../PipingSurfaceLineSelectionDialogTest.cs) (revision 2973c5f790a5131e427bd5f73e2a620044199639) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingSurfaceLineSelectionDialogTest.cs (.../PipingSurfaceLineSelectionDialogTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -115,8 +115,10 @@ { // Setup var testname = "testName"; - var ringtoetsPipingSurfaceLine = new RingtoetsPipingSurfaceLine(); - ringtoetsPipingSurfaceLine.Name = testname; + var ringtoetsPipingSurfaceLine = new RingtoetsPipingSurfaceLine + { + Name = testname + }; // Call using (var viewParent = new Form()) Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Properties/Resources.Designer.cs =================================================================== diff -u -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -1,28 +1,7 @@ -// Copyright (C) Stichting Deltares 2016. All rights reserved. -// -// This file is part of Ringtoets. -// -// Ringtoets is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// -// All names, logos, and references to "Deltares" are registered trademarks of -// Stichting Deltares and remain full property of Stichting Deltares at all times. -// All rights reserved. - -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.17929 +// Runtime Version:4.0.30319.18444 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -82,7 +61,7 @@ } /// - /// Looks up a localized string similar to Linear. + /// Looks up a localized string similar to Lineair. /// public static string LoadSchematizationType_Linear_DisplayName { get { Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Properties/Resources.resx =================================================================== diff -u -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Properties/Resources.resx (.../Resources.resx) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Properties/Resources.resx (.../Resources.resx) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Linear + Lineair Kwadratisch Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs =================================================================== diff -u -r944d2501b3f780d208e00015a1b850afad4c3aa8 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision 944d2501b3f780d208e00015a1b850afad4c3aa8) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -120,7 +120,7 @@ using (var treeViewControl = new TreeViewControl()) { var gui = mocks.StrictMock(); - gui.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock); + gui.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock); gui.Stub(g => g.ProjectOpened += null).IgnoreArguments(); gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments(); Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverResultViewInfoTest.cs =================================================================== diff -u -r2973c5f790a5131e427bd5f73e2a620044199639 -r7ae9100ff4e61169edcefaeb01b72d492431742f --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverResultViewInfoTest.cs (.../WaveImpactAsphaltCoverResultViewInfoTest.cs) (revision 2973c5f790a5131e427bd5f73e2a620044199639) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverResultViewInfoTest.cs (.../WaveImpactAsphaltCoverResultViewInfoTest.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) @@ -47,7 +47,7 @@ { mocks = new MockRepository(); plugin = new WaveImpactAsphaltCoverPlugin(); - info = Enumerable.First(plugin.GetViewInfos(), tni => tni.ViewType == typeof(WaveImpactAsphaltCoverFailureMechanismResultView)); + info = plugin.GetViewInfos().First(tni => tni.ViewType == typeof(WaveImpactAsphaltCoverFailureMechanismResultView)); } [TearDown]